NO-ISSUE: Synchronize From Upstream Repositories #1024
Conversation
When the change to use the copy content sidecar container was added for the extract content option it properly set the ifNotPresent pull policy for the bundle image, but the actual server container is getting the wrong value and is not based on the opm image passed to the catalog operator. This commit updates the main registry server container to variably set the container to pull only if not present. Signed-off-by: kevinrizza <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 86838d6d9c412f0491892e3826f3536c9c10085e
openshift-bot
added
do-not-merge/hold
openshift-ci-robot
added
the
jira/valid-reference
|
@openshift-bot: This pull request explicitly references no jira issue. In response to this:
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-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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. |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: openshift-bot 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 |
1 similar comment
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: openshift-bot 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 |
|
/unhold |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
A basic test pass, LGTM. launch 4.20,openshift/operator-framework-olm#1024,openshift/operator-framework-operator-controller#382 aws
jiazha-mac:~ jiazha$ oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.20.0-0-2025-06-13-060522-test-ci-ln-wm5w8y2-latest True False 32m Cluster version is 4.20.0-0-2025-06-13-060522-test-ci-ln-wm5w8y2-latest
jiazha-mac:~ jiazha$ oc get pods redhat-operators-xtn2v -o yaml
apiVersion: v1
...
...
spec:
containers:
- args:
- serve
- /extracted-catalog/catalog
- --cache-dir=/extracted-catalog/cache
command:
- /bin/opm
env:
- name: GOMEMLIMIT
value: 30MiB
image: registry.build10.ci.openshift.org/ci-ln-wm5w8y2/stable@sha256:7cc336e75cfab3568453b03bf94432d53b9ee3881077deaa55d98d0ea27f64f1
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
command:
- grpc_health_probe
- -addr=:50051
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
name: registry-server |
openshift-ci
bot
added
qe-approved
|
@openshift-bot: 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. |
|
[ART PR BUILD NOTIFIER] Distgit: operator-lifecycle-manager |
|
[ART PR BUILD NOTIFIER] Distgit: operator-registry |
|
[ART PR BUILD NOTIFIER] Distgit: ose-operator-framework-tools |
The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:
This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.
/cc @openshift/openshift-team-operator-framework