Skip to content
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

[release-4.14] OCPBUGS-19063: amend OLM catalogs ImageStream according to annotation #3016

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #3001

/assign celebdor

tiraboschi and others added 2 commits September 15, 2023 15:02
With openshift#2947
we introduced a mechanism to amend the OLM catalog
ImageStream according to OpenShiftImageRegistryOverrides
that are always automatically initializaed according to
any ImageContentSourcePolicy (ICSP) or any ImageDigestMirrorSet (IDMS)
instance from an OpenShift management cluster.

But assuming that the whole default OLM catalogs
got properly mirrored to a different registry
just because an ICSP is there on the management cluster is
overblown and with the imagestream the replacements cannot be
validated ahead ot time.

Let's not do it by default according to ICSP/IDMS
on the management cluster but only according to the
value of a new explicit annotation.

Automatically mirror the 5 involved annotations
from the HC CR to the HCP one.

Fixes: https://issues.redhat.com/browse/OCPBUGS-18720

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-18720 has been cloned as Jira Issue OCPBUGS-19063. Will retitle bug to link to clone.
/retitle [release-4.14] OCPBUGS-19063: amend OLM catalogs ImageStream according to annotation

In response to this:

This is an automated cherry-pick of #3001

/assign celebdor

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.14] OCPBUGS-18720: amend OLM catalogs ImageStream according to annotation [release-4.14] OCPBUGS-19063: amend OLM catalogs ImageStream according to annotation Sep 15, 2023
@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-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 15, 2023
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-19063, 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.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-18720 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-18720 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

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

In response to this:

This is an automated cherry-pick of #3001

/assign celebdor

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 added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels Sep 15, 2023
@tiraboschi
Copy link
Contributor

/retest

@sjenning
Copy link
Contributor

/test e2e-kubevirt-aws-ovn

@sjenning
Copy link
Contributor

/override "Red Hat Trusted App Pipeline / hypershift-release-414-on-pull-request"

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 18, 2023

@sjenning: Overrode contexts on behalf of sjenning: Red Hat Trusted App Pipeline / hypershift-release-414-on-pull-request

In response to this:

/override "Red Hat Trusted App Pipeline / hypershift-release-414-on-pull-request"

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.

@sjenning
Copy link
Contributor

/test e2e-kubevirt-aws-ovn

@sjenning
Copy link
Contributor

/approve
/lgtm

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

openshift-ci bot commented Sep 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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 18, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 18, 2023

@openshift-cherrypick-robot: 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/e2e-ibmcloud-iks e78ed4f link false /test e2e-ibmcloud-iks
ci/prow/e2e-ibmcloud-roks e78ed4f link false /test e2e-ibmcloud-roks

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.

@openshift-merge-robot openshift-merge-robot merged commit 42f796c into openshift:release-4.14 Sep 18, 2023
8 of 11 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-19063: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #3001

/assign celebdor

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.

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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants