NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-02-17-094036_amd64-2024-02-17_arm64-2024-02-19

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=29
 KUBE_GIT_VERSION=v1.29.1
-KUBE_GIT_COMMIT=2f773e8d16da18d91d717cb7e1aca3d000396e2d
+KUBE_GIT_COMMIT=edc2c1207eef244c3f9fe9c9c4c1f87da7dfb49f
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-arm64-2024-02-15-234549
+OCP_VERSION := 4.16.0-0.nightly-arm64-2024-02-19-225916

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-2024-02-08-073857
+OCP_VERSION := 4.16.0-0.nightly-2024-02-17-094036

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

@@ -20,6 +20,7 @@ spec:
       labels:
         app: csi-snapshot-webhook
     spec:
+      serviceAccount: csi-snapshot-webhook
       containers:
         - name: webhook
           image: '{{ .ReleaseImage.csi_snapshot_validation_webhook }}'

assets/core/kubelet.yaml

@@ -19,8 +19,10 @@ featureGates:
   DisableKubeletCloudCredentialProviders: false
   DownwardAPIHugePages: true
   KMSv1: true
+  NetworkLiveMigration: true
   PodSecurity: true
   RotateKubeletServerCertificate: false # TODO
+  VSphereControlPlaneMachineSet: true
 kubeAPIBurst: 100
 kubeAPIQPS: 50
 maxPods: 250

assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml

@@ -11,6 +11,7 @@ metadata:
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: "management"
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 ---
@@ -26,6 +27,7 @@ metadata:
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: "management"
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 ---

assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_00-packageserver.pdb.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:

assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-config.yaml

@@ -3,6 +3,7 @@ kind: ConfigMap
 metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"

assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-rbac.yaml

@@ -3,6 +3,7 @@ kind: Role
 metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles
@@ -20,6 +21,7 @@ kind: RoleBinding
 metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles
@@ -38,6 +40,7 @@ kind: ServiceAccount
 metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles

assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-secret.yaml

@@ -3,6 +3,7 @@ kind: Secret
 metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
     openshift.io/owning-component: "Operator Framework / operator-lifecycle-manager"

assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null

assets/optional/operator-lifecycle-manager/0000_50_olm_01-olm-operator.serviceaccount.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 ---
@@ -14,6 +15,7 @@ metadata:
   name: system:controller:operator-lifecycle-manager
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 rules:
@@ -38,6 +40,7 @@ metadata:
   name: olm-operator-binding-openshift-operator-lifecycle-manager
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 roleRef:

assets/optional/operator-lifecycle-manager/0000_50_olm_02-olmconfig.yaml

@@ -5,5 +5,6 @@ metadata:
   annotations:
     release.openshift.io/create-only: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"

assets/optional/operator-lifecycle-manager/0000_50_olm_02-services.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   labels:
@@ -28,6 +29,7 @@ metadata:
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   labels:

assets/optional/operator-lifecycle-manager/0000_50_olm_09-aggregated.clusterrole.yaml

@@ -8,6 +8,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 rules:
@@ -29,6 +30,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 rules:

assets/optional/operator-lifecycle-manager/0000_50_olm_13-operatorgroup-default.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-operators
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 ---
@@ -15,6 +16,7 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:

assets/optional/operator-lifecycle-manager/0000_50_olm_15-csv-viewer.rbac.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     rbac.authorization.kubernetes.io/autoupdate: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   name: copied-csv-viewer
@@ -24,6 +25,7 @@ metadata:
   annotations:
     rbac.authorization.kubernetes.io/autoupdate: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     capability.openshift.io/name: "OperatorLifecycleManager"
   name: copied-csv-viewers

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

