Skip to content

Commit 7828ce1

Browse files
ANJANA-A-R-KANJANA-A-R-K
authored
Merge branch 'devel' into upgrade-test
2 parents 6d1a98e + 60a71a0 commit 7828ce1

File tree

12 files changed

+4152
-4026
lines changed

12 files changed

+4152
-4026
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -401,31 +401,31 @@ spec:
401401
- name: RELATED_IMAGE_KATA_MONITOR
402402
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9@sha256:af10f44b5976fdbf3609323a25e6b9fdc44f6f78e35aad39ed19e0ee6c9a6e34
403403
- name: RELATED_IMAGE_CAA
404-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9@sha256:408eaaac58d01892aa2087153eda6f451788c02b8b719dca8e710a8916b2e081
404+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9@sha256:a4ea3b6bd7c0eef04f416a1cfa95548efc4932c4bbc5d1800ded5be95e4a346e
405405
- name: RELATED_IMAGE_PEERPODS_WEBHOOK
406-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9@sha256:4a533f77a4f1415b8eed0d3f5a4ba9d62edd329bf304f26f23b0c1d886dddb71
406+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9@sha256:d532b83d44f241717736caa944e7709aca7583f3b2378cfd09e85129f32bd19b
407407
- name: RELATED_IMAGE_PODVM_BUILDER
408-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:805b6d79668e5d3ba2d7f7f7e60d67b512d17904bb8b0997d036550ef7ec4c2c
408+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:1946446e6d9a981545270d1fd7cf5dfcaa43117f04819fbdc2d44959603d39dc
409409
- name: RELATED_IMAGE_PODVM_PAYLOAD
410-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:7317c2d8c0ac8e542e39d695851c4add301593d2b52af80c77fd4f996efbe2b8
410+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:c02b94e504810e546cb72b0a92a4b5ca3ae3fe14cff55a6d404421e301d73691
411411
- name: RELATED_IMAGE_PODVM_OCI
412-
value: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:0eb5efd518128ac6df93fec2e5d24c4c5662d5407e016d1f66579cc9ce4529ea
412+
value: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:afe6c9d5ffc936d66bd22b76de5ca949be1dcd003950939e9dde070aa7cff224
413413
- name: RELATED_IMAGE_MUST_GATHER
414-
value: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9@sha256:0f0aca3dee0e5b5407e039d25dd053cb00b26d965ba49614d441d60603963d94
414+
value: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9@sha256:b4aec6c5826edc9d1266b10cb001de0df355f33cd3000404e4c353e91c2fdd6d
415415
- name: RELATED_IMAGE_PCCS
416-
value: registry.redhat.io/openshift-sandboxed-containers/osc-pccs@sha256:de64fc7b13aaa7e466e825d62207f77e7c63a4f9da98663c3ab06abc45f2334d
416+
value: registry.redhat.io/openshift-sandboxed-containers/osc-pccs@sha256:494dae8ee05643c76d29d1b99f2315446d7822f09b34ffbb20c872bf3a2e3f8d
417417
- name: RELATED_IMAGE_TDX_QGS
418-
value: registry.redhat.io/openshift-sandboxed-containers/osc-tdx-qgs@sha256:86b23461c4eea073f4535a777374a54e934c37ac8c96c6180030f92ebf970524
418+
value: registry.redhat.io/openshift-sandboxed-containers/osc-tdx-qgs@sha256:f1f263b5ae8304a701b8d9b95f6c3decdaf1b97c3f54ee390da67d4aabd0c44f
419419
- name: RELATED_IMAGE_STORAGE_HELPER
420-
value: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper@sha256:c9b31c8acd23c6925d6bf193696817f14a52b0f0fcbd8459023b5d69da93482e
420+
value: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper@sha256:4cfabc14a2cc00e64c667917b35113f996b12c0afd9ab613a5a7a9aaefa9d19c
421421
envFrom:
422422
- secretRef:
423423
name: peer-pods-secret
424424
optional: true
425425
- configMapRef:
426426
name: peer-pods-cm
427427
optional: true
428-
image: registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator@sha256:51666a78b63c90601e2cefda72d6755e2006ad8574d0b29268a66918e918e1a6
428+
image: registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator@sha256:c0072f9fe52a0a36daad9d6235e57ea034ad5dd0aedd74cbf0bb6316e2c62aa4
429429
imagePullPolicy: Always
430430
name: manager
431431
ports:
@@ -498,7 +498,7 @@ spec:
498498
containers:
499499
- command:
500500
- /metrics-server
501-
image: registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator@sha256:51666a78b63c90601e2cefda72d6755e2006ad8574d0b29268a66918e918e1a6
501+
image: registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator@sha256:c0072f9fe52a0a36daad9d6235e57ea034ad5dd0aedd74cbf0bb6316e2c62aa4
502502
name: metrics-server
503503
ports:
504504
- containerPort: 8091
@@ -566,23 +566,23 @@ spec:
566566
relatedImages:
567567
- image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9@sha256:af10f44b5976fdbf3609323a25e6b9fdc44f6f78e35aad39ed19e0ee6c9a6e34
568568
name: kata-monitor
569-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9@sha256:408eaaac58d01892aa2087153eda6f451788c02b8b719dca8e710a8916b2e081
569+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9@sha256:a4ea3b6bd7c0eef04f416a1cfa95548efc4932c4bbc5d1800ded5be95e4a346e
570570
name: caa
571-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9@sha256:4a533f77a4f1415b8eed0d3f5a4ba9d62edd329bf304f26f23b0c1d886dddb71
571+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9@sha256:d532b83d44f241717736caa944e7709aca7583f3b2378cfd09e85129f32bd19b
572572
name: peerpods-webhook
573-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:805b6d79668e5d3ba2d7f7f7e60d67b512d17904bb8b0997d036550ef7ec4c2c
573+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:1946446e6d9a981545270d1fd7cf5dfcaa43117f04819fbdc2d44959603d39dc
574574
name: podvm-builder
575-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:7317c2d8c0ac8e542e39d695851c4add301593d2b52af80c77fd4f996efbe2b8
575+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:c02b94e504810e546cb72b0a92a4b5ca3ae3fe14cff55a6d404421e301d73691
576576
name: podvm-payload
577-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:0eb5efd518128ac6df93fec2e5d24c4c5662d5407e016d1f66579cc9ce4529ea
577+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:afe6c9d5ffc936d66bd22b76de5ca949be1dcd003950939e9dde070aa7cff224
578578
name: podvm-oci
579-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9@sha256:0f0aca3dee0e5b5407e039d25dd053cb00b26d965ba49614d441d60603963d94
579+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9@sha256:b4aec6c5826edc9d1266b10cb001de0df355f33cd3000404e4c353e91c2fdd6d
580580
name: must-gather
581-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-pccs@sha256:de64fc7b13aaa7e466e825d62207f77e7c63a4f9da98663c3ab06abc45f2334d
581+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-pccs@sha256:494dae8ee05643c76d29d1b99f2315446d7822f09b34ffbb20c872bf3a2e3f8d
582582
name: pccs
583-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-tdx-qgs@sha256:86b23461c4eea073f4535a777374a54e934c37ac8c96c6180030f92ebf970524
583+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-tdx-qgs@sha256:f1f263b5ae8304a701b8d9b95f6c3decdaf1b97c3f54ee390da67d4aabd0c44f
584584
name: tdx-qgs
585-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper@sha256:c9b31c8acd23c6925d6bf193696817f14a52b0f0fcbd8459023b5d69da93482e
585+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper@sha256:4cfabc14a2cc00e64c667917b35113f996b12c0afd9ab613a5a7a9aaefa9d19c
586586
name: storage-helper
587587
replaces: sandboxed-containers-operator.v1.11.0
588588
version: 1.11.1

