OCPBUGS-17113: Lazy updates for Prometheus #2395

rexagod · 2024-06-26T00:40:26Z

Incorporate openshift/library-go#1575 downstream.

I added CHANGELOG entry for this change.
No user facing changes, so no entry in CHANGELOG was needed.

openshift-ci-robot · 2024-06-26T00:40:31Z

@rexagod: This pull request references Jira Issue OCPBUGS-17113, which is invalid:

expected the bug to target either version "4.17." or "openshift-4.17.", but it targets "4.15.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Incorporate openshift/library-go#1575 downstream.

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2024-06-26T00:41:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rexagod

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [rexagod]

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

rexagod · 2024-06-26T00:41:54Z

/jira refresh

openshift-ci-robot · 2024-06-26T00:41:59Z

@rexagod: This pull request references Jira Issue OCPBUGS-17113, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.0) matches configured target version for branch (4.17.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

rexagod · 2024-06-26T16:44:51Z

/retest-required

juzhao · 2024-06-28T03:43:40Z

/retest-required

juzhao · 2024-07-01T02:43:31Z

/retest-required

rexagod · 2024-07-02T23:55:04Z

/test e2e-aws-ovn-techpreview

juzhao · 2024-07-04T08:15:08Z

/label qe-approved

machine424

Thanks!
I left some comments.

pkg/client/client.go

pkg/client/client_test.go

pkg/client/client.go

rexagod · 2024-08-05T07:47:26Z

pkg/client/client_test.go

+			shouldUpdate: true,
 		},
 		{
 			description: "apply no value to the existing prometheus",
 			prometheus: &monv1.Prometheus{
 				TypeMeta:   initialPrometheus.TypeMeta,
 				ObjectMeta: initialPrometheus.ObjectMeta,
 			},
+			shouldUpdate: true,


With the no defaulting approach, there won't be a difference between default and non-default applications, as both will trigger updates as compared to just the latter earlier, at the benefit of not maintaining hardcoded default values in CMO.

rexagod · 2024-09-11T06:56:42Z

/test versions

rexagod · 2024-09-18T07:53:30Z

/test versions

jan--f · 2024-09-19T15:05:23Z

Makefile

+	go test -run NONE -bench ^Bench -benchmem $(PKGS)
+
 .PHONY: test
 test: test-unit test-rules test-e2e

 .PHONY: test-unit
 test-unit:
-	go test -race -short $(PKGS) -count=1
+	go test -run ^Test -race -short $(PKGS) -count=1

 .PHONY: test-e2e
 test-e2e: KUBECONFIG?=$(HOME)/.kube/config
 test-e2e:
-	go test -v -timeout=150m ./test/e2e/ --kubeconfig $(KUBECONFIG)
+	go test -run ^Test -v -timeout=150m ./test/e2e/ --kubeconfig $(KUBECONFIG)


Are the -run parameters really needed? I thought go test already only runs functions that start with Test and go run -bench . runs the Benchmark prefixed tests.

I verified that the tests and benches can indeed be run using go test and go test -bench=., not sure why I assumed otherwise. Sorry for the confusion here, will revert.

jan--f · 2024-09-19T15:12:33Z

pkg/client/client.go

 	if err != nil {
-		return fmt.Errorf("updating Prometheus object failed: %w", err)
+		return didUpdate, fmt.Errorf("updating Prometheus object failed: %w", err)


I find the interface a bit confusing. The bool is ignored in all call sites except for tests. But the tests only test shouldUpdate=true and err != nil. Its not clear what that scenario actually means and why CreateOrUpdatePrometheus needs to add this to its signature.
We should at least have some clarifying comments.

Added a comment to clarify the matrix formed by the return values. I've added it at the function header since the wrapper preserves similar expectations and for more visibility. LMK if it looks odd and I'll move it in.

rexagod · 2024-09-23T10:45:02Z

/test e2e-aws-ovn-single-node

Flaking.

Incorporate openshift/library-go#1575 downstream. Signed-off-by: Pranshu Srivastava <[email protected]>

rexagod · 2024-10-09T05:28:43Z

Blocked by openshift/library-go#1823.

rexagod · 2024-10-10T08:24:27Z

Refactor the resourceapply signature as stated OCPBUGS-17113: Lazy updates for Prometheus #2395 (comment) to drop the bool param.

EDIT: Will update this PR once openshift/library-go#1833 is in.

openshift-bot · 2025-01-14T09:00:23Z

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

openshift-merge-robot · 2025-01-14T09:00:37Z

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

rexagod · 2025-01-15T08:11:27Z

/remove-lifecycle stale

openshift-ci · 2025-01-17T16:44:54Z

@rexagod: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/verify	`70fc333`	link	true	`/test verify`
ci/prow/unit	`70fc333`	link	true	`/test unit`
ci/prow/e2e-aws-ovn	`70fc333`	link	true	`/test e2e-aws-ovn`
ci/prow/images	`70fc333`	link	true	`/test images`
ci/prow/go-fmt	`70fc333`	link	true	`/test go-fmt`
ci/prow/e2e-aws-ovn-techpreview	`70fc333`	link	true	`/test e2e-aws-ovn-techpreview`
ci/prow/e2e-aws-ovn-upgrade	`70fc333`	link	true	`/test e2e-aws-ovn-upgrade`
ci/prow/jsonnet-fmt	`70fc333`	link	true	`/test jsonnet-fmt`
ci/prow/okd-scos-images	`70fc333`	link	true	`/test okd-scos-images`
ci/prow/vendor	`70fc333`	link	true	`/test vendor`
ci/prow/e2e-hypershift-conformance	`70fc333`	link	true	`/test e2e-hypershift-conformance`
ci/prow/generate	`70fc333`	link	true	`/test generate`
ci/prow/e2e-agnostic-operator	`70fc333`	link	true	`/test e2e-agnostic-operator`
ci/prow/golangci-lint	`70fc333`	link	true	`/test golangci-lint`
ci/prow/shellcheck	`70fc333`	link	true	`/test shellcheck`
ci/prow/rules	`70fc333`	link	true	`/test rules`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci bot requested review from jan--f and slashpai June 26, 2024 00:41

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 26, 2024

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 26, 2024

openshift-ci bot requested a review from juzhao June 26, 2024 00:42

rexagod marked this pull request as draft June 26, 2024 06:51

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 26, 2024

rexagod marked this pull request as ready for review June 26, 2024 06:52

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 26, 2024

openshift-ci bot requested review from machine424 and marioferh June 26, 2024 06:53

rexagod force-pushed the mon-17113-lib-go-1575 branch 5 times, most recently from 484f320 to d394434 Compare June 26, 2024 13:53

rexagod force-pushed the mon-17113-lib-go-1575 branch from d394434 to 29846c5 Compare June 26, 2024 20:04

rexagod force-pushed the mon-17113-lib-go-1575 branch from 29846c5 to 564d684 Compare July 2, 2024 20:39

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jul 4, 2024

machine424 reviewed Jul 8, 2024

View reviewed changes

rexagod force-pushed the mon-17113-lib-go-1575 branch from 5b0d83b to 4e75b4a Compare August 5, 2024 00:12

rexagod commented Aug 5, 2024

View reviewed changes

openshift-ci-robot mentioned this pull request Aug 29, 2024

OCPBUGS-17113: rework unstructured types for monitoring openshift/library-go#1575

Merged

rexagod force-pushed the mon-17113-lib-go-1575 branch 2 times, most recently from f71b993 to 15b56ea Compare September 9, 2024 05:53

jan--f reviewed Sep 19, 2024

View reviewed changes

rexagod force-pushed the mon-17113-lib-go-1575 branch 4 times, most recently from 80dc2e3 to 30dc110 Compare September 19, 2024 21:08

rexagod added 2 commits October 7, 2024 12:00

OCPBUGS-17113: Lazy updates for Prometheus

0d7194a

Incorporate openshift/library-go#1575 downstream. Signed-off-by: Pranshu Srivastava <[email protected]>

fixup! OCPBUGS-17113: Lazy updates for Prometheus

70fc333

rexagod force-pushed the mon-17113-lib-go-1575 branch from 30dc110 to 70fc333 Compare October 7, 2024 06:30

openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 14, 2025

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 14, 2025

openshift-ci bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-17113: Lazy updates for Prometheus #2395

OCPBUGS-17113: Lazy updates for Prometheus #2395

rexagod commented Jun 26, 2024

openshift-ci-robot commented Jun 26, 2024

openshift-ci bot commented Jun 26, 2024

rexagod commented Jun 26, 2024

openshift-ci-robot commented Jun 26, 2024

rexagod commented Jun 26, 2024

juzhao commented Jun 28, 2024

juzhao commented Jul 1, 2024

rexagod commented Jul 2, 2024

juzhao commented Jul 4, 2024

machine424 left a comment

rexagod Aug 5, 2024 •

edited

Loading

rexagod commented Sep 11, 2024

rexagod commented Sep 18, 2024

jan--f Sep 19, 2024

rexagod Sep 19, 2024 •

edited

Loading

jan--f Sep 19, 2024

rexagod Sep 19, 2024 •

edited

Loading

rexagod commented Sep 23, 2024

rexagod commented Oct 9, 2024

rexagod commented Oct 10, 2024 •

edited

Loading

openshift-bot commented Jan 14, 2025

openshift-merge-robot commented Jan 14, 2025

rexagod commented Jan 15, 2025

openshift-ci bot commented Jan 17, 2025

OCPBUGS-17113: Lazy updates for Prometheus #2395

Are you sure you want to change the base?

OCPBUGS-17113: Lazy updates for Prometheus #2395

Conversation

rexagod commented Jun 26, 2024

openshift-ci-robot commented Jun 26, 2024

openshift-ci bot commented Jun 26, 2024

rexagod commented Jun 26, 2024

openshift-ci-robot commented Jun 26, 2024

rexagod commented Jun 26, 2024

juzhao commented Jun 28, 2024

juzhao commented Jul 1, 2024

rexagod commented Jul 2, 2024

juzhao commented Jul 4, 2024

machine424 left a comment

Choose a reason for hiding this comment

rexagod Aug 5, 2024 • edited Loading

Choose a reason for hiding this comment

rexagod commented Sep 11, 2024

rexagod commented Sep 18, 2024

jan--f Sep 19, 2024

Choose a reason for hiding this comment

rexagod Sep 19, 2024 • edited Loading

Choose a reason for hiding this comment

jan--f Sep 19, 2024

Choose a reason for hiding this comment

rexagod Sep 19, 2024 • edited Loading

Choose a reason for hiding this comment

rexagod commented Sep 23, 2024

rexagod commented Oct 9, 2024

rexagod commented Oct 10, 2024 • edited Loading

openshift-bot commented Jan 14, 2025

openshift-merge-robot commented Jan 14, 2025

rexagod commented Jan 15, 2025

openshift-ci bot commented Jan 17, 2025

rexagod Aug 5, 2024 •

edited

Loading

rexagod Sep 19, 2024 •

edited

Loading

rexagod Sep 19, 2024 •

edited

Loading

rexagod commented Oct 10, 2024 •

edited

Loading