NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-05-15-001800_amd64-2024-05-15_arm64-2024-05-14

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=29
 KUBE_GIT_VERSION=v1.29.4
-KUBE_GIT_COMMIT=6c10b2df178d8497ea61ca6749a73b31fee740a7
+KUBE_GIT_COMMIT=4a87b5377b72baed624e7afa315bb8622117ebf9
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-13-005028
+OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-14-230421

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-2024-05-08-222442
+OCP_VERSION := 4.16.0-0.nightly-2024-05-15-001800

assets/components/csi-snapshot-controller/csi_controller_deployment.yaml

@@ -20,6 +20,7 @@ spec:
     metadata:
       annotations:
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
+        openshift.io/required-scc: restricted-v2
       labels:
         app: csi-snapshot-controller
     spec:

assets/components/csi-snapshot-controller/webhook_deployment.yaml

@@ -17,6 +17,7 @@ spec:
     metadata:
       annotations:
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
+        openshift.io/required-scc: restricted-v2
       labels:
         app: csi-snapshot-webhook
     spec:

assets/controllers/kube-apiserver/config-overrides.yaml

@@ -17,4 +17,3 @@ serviceAccountPublicKeyFiles:
   # The following path contains the public keys needed to verify bound sa
   # tokens. This is only supported post-bootstrap.
   - /etc/kubernetes/static-pod-resources/configmaps/bound-sa-token-signing-certs
-

assets/optional/multus/kustomization.x86_64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:e18affd45a3f53dc5b7969d64f97228088e05086fed87e7b21589956847414e5
+    digest: sha256:aef929b2ac179ae653327d719ef29f951cf69afcbf85ba705e212e4e9caf7509
   - name: container-networking-plugins
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:9939ba044f40fd1859cd9e7c6b6918c1e1412db4626446a82c2e2ca11355ea5c
+    digest: sha256:fc1078bbf4db0ec84a472c07913902e3f0ebdd95c8c95e9568388761e9bbee55

assets/optional/multus/release-multus-aarch64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-05-13-005028"
+    "base": "4.16.0-0.nightly-arm64-2024-05-14-230421"
   },
   "images": {
     "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b83077f402a7c5a58217ba4c412dd06a6377b323ab1cf9af698e56a31081b1cb",

assets/optional/multus/release-multus-x86_64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-05-08-222442"
+    "base": "4.16.0-0.nightly-2024-05-15-001800"
   },
   "images": {
-    "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e18affd45a3f53dc5b7969d64f97228088e05086fed87e7b21589956847414e5",
-    "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9939ba044f40fd1859cd9e7c6b6918c1e1412db4626446a82c2e2ca11355ea5c"
+    "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aef929b2ac179ae653327d719ef29f951cf69afcbf85ba705e212e4e9caf7509",
+    "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1078bbf4db0ec84a472c07913902e3f0ebdd95c8c95e9568388761e9bbee55"
   }
 }

assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:e549958b7194788a13bc59704d495d1d11a87aa606f60182f4e441351b497370
+    digest: sha256:1732ff573cfba6e09673cf1e076e6400c78e6e5cb6e613a241173eb5f3165368
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:0f193fd514a3a51a47a4ef0e9a215530c8dbda1a30b4ba0dff86ba9494e43229
+    digest: sha256:1cf7eb24f985bec30db224587335f55cb8726ff5b4b3ccef2f8c333608ea98b7
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:44001e0c59ad0d95aeef617a5baffe62a5f3f412dbbd1e96646c01a616393324
+    digest: sha256:0954a53fe830d4c49ffdced2beb2461f92f305d8d72b003f7fd54e990ee42868
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f193fd514a3a51a47a4ef0e9a215530c8dbda1a30b4ba0dff86ba9494e43229
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cf7eb24f985bec30db224587335f55cb8726ff5b4b3ccef2f8c333608ea98b7
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e549958b7194788a13bc59704d495d1d11a87aa606f60182f4e441351b497370
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1732ff573cfba6e09673cf1e076e6400c78e6e5cb6e613a241173eb5f3165368
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-05-13-005028"
+    "base": "4.16.0-0.nightly-arm64-2024-05-14-230421"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a99cae3d37dbc5449cacc8f3343863674194a0ca0b1465189fc1acdd97f390f",

assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-05-08-222442"
+    "base": "4.16.0-0.nightly-2024-05-15-001800"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e549958b7194788a13bc59704d495d1d11a87aa606f60182f4e441351b497370",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f193fd514a3a51a47a4ef0e9a215530c8dbda1a30b4ba0dff86ba9494e43229",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44001e0c59ad0d95aeef617a5baffe62a5f3f412dbbd1e96646c01a616393324"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1732ff573cfba6e09673cf1e076e6400c78e6e5cb6e613a241173eb5f3165368",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cf7eb24f985bec30db224587335f55cb8726ff5b4b3ccef2f8c333608ea98b7",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0954a53fe830d4c49ffdced2beb2461f92f305d8d72b003f7fd54e990ee42868"
   }
 }

assets/release/release-aarch64.json

@@ -1,15 +1,15 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-05-13-005028"
+    "base": "4.16.0-0.nightly-arm64-2024-05-14-230421"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d95e7146db9fe029ab148043cd4c023438c4e40b89833068ae46261d2fbf6ce",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4be2efce93ef3df8c42bb72a0790c655a2468eba50f101d440c425d3e80333a",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bb8a1779bc9726b3b9c956b5df052de5a8acb77c57f95b442bc1d42a2bc8e7d",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:188640955121b37db735863224149318992665d823cbcc27c69156f3c44ba277",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc757bb19edcc81f8fa07932d492469e51f33ebd64f1efd2fc7dcb5c9cbc99b3",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47eb70134226931ac11a76ecc1d877088162a193db425db27921e8ae3254699c",
     "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d43806498223f0f679b51424d595d6b0e1c25b2e096e86169374f9fb88355663",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e34fcb15e1c08e1c9503bb51eecaa978a4832e6bbd49571d7a01c56a6358a25b",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cf5a10f628dfa325b07ea05e9a37afa63a3c7fd862078097a83ec053704f24d",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba8ce6d643a31b7c17860292e6e70c736f8e523155ef9492877c38839b6513c",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7728e63d1689236cb795b3d877d8d49563a3be58b508b9679a0e33d136e7e4d",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",

assets/release/release-x86_64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-05-08-222442"
+    "base": "4.16.0-0.nightly-2024-05-15-001800"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c51a31a687d96346596ac23ec578f35eabd4c43370e097cdde7c34d191c027ef",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79401dadbf5b9a1c4269c7945d0cd48147250c054269846b4ee99a51a307acd7",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e7497ab6cedbad0187406ca2a91194ec54d5a1641f1922f1f1d03cf7542ba9b",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44001e0c59ad0d95aeef617a5baffe62a5f3f412dbbd1e96646c01a616393324",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a455be416d9bcd7fda19dae98b4eceb432a1f4b1993c8ea4fd9c3665df7d46f7",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0901e2a8174b0583cf038e9c6b9a47a6d9af21e056170fdcf78589e622e56d33",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f2a09a1cb94546c006eb5f87e1ca70458f67b879ccd1fc9471eef32d73170ef",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0954a53fe830d4c49ffdced2beb2461f92f305d8d72b003f7fd54e990ee42868",
     "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f3b360e19b6b48321b62d005f92eb64ae11cde90e0aa6e725182bd90643bb38",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c3e54d3c1d926854636694a4975a07b70c5a200359d62b79eca5971a1a495a5",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:200e3fd42d027a70bc98f5d5b99430b4c5227a70a9c7fd613d940ed6d97e9bf0",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acc1d6f89b7037a9b7d6a439169928f45b944110507c63af6b0fc127aaed0a8e",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3fd39f0d7154bcb13b4339cf22ce41244de93c1419658991177d089c4c871dd",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf328c6df8c0ab64e98a635a9f06caa4cd799bc6239e811585d1b37975b02dda",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
     "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
     "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111",
     "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765",
-    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e890029b41d81be8f987d34d3d159c01ef29e13bed352e05a4cbbc1f7110cb67",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c211c19ee52675a66abe9a1a19dc7a3cbb6f429c140a24b5cb2f7ca30b760bf",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2038701bac255640224b030257478e95ec090a7c3ab947d427e3027bf9eab410"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7e82dd3e2e08282e391632e5ab503b9dfb75b6dc4ac7cb762b48580d5c808e1",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93f0c8a8de2bc79c05bfdae4a6f05d7ab1219aa320115aa884672450f1547f8a",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6df9ed8e520405540bb81ea77f5ffcff25726295717c4c13b231f4261ad09a3"
   }
 }