@@ -2,10 +2,10 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:015239ff176636196a22226c62f3b0d62380faee5aaf2eed45912cb065338542
+    digest: sha256:a1a212df0c4842821836cd14100dae9feb7f2b0213eccb2ef1fec041a88dec4d
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:78454ad7acceba8d6e46d1efa5c786311c3ce4a8706d4313bcdedebbeb6fa51f
+    digest: sha256:fa679c5feffe890a666f26b7a0f1265ebd7bc00c9695e11ae509c37cf6e5cefb
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     digest: sha256:dc03dc960ecab1b0aec202ceeb04c8b2fc7973f49ebc3ab8b7ba61ea84993c52
@@ -16,12 +16,12 @@ patches:
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78454ad7acceba8d6e46d1efa5c786311c3ce4a8706d4313bcdedebbeb6fa51f
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa679c5feffe890a666f26b7a0f1265ebd7bc00c9695e11ae509c37cf6e5cefb
      - 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:015239ff176636196a22226c62f3b0d62380faee5aaf2eed45912cb065338542
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1a212df0c4842821836cd14100dae9feb7f2b0213eccb2ef1fec041a88dec4d
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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:d08356c015f2ae21c11b28cf4561c8cbbed7828798e71cab744f0cf9d584e088
+    digest: sha256:44aeabfa74f5e9be926cc187c821ce4618703d330c1f53bd2c9b5b57ca94a33a
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5f800d223f0c2df069becefe77e75d401a1c61ef1cef2db3e3c26cd426eea0bb
+    digest: sha256:232ba459cad49bd17d111998a96a7bb4433cbbbb36703e379b80994b502d9cb8
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:67902cba6275197109dd0712decc33c188cf5d2c5b51bc09362b850350705c58
+    digest: sha256:bc6a1f4b7cc183df40a9e78b9bc37523257647daa0125cde9b943105a46fb3c6
 
 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:5f800d223f0c2df069becefe77e75d401a1c61ef1cef2db3e3c26cd426eea0bb
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:232ba459cad49bd17d111998a96a7bb4433cbbbb36703e379b80994b502d9cb8
      - 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:d08356c015f2ae21c11b28cf4561c8cbbed7828798e71cab744f0cf9d584e088
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44aeabfa74f5e9be926cc187c821ce4618703d330c1f53bd2c9b5b57ca94a33a
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-02-15-234549"
+    "base": "4.16.0-0.nightly-arm64-2024-02-19-225916"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:015239ff176636196a22226c62f3b0d62380faee5aaf2eed45912cb065338542",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78454ad7acceba8d6e46d1efa5c786311c3ce4a8706d4313bcdedebbeb6fa51f",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1a212df0c4842821836cd14100dae9feb7f2b0213eccb2ef1fec041a88dec4d",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa679c5feffe890a666f26b7a0f1265ebd7bc00c9695e11ae509c37cf6e5cefb",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc03dc960ecab1b0aec202ceeb04c8b2fc7973f49ebc3ab8b7ba61ea84993c52"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-2024-02-08-073857"
+    "base": "4.16.0-0.nightly-2024-02-17-094036"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d08356c015f2ae21c11b28cf4561c8cbbed7828798e71cab744f0cf9d584e088",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f800d223f0c2df069becefe77e75d401a1c61ef1cef2db3e3c26cd426eea0bb",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67902cba6275197109dd0712decc33c188cf5d2c5b51bc09362b850350705c58"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44aeabfa74f5e9be926cc187c821ce4618703d330c1f53bd2c9b5b57ca94a33a",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:232ba459cad49bd17d111998a96a7bb4433cbbbb36703e379b80994b502d9cb8",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc6a1f4b7cc183df40a9e78b9bc37523257647daa0125cde9b943105a46fb3c6"
   }
 }

assets/release/release-aarch64.json

@@ -1,15 +1,15 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-02-15-234549"
+    "base": "4.16.0-0.nightly-arm64-2024-02-19-225916"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85fc87e14a2b392df549477a10e95edc0336d2c73e81999b89a4c15c07916d9c",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a7851f6eb85a1c3456241634fe974b5c04ef8b8d8843221c68e1487a7e05312",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22cf6ab24128f81f989067c159e9c89236e693ab486896f000d909a22d83993e",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc03dc960ecab1b0aec202ceeb04c8b2fc7973f49ebc3ab8b7ba61ea84993c52",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1a64eb1aadb961315c4a7afa13255b3211462e3f75c3539fd8601fb8d5f39f5",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb5dbbd5af973e962f3a98faece9f9d94ba021a7663b00d6df3326b8ed5b7361",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d15556978554b26a90acc4c272bf6d6b6be3af5db789ed49bee5f2cd11bea8e8",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10390b231f83136964767d7b5f9b8202fb81ac5b26224b98133e6eb709d2a26a",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1778ff50f1492ce90f93c2aab861a5b395f06a349d29ad7f9124dbbac0818f6",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",