Fix metrics #77

Danil-Grigorev · 2020-06-19T09:48:54Z

This change ensures compatibility with the ServiceMonitor resource
introduced in openshift/machine-api-operator#609

Close #75

dhellmann

/lgtm

dhellmann · 2020-06-19T12:56:47Z

/test e2e-metal-ipi

Danil-Grigorev · 2020-06-19T15:17:16Z

/retest

openshift-bot · 2020-06-19T17:42:05Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-19T20:05:01Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-19T20:44:19Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T01:43:02Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T02:35:00Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T04:19:00Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T04:32:00Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T06:29:01Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T06:42:01Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T08:39:56Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T08:52:50Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T10:49:20Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T12:47:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T12:58:58Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T13:13:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T13:25:05Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T14:17:00Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T14:29:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T14:43:08Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T14:55:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T15:08:59Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-06-20T15:22:01Z

/retest

Please review the full test history for this PR and help us cut down flakes.

Danil-Grigorev · 2020-07-02T10:00:25Z

@dhellmann I tried running unit tests, and got similar results to ipi e2e - machines are reconciled but not changed. Same thing happens on master, so don't think that's a problem of this PR WDYT?

dhellmann · 2020-07-02T14:03:54Z

@dhellmann I tried running unit tests, and got similar results to ipi e2e - machines are reconciled but not changed. Same thing happens on master, so don't think that's a problem of this PR WDYT?

Which unit test failed? I see a failure locally for the Remediation test that @n1r1 added recently. I've opened #80 to see if I can reproduce that in CI.

Locally I see

--- FAIL: TestRemediation (0.00s)
    actuator_test.go:1785: expected a requeue err but err was nil
    actuator_test.go:1852:
        	Error Trace:	actuator_test.go:1852
        	Error:      	Not equal:
        	            	expected: map[string]string{"annName1":"annValue1", "annName2":"annValue2"}
        	            	actual  : map[string]string(nil)

        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1,5 +1,2 @@
make actuator tests more verbose for debugging
        	            	-(map[string]string) (len=2) {
        	            	- (string) (len=8) "annName1": (string) (len=9) "annValue1",
        	            	- (string) (len=8) "annName2": (string) (len=9) "annValue2"
        	            	-}
        	            	+(map[string]string) <nil>

        	Test:       	TestRemediation
        	Messages:   	Node annotations before remediation and after remediation ares not equal
    actuator_test.go:1855:
        	Error Trace:	actuator_test.go:1855
        	Error:      	Not equal:
        	            	expected: map[string]string{"labelName1":"labelValue1", "labelName2":"labelValue2"}
        	            	actual  : map[string]string(nil)

        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1,5 +1,2 @@
        	            	-(map[string]string) (len=2) {
        	            	- (string) (len=10) "labelName1": (string) (len=11) "labelValue1",
        	            	- (string) (len=10) "labelName2": (string) (len=11) "labelValue2"
        	            	-}
        	            	+(map[string]string) <nil>

        	Test:       	TestRemediation
        	Messages:   	Node labels before remediation and after remediation ares not equal
FAIL

Danil-Grigorev · 2020-07-14T10:19:51Z

/retest

Danil-Grigorev · 2020-07-14T10:25:30Z

/retest

Danil-Grigorev · 2020-07-15T06:30:55Z

/retest

This change ensure compatibility with serviceMonitor resource introduced in openshift/machine-api-operator#609

hardys · 2020-07-20T14:35:27Z

/lgtm

openshift-ci-robot · 2020-07-20T14:35:45Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Danil-Grigorev, dhellmann, hardys

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [dhellmann,hardys]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

dhellmann · 2020-07-20T17:25:20Z

/test e2e-metal-ipi

Danil-Grigorev · 2020-07-21T07:03:24Z

/hold cancel

Danil-Grigorev · 2020-07-21T08:23:38Z

/retest

Danil-Grigorev · 2020-07-21T08:26:18Z

/retest

Makefile: Add kubeubilder and kustomize checks.

✨ Extract IPAM and reference its repo

openshift-ci-robot requested review from hardys and russellb June 19, 2020 09:49

dhellmann approved these changes Jun 19, 2020

View reviewed changes

openshift-ci-robot assigned dhellmann Jun 19, 2020

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 19, 2020

Danil-Grigorev mentioned this pull request Jul 2, 2020

Enable prometheus metrics for controllers openshift/machine-api-operator#609

Merged

Danil-Grigorev force-pushed the fix-metrics branch from c5ed1e1 to aaa23b1 Compare July 2, 2020 09:24

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2020

Danil-Grigorev force-pushed the fix-metrics branch from aaa23b1 to e9e60ca Compare July 2, 2020 09:50

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 2, 2020

n1r1 mentioned this pull request Jul 6, 2020

Fix failing unit tests in actuator remediation test #82

Merged

Danil-Grigorev force-pushed the fix-metrics branch from e9e60ca to e743024 Compare July 14, 2020 10:18

Danil-Grigorev force-pushed the fix-metrics branch 2 times, most recently from 7db4c59 to d0d9b1a Compare July 15, 2020 07:27

Switch metrics to :8081 addr

9b51914

This change ensure compatibility with serviceMonitor resource introduced in openshift/machine-api-operator#609

Danil-Grigorev force-pushed the fix-metrics branch from d0d9b1a to 9b51914 Compare July 20, 2020 13:28

dhellmann approved these changes Jul 20, 2020

View reviewed changes

openshift-ci-robot assigned hardys Jul 20, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 20, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 21, 2020

openshift-merge-robot merged commit 71c61cc into openshift:master Jul 21, 2020

Danil-Grigorev deleted the fix-metrics branch July 21, 2020 09:58

honza pushed a commit to honza/cluster-api-provider-baremetal that referenced this pull request Feb 7, 2022

Merge pull request openshift#77 from russellb/kubebuilder-req

acab6c7

Makefile: Add kubeubilder and kustomize checks.

honza pushed a commit to honza/cluster-api-provider-baremetal that referenced this pull request Feb 7, 2022

Merge pull request openshift#77 from Nordix/api-split-mael

dfcfc58

✨ Extract IPAM and reference its repo

Fix metrics #77

Fix metrics #77

Uh oh!

Conversation

Danil-Grigorev commented Jun 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dhellmann left a comment

Choose a reason for hiding this comment

Uh oh!

dhellmann commented Jun 19, 2020

Uh oh!

Danil-Grigorev commented Jun 19, 2020

Uh oh!

openshift-bot commented Jun 19, 2020

Uh oh!

openshift-bot commented Jun 19, 2020

Uh oh!

openshift-bot commented Jun 19, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

openshift-bot commented Jun 20, 2020

Uh oh!

Danil-Grigorev commented Jul 2, 2020

Uh oh!

dhellmann commented Jul 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Danil-Grigorev commented Jul 14, 2020

Uh oh!

Danil-Grigorev commented Jul 14, 2020

Uh oh!

Danil-Grigorev commented Jul 15, 2020

Uh oh!

hardys commented Jul 20, 2020

Uh oh!

openshift-ci-robot commented Jul 20, 2020

Uh oh!

dhellmann commented Jul 20, 2020

Uh oh!

Danil-Grigorev commented Jul 21, 2020

Uh oh!

Danil-Grigorev commented Jul 21, 2020

Uh oh!

Danil-Grigorev commented Jul 21, 2020

Danil-Grigorev commented Jun 19, 2020 •

edited

Loading

dhellmann commented Jul 2, 2020 •

edited

Loading