NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-06-25-162526_amd64-2024-0…

…6-25_arm64-2024-06-30 (#3559)

* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <ci-robot@openshift.io>

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-27-123138
+OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-30-162939

assets/optional/multus/kustomization.aarch64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:a65d1c102dbc2110cd2fa4545814a3899aa8a2ec98d602a077dfaf923b60296d
+    digest: sha256:4b227afe6c28f7460330327c12cba93a42b4318fa03c75b9dafea79870d21d4a
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:10982defe39d69ce69e87cc6f81b3b21cbb1773f6a1acdc2567d271a3e4f965c
+    digest: sha256:0ecb6c5c97832449568c0567442b773b4c5ca6de9967f4936d41f24626e9adfb

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-06-27-123138"
+    "base": "4.17.0-0.nightly-arm64-2024-06-30-162939"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a65d1c102dbc2110cd2fa4545814a3899aa8a2ec98d602a077dfaf923b60296d",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10982defe39d69ce69e87cc6f81b3b21cbb1773f6a1acdc2567d271a3e4f965c"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b227afe6c28f7460330327c12cba93a42b4318fa03c75b9dafea79870d21d4a",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ecb6c5c97832449568c0567442b773b4c5ca6de9967f4936d41f24626e9adfb"
   }
 }

assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:695592ec8720a62ad0a608a166576c2608ce00e0fdfdbdc19a1e6a5ace455389
+    digest: sha256:15c0767223708c0a5f029ca5f91e3404f2cbd8579d2f58e6773a2568c179aaa9
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:6c4a36cc77b72bdd5593d7ab10b93bf6e873b28b2632300da825193c1fe1d6bb
+    digest: sha256:7003a9096f95403738451e34efe0c502975f1861c6ff798dfdd7c0acb70e4191
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba
+    digest: sha256:372b09051eb69d4b31a2e80d7e4a74744048ecedea9be4c835e58b972e72d5cd
 
 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:6c4a36cc77b72bdd5593d7ab10b93bf6e873b28b2632300da825193c1fe1d6bb
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7003a9096f95403738451e34efe0c502975f1861c6ff798dfdd7c0acb70e4191
      - 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:695592ec8720a62ad0a608a166576c2608ce00e0fdfdbdc19a1e6a5ace455389
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15c0767223708c0a5f029ca5f91e3404f2cbd8579d2f58e6773a2568c179aaa9
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-06-27-123138"
+    "base": "4.17.0-0.nightly-arm64-2024-06-30-162939"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:695592ec8720a62ad0a608a166576c2608ce00e0fdfdbdc19a1e6a5ace455389",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c4a36cc77b72bdd5593d7ab10b93bf6e873b28b2632300da825193c1fe1d6bb",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15c0767223708c0a5f029ca5f91e3404f2cbd8579d2f58e6773a2568c179aaa9",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7003a9096f95403738451e34efe0c502975f1861c6ff798dfdd7c0acb70e4191",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:372b09051eb69d4b31a2e80d7e4a74744048ecedea9be4c835e58b972e72d5cd"
   }
 }

assets/release/release-aarch64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-06-27-123138"
+    "base": "4.17.0-0.nightly-arm64-2024-06-30-162939"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:822d8f3bad3de9d3e0952011a898c14918ce2b999c75041e68cb360e7eb1c108",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f56ab46f4de90aa652b594689070bc3aff4b3a0f5ef2984f38ca406493b319e",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d94cd2f26513a3142b0b5bc17b04ce2d40db58a047a4ceb0753f21e7930374c1",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b75152b0a8f73542ee2abef2715135c82dd20fc66c5a398e6f133103a8c7b06",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3aa1f1d60acc52150522a2583ce994495b1159f8d77359533a4b9604536640f",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42fd1275659c4bb7d8f9fd3e0c7c208b3f8aa73b3e0fca53f67df1db68af5ad9",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:372b09051eb69d4b31a2e80d7e4a74744048ecedea9be4c835e58b972e72d5cd",
     "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f78d030ae5d3c81c65d28c4a012da2761884be23fea0ff4a31e6a64f98285aa",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f63045b7607cb1b86c745aa8e799ecf527124a1cc588aa187a0ba5a80630d6",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c239885606463c7dc49f0f0b3d144007fbfa0b3ef4a58a58cd920c36d9b32e4a",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:780427bca18818e866b5b99d72426dcbe4fe54e98c2519d6c89ea8fd7e66d159",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4dd1c584981b03476ab0008218cceec695d9098dabcedcd614a7f2f4e8b240d3",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19742f3bcebe771e52ae6c1d42377738bb65420ddd0c6a10f1b0b2146af30da6",
     "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:f0ea816d2f738e44d561295b30727857388a026cf25175770d4fc668e8963c56",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fb1800201cb821f6ec397abc67e63c105faba8c79d967ff10d0beddd4bb01fd",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:326c222e4ff6f497f83d05b5cc75e539f8333c60b8bf822fa7c7c56532bec5a8"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abc6af0564e60a745ceec1ed94a23be5f26f58c8ca36d7e6e198963dfbb76ce2",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:616a405473a4607b6dd7dbb7e5edb859f1260d411330dde0e683463a71b9995d",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd2e426413005f8e5051127f57e634b4a9df7ffca737946e45f57c5acd0b7f41"
   }
 }

