[release-4.10] OCPBUGS-1525: Package Server Manager should enforce expected csv values #387

anik120 · 2022-09-20T16:27:04Z

Problem:
The package-server-manifest (PSM) is a downstream specific component responsible for reconciling the package-server csv, which is defined in code as a yaml file. When the PSM reconciles the package-server csv, it:

Attempts to generate the base of the expected CSV from the yaml mentioned above.
Passes the reconcileCSV function as the mutateFn parameter and the expectedCSV as the obj parameter into into controller-runtime's createOrUpdate function.

Controller runtime's createOrUpdate function will apply the mutateFn function against:

The obj you passed in if it does not already exist. OR
The existing on cluster object.

In the case where the mutateFn is applied to the applied to the existing object, changes made to the package-server csv yaml are ignored because the mutateFn (ie the reconcileCSV function) doesn't consider changes to the manifest.

Solution:
Update the reconcileCSV function to:

Ensure that expected annotations and labels are present on the csv.
Ensure that the expected spec is present on the csv.

**Problem:** The package-server-manifest (PSM) is a downstream specific component responsible for reconciling the package-server csv, which is defined in code as a yaml file. When the PSM reconciles the package-server csv, it: - Attempts to generate the base of the expected CSV from the yaml mentioned above. - Passes the reconcileCSV function as the mutateFn parameter and the expectedCSV as the `obj` parameter into into controller-runtime's createOrUpdate function. Controller runtime's createOrUpdate function will apply the mutateFn function against: - The `obj` you passed in if it does not already exist. OR - The existing on cluster object. In the case where the mutateFn is applied to the applied to the existing object, changes made to the package-server csv yaml are ignored because the mutateFn (ie the reconcileCSV function) doesn't consider changes to the manifest. **Solution:** Update the reconcileCSV function to: - Ensure that expected annotations and labels are present on the csv. - Ensure that the expected spec is present on the csv.

openshift-ci-robot · 2022-09-20T16:27:07Z

@anik120: This pull request references Jira Issue OCPBUGS-1525, which is invalid:

expected dependent Jira Issue OCPBUGS-858 to target a version in 4.11.0, 4.11.z, but it targets "4.12.0" 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.

Details

In response to this:

Problem:
The package-server-manifest (PSM) is a downstream specific component responsible for reconciling the package-server csv, which is defined in code as a yaml file. When the PSM reconciles the package-server csv, it:

Attempts to generate the base of the expected CSV from the yaml mentioned above.

Passes the reconcileCSV function as the mutateFn parameter and the expectedCSV as the obj parameter into into controller-runtime's createOrUpdate function.

Controller runtime's createOrUpdate function will apply the mutateFn function against:

The obj you passed in if it does not already exist. OR

The existing on cluster object.

In the case where the mutateFn is applied to the applied to the existing object, changes made to the package-server csv yaml are ignored because the mutateFn (ie the reconcileCSV function) doesn't consider changes to the manifest.

Solution:
Update the reconcileCSV function to:

Ensure that expected annotations and labels are present on the csv.

Ensure that the expected spec is present on the csv.

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/test-infra repository.

openshift-ci · 2022-09-20T16:27:08Z

@anik120: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

OCPBUGS-1525: Package Server Manager should enforce expected csv values

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/test-infra repository.

openshift-ci · 2022-09-20T16:27:48Z

@anik120: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

[release-4.10] OCPBUGS-1525: Package Server Manager should enforce expected csv values

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/test-infra repository.

anik120 · 2022-09-20T16:30:56Z

/jira refresh

openshift-ci-robot · 2022-09-20T16:30:58Z

@anik120: This pull request references Jira Issue OCPBUGS-1525, which is invalid:

expected Jira Issue OCPBUGS-1525 to depend on a bug targeting a version in 4.11.0, 4.11.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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.

Details

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 kubernetes/test-infra repository.

anik120 · 2022-09-20T16:31:35Z

/jira refresh

openshift-ci-robot · 2022-09-20T16:31:40Z

@anik120: This pull request references Jira Issue OCPBUGS-1525, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.10.z) matches configured target version for branch (4.10.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-1104 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-1104 targets the "4.11.z" version, which is one of the valid target versions: 4.11.0, 4.11.z
bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

Details

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 kubernetes/test-infra repository.

anik120 · 2022-09-20T18:42:59Z

/retest

timflannagan

/uncc

openshift-ci · 2022-09-20T19:24:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, timflannagan

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~~ [anik120,timflannagan]

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

jianzhangbjz · 2022-09-21T04:04:57Z

/label qe-approved
/label cherry-pick-approved

timflannagan · 2022-09-21T13:02:22Z

/retest

perdasilva · 2022-09-21T14:03:52Z

/label backport-risk-assessed

awgreene · 2022-09-21T14:03:56Z

/label backport-risk-assessed

anik120 · 2023-01-16T16:53:49Z

/override ci/prow/e2e-aws-olm

openshift-ci · 2023-01-16T16:54:13Z

@anik120: Overrode contexts on behalf of anik120: ci/prow/e2e-aws-olm

Details

In response to this:

/override ci/prow/e2e-aws-olm

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/test-infra repository.

openshift-ci-robot · 2023-01-16T19:44:53Z

/retest-required

Remaining retests: 0 against base HEAD 8892eeb and 2 for PR HEAD 5f3f8e2 in total

anik120 · 2023-01-16T20:18:12Z

/retest

anik120 · 2023-01-17T02:50:02Z

/override e2e-aws-olm

ref: #387 (comment)

openshift-ci · 2023-01-17T02:50:17Z

@anik120: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

e2e-aws-olm

Only the following failed contexts/checkruns were expected:

ci/prow/e2e-aws-console-olm
ci/prow/e2e-aws-olm
ci/prow/e2e-gcp
ci/prow/e2e-gcp-olm
ci/prow/e2e-gcp-olm-flaky
ci/prow/e2e-upgrade
ci/prow/images
ci/prow/unit-api
ci/prow/unit-olm
ci/prow/unit-registry
ci/prow/verify
pull-ci-openshift-operator-framework-olm-master-e2e-gcp-olm
pull-ci-openshift-operator-framework-olm-master-e2e-gcp-olm-flaky
pull-ci-openshift-operator-framework-olm-master-e2e-upgrade
pull-ci-openshift-operator-framework-olm-master-images
pull-ci-openshift-operator-framework-olm-master-unit-api
pull-ci-openshift-operator-framework-olm-master-unit-olm
pull-ci-openshift-operator-framework-olm-master-unit-registry
pull-ci-openshift-operator-framework-olm-master-verify
pull-ci-openshift-operator-framework-olm-release-4.10-e2e-aws-console-olm
pull-ci-openshift-operator-framework-olm-release-4.10-e2e-gcp
pull-ci-openshift-operator-framework-olm-release-4.8-e2e-aws-olm
tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override e2e-aws-olm

ref: #387 (comment)

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/test-infra repository.

anik120 · 2023-01-17T02:53:55Z

/override ci/prow/e2e-aws-olm

openshift-ci · 2023-01-17T02:54:18Z

@anik120: Overrode contexts on behalf of anik120: ci/prow/e2e-aws-olm

Details

In response to this:

/override ci/prow/e2e-aws-olm

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/test-infra repository.

anik120 · 2023-01-17T16:41:49Z

/test e2e-gcp-olm

anik120 · 2023-01-18T17:20:46Z

/test e2e-gcp-olm

openshift-ci · 2023-01-18T19:32:55Z

@anik120: all tests passed!

Full PR test history. Your PR dashboard.

Details

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/test-infra repository. I understand the commands that are listed here.

openshift-ci-robot · 2023-01-18T19:39:44Z

@anik120: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-1525 has been moved to the MODIFIED state.

Details

In response to this:

Problem:
The package-server-manifest (PSM) is a downstream specific component responsible for reconciling the package-server csv, which is defined in code as a yaml file. When the PSM reconciles the package-server csv, it:

Attempts to generate the base of the expected CSV from the yaml mentioned above.

Passes the reconcileCSV function as the mutateFn parameter and the expectedCSV as the obj parameter into into controller-runtime's createOrUpdate function.

Controller runtime's createOrUpdate function will apply the mutateFn function against:

The obj you passed in if it does not already exist. OR

The existing on cluster object.

In the case where the mutateFn is applied to the applied to the existing object, changes made to the package-server csv yaml are ignored because the mutateFn (ie the reconcileCSV function) doesn't consider changes to the manifest.

Solution:
Update the reconcileCSV function to:

Ensure that expected annotations and labels are present on the csv.

Ensure that the expected spec is present on the csv.

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/test-infra repository.

Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: api Upstream-commit: cbc560493dab9366e79e718ddfce2512ea81c813

Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: api Upstream-commit: cbc560493dab9366e79e718ddfce2512ea81c813 Signed-off-by: Per Goncalves da Silva <[email protected]>

Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: api Upstream-commit: cbc560493dab9366e79e718ddfce2512ea81c813

openshift-ci-robot added the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Sep 20, 2022

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 20, 2022

anik120 mentioned this pull request Sep 20, 2022

[release-4.11] OCPBUGS-1104: Package Server Manager should enforce expected csv values #381

Merged

openshift-ci bot requested review from ankitathomas and dinhxuanvu September 20, 2022 16:27

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2022

anik120 changed the title ~~OCPBUGS-1525: Package Server Manager should enforce expected csv values~~ [release-4.10] OCPBUGS-1525: Package Server Manager should enforce expected csv values Sep 20, 2022

openshift-ci bot requested a review from jianzhangbjz September 20, 2022 16:31

timflannagan approved these changes Sep 20, 2022

View reviewed changes

openshift-ci bot assigned timflannagan Sep 20, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2022

openshift-ci bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Sep 21, 2022

openshift-merge-robot merged commit 1770db7 into openshift:release-4.10 Jan 18, 2023

perdasilva mentioned this pull request Jan 15, 2025

NO-ISSUE: Manual Synchronize From Upstream Repositories #933

Merged

[release-4.10] OCPBUGS-1525: Package Server Manager should enforce expected csv values #387

[release-4.10] OCPBUGS-1525: Package Server Manager should enforce expected csv values #387

Uh oh!

Conversation

anik120 commented Sep 20, 2022

Uh oh!

openshift-ci-robot commented Sep 20, 2022

Uh oh!

openshift-ci bot commented Sep 20, 2022

Uh oh!

openshift-ci bot commented Sep 20, 2022

Uh oh!

anik120 commented Sep 20, 2022

Uh oh!

openshift-ci-robot commented Sep 20, 2022

Uh oh!

anik120 commented Sep 20, 2022

Uh oh!

openshift-ci-robot commented Sep 20, 2022

Uh oh!

anik120 commented Sep 20, 2022

Uh oh!

timflannagan left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Sep 20, 2022

Uh oh!

jianzhangbjz commented Sep 21, 2022

Uh oh!

timflannagan commented Sep 21, 2022

Uh oh!

perdasilva commented Sep 21, 2022

Uh oh!

awgreene commented Sep 21, 2022

Uh oh!

anik120 commented Jan 16, 2023

Uh oh!

openshift-ci bot commented Jan 16, 2023

Uh oh!

openshift-ci-robot commented Jan 16, 2023

Uh oh!

anik120 commented Jan 16, 2023

Uh oh!

anik120 commented Jan 17, 2023

Uh oh!

openshift-ci bot commented Jan 17, 2023

Uh oh!

anik120 commented Jan 17, 2023

Uh oh!

openshift-ci bot commented Jan 17, 2023

Uh oh!

anik120 commented Jan 17, 2023

Uh oh!

anik120 commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants