Skip to content

OCPBUGS-36696: Add details about how to remove OADP Operator after IBU #79042

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

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 18, 2024
@openshift-ci-robot
Copy link

@amolnar-rh: This pull request references Jira Issue OCPBUGS-36696, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED 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:

Version(s): 4.16, 4.17

Issue: issues.redhat.com/browse/OCPBUGS-36696

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jul 18, 2024
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 18, 2024
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 19, 2024
@amolnar-rh amolnar-rh force-pushed the OCPBUGS-36696 branch 3 times, most recently from 00bb195 to a23a25e Compare July 19, 2024 16:00
@Missxiaoguo
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 19, 2024
@amolnar-rh
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Jul 31, 2024
@dfitzmau
Copy link
Contributor

/remove-label peer-review-needed

/label peer-review-in-progress

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jul 31, 2024
Copy link
Contributor

@dfitzmau dfitzmau left a comment

Choose a reason for hiding this comment

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

Hi @amolnar-rh . Nice work on this PR. Please squash the commits as I see 4 commits on this PR.

/remove-label peer-review-in-progress

/label peer-review-done

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR lgtm Indicates that a PR is ready to be merged. labels Jul 31, 2024
Copy link

openshift-ci bot commented Aug 1, 2024

New changes are detected. LGTM label has been removed.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 2, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 7, 2024
@josclark42
Copy link

/lgtm from QE

@openshift-ci-robot
Copy link

@amolnar-rh: This pull request references Jira Issue OCPBUGS-36696, which is invalid:

  • expected the bug to target the "4.18.0" version, but no target version was set
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA 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.

In response to this:

Version(s): 4.16, 4.17

Issue: https://issues.redhat.com/browse/OCPBUGS-36696

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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.

@amolnar-rh
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Aug 13, 2024
@bhardesty
Copy link
Contributor

/label peer-review-in-progress
/remove-label peer-review-needed

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Aug 13, 2024
Copy link
Contributor

@bhardesty bhardesty left a comment

Choose a reason for hiding this comment

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

This looks great - I just had a couple very minor comments.


.Procedure

. Create the following CRs in the `openshift-adp` namespace for both the seed and target clusters, then push the CRs to the `source-crs/custom-crs` directory:
. Extract the following CRs from the `ztp-site-generate` container image and push them to `source-cr` directory:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
. Extract the following CRs from the `ztp-site-generate` container image and push them to `source-cr` directory:
. Extract the following CRs from the `ztp-site-generate` container image and push them to the `source-cr` directory:

policyName: "subscriptions-policy"
[...]
----

. Create the `DataProtectionApplication` CR and the S3 secret only for the target cluster:

.. Create the following CRs in your `source-crs/custom-crs` directory:
.. Extract the following CRs from the `ztp-site-generate` container image and push them to `source-cr` directory:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
.. Extract the following CRs from the `ztp-site-generate` container image and push them to `source-cr` directory:
.. Extract the following CRs from the `ztp-site-generate` container image and push them to the `source-cr` directory:

.. Change the `complianceType` to `mustnothave` for the {oadp-short} Operator namespace, Operator group, and subscription in the `common-ranGen.yaml` file.
+
[source,yaml]
Copy link
Contributor

Choose a reason for hiding this comment

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

Is common-ranGen.yaml an OpenShift API object? If so, this and the following yaml examples should include the required fields (https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/doc_guidelines.adoc#required-fields).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is and it's a file that is provided in the ztp-site-generate container by default so I'd think that the context is clear. However, we don't want to include the full content of the file, only the relevant bits, so I'm putting [...] at the beginning and end

.. Merge the changes with your custom site repository and wait for the ArgoCD application to synchronize the change to the hub cluster. The status of the `common-subscriptions-policy` and the `example-cnf-config-policy` policies change to `Non-Compliant`.

.. Apply the change to your target clusters by using the {cgu-operator-full}. For more information about rolling out configuration changes, see the "Update policies on managed clusters".
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
.. Apply the change to your target clusters by using the {cgu-operator-full}. For more information about rolling out configuration changes, see the "Update policies on managed clusters".
.. Apply the change to your target clusters by using the {cgu-operator-full}. For more information about rolling out configuration changes, see "Update policies on managed clusters".

@bhardesty
Copy link
Contributor

/label peer-review-done
/remove-label peer-review-in-progress

@openshift-ci openshift-ci bot removed the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Aug 13, 2024
Copy link

openshift-ci bot commented Aug 14, 2024

@amolnar-rh: all tests passed!

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.

@amolnar-rh
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 14, 2024
@jab-rh jab-rh added this to the Continuous Release milestone Aug 14, 2024
@jab-rh jab-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 14, 2024
@jab-rh jab-rh merged commit a655523 into openshift:main Aug 14, 2024
2 checks passed
@openshift-ci-robot
Copy link

@amolnar-rh: Jira Issue OCPBUGS-36696 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

In response to this:

Version(s): 4.16, 4.17

Issue: https://issues.redhat.com/browse/OCPBUGS-36696

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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.

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.17

@jab-rh
Copy link
Contributor

jab-rh commented Aug 14, 2024

/cherry-pick enterprise-4.16

@openshift-cherrypick-robot

@jab-rh: new pull request created: #80490

In response to this:

/cherry-pick enterprise-4.17

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.

@openshift-cherrypick-robot

@jab-rh: new pull request created: #80491

In response to this:

/cherry-pick enterprise-4.16

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.

@jab-rh jab-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.16 branch/enterprise-4.17 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.