‎config/manager/manager.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,23 @@ spec:
8080
- name: RELATED_IMAGE_KATA_MONITOR
8181
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9@sha256:af10f44b5976fdbf3609323a25e6b9fdc44f6f78e35aad39ed19e0ee6c9a6e34
8282
- name: RELATED_IMAGE_CAA
83-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9@sha256:408eaaac58d01892aa2087153eda6f451788c02b8b719dca8e710a8916b2e081
83+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9@sha256:a4ea3b6bd7c0eef04f416a1cfa95548efc4932c4bbc5d1800ded5be95e4a346e
8484
- name: RELATED_IMAGE_PEERPODS_WEBHOOK
85-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9@sha256:4a533f77a4f1415b8eed0d3f5a4ba9d62edd329bf304f26f23b0c1d886dddb71
85+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9@sha256:d532b83d44f241717736caa944e7709aca7583f3b2378cfd09e85129f32bd19b
8686
- name: RELATED_IMAGE_PODVM_BUILDER
87-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:805b6d79668e5d3ba2d7f7f7e60d67b512d17904bb8b0997d036550ef7ec4c2c
87+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9@sha256:1946446e6d9a981545270d1fd7cf5dfcaa43117f04819fbdc2d44959603d39dc
8888
- name: RELATED_IMAGE_PODVM_PAYLOAD
89-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:7317c2d8c0ac8e542e39d695851c4add301593d2b52af80c77fd4f996efbe2b8
89+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9@sha256:c02b94e504810e546cb72b0a92a4b5ca3ae3fe14cff55a6d404421e301d73691
9090
- name: RELATED_IMAGE_PODVM_OCI
91-
value: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:0eb5efd518128ac6df93fec2e5d24c4c5662d5407e016d1f66579cc9ce4529ea
91+
value: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image@sha256:afe6c9d5ffc936d66bd22b76de5ca949be1dcd003950939e9dde070aa7cff224
9292
- name: RELATED_IMAGE_MUST_GATHER
93-
value: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9@sha256:0f0aca3dee0e5b5407e039d25dd053cb00b26d965ba49614d441d60603963d94
93+
value: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9@sha256:b4aec6c5826edc9d1266b10cb001de0df355f33cd3000404e4c353e91c2fdd6d
9494
- name: RELATED_IMAGE_PCCS
95-
value: registry.redhat.io/openshift-sandboxed-containers/osc-pccs@sha256:de64fc7b13aaa7e466e825d62207f77e7c63a4f9da98663c3ab06abc45f2334d
95+
value: registry.redhat.io/openshift-sandboxed-containers/osc-pccs@sha256:494dae8ee05643c76d29d1b99f2315446d7822f09b34ffbb20c872bf3a2e3f8d
9696
- name: RELATED_IMAGE_TDX_QGS
97-
value: registry.redhat.io/openshift-sandboxed-containers/osc-tdx-qgs@sha256:86b23461c4eea073f4535a777374a54e934c37ac8c96c6180030f92ebf970524
97+
value: registry.redhat.io/openshift-sandboxed-containers/osc-tdx-qgs@sha256:f1f263b5ae8304a701b8d9b95f6c3decdaf1b97c3f54ee390da67d4aabd0c44f
9898
- name: RELATED_IMAGE_STORAGE_HELPER
99-
value: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper@sha256:c9b31c8acd23c6925d6bf193696817f14a52b0f0fcbd8459023b5d69da93482e
99+
value: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper@sha256:4cfabc14a2cc00e64c667917b35113f996b12c0afd9ab613a5a7a9aaefa9d19c
100100
imagePullPolicy: Always
101101
resources:
102102
limits:

‎config/peerpods/podvm/Dockerfile.podvm-builder‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/ubi:9.7-1764578509
1+
FROM registry.access.redhat.com/ubi9/ubi:9.7-1767674301
22

33
# azure-podvm-image-handler.sh script under /scripts/azure-podvm-image-handler.sh
44
# aws-podvm-image-handler.sh script under /scripts/aws-podvm-image-handler.sh

0 commit comments

Comments
 (0)