Skip to content

Commit 8bdc907

Browse files
authored
Merge pull request #821 from snir911/oci-image
bundle: set RELATED_IMAGE_PODVM_OCI
2 parents 694bee2 + a37de92 commit 8bdc907

File tree

3 files changed

+34
-2
lines changed

3 files changed

+34
-2
lines changed

bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
}
1414
]
1515
capabilities: Seamless Upgrades
16-
createdAt: "2025-07-02T13:32:40Z"
16+
createdAt: "2025-07-20T08:00:23Z"
1717
features.operators.openshift.io/cnf: "false"
1818
features.operators.openshift.io/cni: "false"
1919
features.operators.openshift.io/csi: "false"
@@ -399,6 +399,8 @@ spec:
399399
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:fec854750f7c5e137d0f77d2069e8a8cb66b17d6e4fc8f8eec2df22b56b2772e
400400
- name: RELATED_IMAGE_PODVM_PAYLOAD
401401
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:73a82ac1c252f068f9d046a36dfca7932202ad728f94fc575a332d8707650905
402+
- name: RELATED_IMAGE_PODVM_OCI
403+
value: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:93f3c45cda820a16030273e5a3f5c186d602f9affcb3cfa91230084a516dc3f4
402404
envFrom:
403405
- secretRef:
404406
name: peer-pods-secret
@@ -555,6 +557,8 @@ spec:
555557
name: podvm-builder
556558
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:73a82ac1c252f068f9d046a36dfca7932202ad728f94fc575a332d8707650905
557559
name: podvm-payload
560+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:93f3c45cda820a16030273e5a3f5c186d602f9affcb3cfa91230084a516dc3f4
561+
name: podvm-oci
558562
replaces: sandboxed-containers-operator.v1.9.0
559563
version: 1.10.0
560564
webhookdefinitions:

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
- name: RELATED_IMAGE_PODVM_PAYLOAD
8989
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:73a82ac1c252f068f9d046a36dfca7932202ad728f94fc575a332d8707650905
9090
- name: RELATED_IMAGE_PODVM_OCI
91-
value: ""
91+
value: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:93f3c45cda820a16030273e5a3f5c186d602f9affcb3cfa91230084a516dc3f4
9292
imagePullPolicy: Always
9393
resources:
9494
limits:

config/peerpods/podvm/osc-podvm-create-job.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,18 @@ spec:
8181
readOnly: true
8282
- name: store-volume
8383
mountPath: /store
84+
- name: registries-conf
85+
mountPath: /etc/containers/registries.conf
86+
readOnly: true
87+
- name: registries-conf-d
88+
mountPath: /etc/containers/registries.conf.d
89+
readOnly: true
90+
- name: containers-auth
91+
mountPath: /root/.config/containers/auth.json
92+
readOnly: true
93+
- name: containers-policy
94+
mountPath: /etc/containers/policy.json
95+
readOnly: true
8496
# Default is 30s which is too less for the preStop hook to fully execute
8597
terminationGracePeriodSeconds: 180
8698
volumes:
@@ -99,4 +111,20 @@ spec:
99111
optional: true
100112
- name: store-volume
101113
emptyDir: {}
114+
- name: registries-conf
115+
hostPath:
116+
path: /etc/containers/registries.conf
117+
type: FileOrCreate
118+
- name: registries-conf-d
119+
hostPath:
120+
path: /etc/containers/registries.conf.d
121+
type: DirectoryOrCreate
122+
- name: containers-auth
123+
hostPath:
124+
path: /var/lib/kubelet/config.json
125+
type: File
126+
- name: containers-policy
127+
hostPath:
128+
path: /etc/containers/policy.json
129+
type: FileOrCreate
102130
restartPolicy: Never

0 commit comments

Comments
 (0)