packaging/crio.conf.d/10-microshift_arm64.conf

@@ -25,6 +25,6 @@ plugin_dirs = [
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f63045b7607cb1b86c745aa8e799ecf527124a1cc588aa187a0ba5a80630d6"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4dd1c584981b03476ab0008218cceec695d9098dabcedcd614a7f2f4e8b240d3"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -1,26 +1,3 @@
-- ovn-kubernetes image-arm64 56c123fe65143eb4005558d9845c89d243c8573c to 1356c9b67dc0f07b71537117f1fce09a34b9b5cf
-  - 84b72abb 2024-05-25T16:06:38+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ovn-kubernetes-microshift.yml
-
-- kubernetes image-arm64 d0324787c86dcd13d4f16745da43b216a6787040 to 733cc9d44d7c449f231313a8f158e265afa4b8c6
-  - 69330adbe 2024-06-21T13:51:03-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - efe876d19 2024-06-21T13:50:32-04:00 UPSTREAM: <drop>: manually resolve conflicts
-  - 39683505b 2024-06-11T20:20:59+00:00 Release commit for Kubernetes v1.30.2
-  - 47c36d4bb 2024-06-06T18:18:54+02:00 Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base
-  - cd73ad187 2024-06-04T23:23:18+00:00 update driver installer
-  - 654c085cb 2024-06-04T09:04:10+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable
-  - 1ddcf3486 2024-06-04T09:02:07+00:00 Revert "scheduler: preallocation for NodeToStatusMap"
-  - 0df726772 2024-06-03T08:12:16+03:00 kubeadm: use the actual configured kubelet healthz address:port
-  - 398ab938e 2024-05-23T12:07:42+03:00 kubectl create cronjobs: Manually set OwnerReferences
-  - 42b93b35b 2024-05-22T10:41:21+08:00 add an integration test when nodeAffinity specifies a non-existent node.
-  - f73bb17ef 2024-05-22T10:41:21+08:00 base on allNodes when calculating nextStartNodeIndex
-  - a26f2c59e 2024-05-16T11:59:44-04:00 Fix printPod panic with spurious container statuses
-  - 85fc47582 2024-05-14T11:10:45+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.1
-  - 3d8967247 2024-05-13T17:34:08+00:00 Adding the feature gates to fix cost for VAP and webhook matchConditions.
-  - b762a187f 2024-05-13T11:04:47+00:00 cherry pick #124618 to 1.30
-  - 1c8b0f697 2024-05-13T11:11:59+02:00 fix requests tracker concurrency
-  - 2956e294c 2024-05-13T11:11:59+02:00 fix conflict race in statefulset rest update
-  - 7d9b913d1 2024-05-13T11:11:58+02:00 fix stateful set pod recreation and event spam
-  - a58d4f54c 2024-05-13T11:11:58+02:00 fix pods tracking and internal error checking in statefulset tests
-  - f20b6672b 2024-05-12T15:30:58+02:00 [go] Bump images, dependencies and versions to go 1.22.3 and distroless iptables
-  - d8c37e815 2024-05-11T01:18:51+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year
+- oc image-arm64 34c69c72be5a0c71863965a5c6480c236b0f843e to 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3
+  - 6210a4a5 2024-06-25T12:05:49-07:00 pkg/cli/admin/prune/renderedmachineconfigs: 'Error dry-run deleting'
 

scripts/auto-rebase/commits.txt

@@ -27,7 +27,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
 https://github.com/openshift/ovn-kubernetes image-amd64 56c123fe65143eb4005558d9845c89d243c8573c
 https://github.com/openshift/kubernetes image-amd64 d0324787c86dcd13d4f16745da43b216a6787040
 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
-https://github.com/openshift/oc image-arm64 34c69c72be5a0c71863965a5c6480c236b0f843e
+https://github.com/openshift/oc image-arm64 4b158b272fb3eb0d78e4cf87dd909af2e3f823f3
 https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b720007956717e324d
 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191

scripts/auto-rebase/last_rebase.sh

@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-25-162526" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-27-123138"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-25-162526" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-30-162939"