Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #378

/assign anik120

**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
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-858 has been cloned as Jira Issue OCPBUGS-1104. Retitling PR to link against new bug.
/retitle [release-4.11] OCPBUGS-1104: Package Server Manager should enforce expected csv values

In response to this:

This is an automated cherry-pick of #378

/assign anik120

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 openshift-ci bot changed the title [release-4.11] OCPBUGS-858: Package Server Manager should enforce expected csv values [release-4.11] OCPBUGS-1104: Package Server Manager should enforce expected csv values Sep 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 9, 2022

@openshift-cherrypick-robot: 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.

In response to this:

[release-4.11] OCPBUGS-1104: 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-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Sep 9, 2022
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-1104, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-858 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-858 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

In response to this:

This is an automated cherry-pick of #378

/assign anik120

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.

Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu, openshift-cherrypick-robot

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 9, 2022
@anik120
Copy link
Contributor

anik120 commented Sep 12, 2022

/retest

@perdasilva
Copy link
Contributor

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 12, 2022
@anik120
Copy link
Contributor

anik120 commented Sep 12, 2022

/test e2e-gcp-olm-flaky

1 similar comment
@anik120
Copy link
Contributor

anik120 commented Sep 12, 2022

/test e2e-gcp-olm-flaky

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 12, 2022

@openshift-cherrypick-robot: The following test 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/e2e-gcp-olm-flaky 3ef4a94 link false /test e2e-gcp-olm-flaky

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

@jianzhangbjz
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 13, 2022
@openshift-merge-robot openshift-merge-robot merged commit 8b8c451 into openshift:release-4.11 Sep 13, 2022
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #378

/assign anik120

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.

@awgreene
Copy link
Contributor

/cherry-pick release-4.10

@openshift-cherrypick-robot
Copy link
Author

@awgreene: #381 failed to apply on top of branch "release-4.10":

Applying: Package Server Manager should enforce expected csv values
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Package Server Manager should enforce expected csv values
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.10

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
Copy link
Contributor

anik120 commented Sep 20, 2022

opened 4.10 backport PR: #387

perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Jan 15, 2025
)

Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.31.3 to 0.32.0.
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.3...v0.32.0)

---
updated-dependencies:
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: api
Upstream-commit: 4920dbdb60b3baa1eaef96b85dadfad566239c1a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants