NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-05-24-193308_amd64-2024-05-24_arm64-2024-05-29

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.17.0-0.nightly-arm64-2024-05-28-132741
+OCP_VERSION := 4.17.0-0.nightly-arm64-2024-05-29-121948

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:d0e95a558cc0c20be02be65092de8341fcd02e506dc779427cafab1b8b52671a
+    digest: sha256:0ffb58a96e70140d2856924403193bd9694d379e8c02f8df038c06340d57c437
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:aac259bd53d0fd533a0feec1600b646608b7f2f2ed5d51e34e984e3da4d6f947
+    digest: sha256:057ec584c99156b4a8a5c766c84c73517e91707fa1df2cd6393827051725a0e9

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-05-28-132741"
+    "base": "4.17.0-0.nightly-arm64-2024-05-29-121948"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0e95a558cc0c20be02be65092de8341fcd02e506dc779427cafab1b8b52671a",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aac259bd53d0fd533a0feec1600b646608b7f2f2ed5d51e34e984e3da4d6f947"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ffb58a96e70140d2856924403193bd9694d379e8c02f8df038c06340d57c437",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:057ec584c99156b4a8a5c766c84c73517e91707fa1df2cd6393827051725a0e9"
   }
 }

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:e30ffbe6d647f8a07699959fba5ec9e0adea871e0c39348fae02c7c75b880547
+    digest: sha256:2b747366b566bd94e88d83669b718e4c7691b235126fb2171709ed8f41561039
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:2aea9c7ce396f5f1b92249a7c91a38e4e00093e39754420ab4c5ffe0fb003192
+    digest: sha256:2f3bf1a4a1da6b747430a74fd71eb40668b274d4e002beba44f30a2abe95ebb7
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:da07077920a1b972097e16532bc238021f6208e4bad8254b71c7dd51606424ef
+    digest: sha256:511e729eb282d5636d861958024bd1ab0c9dfafad44a283fe36fb11653b7c8e4
 
 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:2aea9c7ce396f5f1b92249a7c91a38e4e00093e39754420ab4c5ffe0fb003192
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f3bf1a4a1da6b747430a74fd71eb40668b274d4e002beba44f30a2abe95ebb7
      - 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:e30ffbe6d647f8a07699959fba5ec9e0adea871e0c39348fae02c7c75b880547
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b747366b566bd94e88d83669b718e4c7691b235126fb2171709ed8f41561039
     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-05-28-132741"
+    "base": "4.17.0-0.nightly-arm64-2024-05-29-121948"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e30ffbe6d647f8a07699959fba5ec9e0adea871e0c39348fae02c7c75b880547",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aea9c7ce396f5f1b92249a7c91a38e4e00093e39754420ab4c5ffe0fb003192",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da07077920a1b972097e16532bc238021f6208e4bad8254b71c7dd51606424ef"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b747366b566bd94e88d83669b718e4c7691b235126fb2171709ed8f41561039",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f3bf1a4a1da6b747430a74fd71eb40668b274d4e002beba44f30a2abe95ebb7",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:511e729eb282d5636d861958024bd1ab0c9dfafad44a283fe36fb11653b7c8e4"
   }
 }

assets/release/release-aarch64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-05-28-132741"
+    "base": "4.17.0-0.nightly-arm64-2024-05-29-121948"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c46f6b91f0b65fa2a1e0c3d95f35dd9ede9ecda7344a908acf4cf6bfcc693b8",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e861bc52240ee4d55518a32985cf494183e8a919287fc494971a99a0d03a17e",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f3a4b941483e4f115036c8f554fa8b2bcb11b514a4d9a2b886cab18019bdc3c",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da07077920a1b972097e16532bc238021f6208e4bad8254b71c7dd51606424ef",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f16134557099085db36f8ed5c820ea78f487f070c737a55fb2a30ed895cd8771",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38b613468ed183761b393e4c1f5fec40b93b2a6686ea96f1d6244940336ea0cf",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f5fcb9b12713b5e6a60a5dd5717ba84cbd4c458f1fe6322c38091acc5d2f18c",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:511e729eb282d5636d861958024bd1ab0c9dfafad44a283fe36fb11653b7c8e4",
     "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e37fc38bbd23a4b0900e7361e07a6fb1356657788c7ae6ea66c4dde235bf730e",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbaf0e8aa007a316b08e7bdaf52180e2b0f99c98b0919af1a898522b26bc6a88",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5a173e5eb1d6acee138a282f1a4f73b415aaa8f8912a7b360fa795a6fe030f7",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50cd825f63c486b63ce2474d6b118d5370f7711385ba8d9d19a4893f8a258c7d",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92982b4f2d2348cb21688036118fd1cecd106e6b9619de00bd55b1dcfef58ff7",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118e26c1753d395202ff4c7c1655b66c7b096a858eb502bd452eee5e714ccf55",
     "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:b90b1a38101fecf815e1e7e248f8e082a5fc3e00eef5bd3f3ed6a057b60f0566",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8be0435610aa60f9b181a413890748385ecad393d72799a555b7a7955db4ec8",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76a253992268f4d06bbd056ff63103612af6bb5fdb5958d9bc398d95b93908a4"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d2371ac054d17e453ed813eea17fed9e38f611a3b1605977af504b845fe34e7",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b8dabf940c8331da219296fac396922bbd865ca127dc197199e5eac3e29c1f5",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad213ce012737afe0bb6a2f437f2ce2221eabdf1dc566d9a26280c47a4c38771"
   }
 }

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:dbaf0e8aa007a316b08e7bdaf52180e2b0f99c98b0919af1a898522b26bc6a88"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92982b4f2d2348cb21688036118fd1cecd106e6b9619de00bd55b1dcfef58ff7"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -0,0 +1,46 @@
+- oc image-arm64 4be3c8609f101a8c5867abc47bda33caae629113 to a5a43b9e6407f8ddf4a73fe995c5eca75a9ac5ab
+  - a1ff9421 2024-05-25T16:35:08+00:00 Updating openshift-enterprise-deployer-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/openshift-enterprise-deployer.yml
+
+- ovn-kubernetes image-arm64 d5664bf3414ff6a66e76100a18570ed0297e0f47 to e7d5a8bbe1c040ed5fedfa8313178c96284e7976
+  - 08b85581 2024-05-23T17:01:04+02:00 dns: fix deadlock in case of error
+  - c77ee8c3 2024-05-23T11:23:04+02:00 kubevirt, e2e: Add persistent ips tests
+  - bb95a26b 2024-05-23T11:23:04+02:00 kubevirt, e2e: Refactor to accomodate persistentips test
+  - 96a4d66d 2024-05-23T11:23:04+02:00 ci, kind: install kubevirt IPAM controller + webhook
+  - 6a333e62 2024-05-23T11:23:04+02:00 gh, actions: Enable multinet for kv-live-migration
+  - f559b5f6 2024-05-23T11:23:04+02:00 kubevirt, e2e: Add allowPersistentIPs to nad tools
+  - 6c5bc020 2024-05-23T11:23:04+02:00 kubevirt, e2e: Add ipamclaims go dep
+  - ce603ddd 2024-05-22T20:56:31+05:30 Add e2e test for DisablePacketMTUCheck
+  - 20690159 2024-05-21T18:22:04+02:00 Bump the go version for the container running the unit tests
+  - cff0dc4f 2024-05-21T15:39:44+02:00 Dockerfile.ubuntu: Use ubuntu:24.04
+  - 67f3fe8d 2024-05-21T08:34:20+00:00 e2e: bump opentelemetry.io to latest v1.26/v0.51
+  - f81d319c 2024-05-21T08:34:20+00:00 e2e: cleanup go.mod and go.sum
+  - b2507df0 2024-05-21T01:55:30+03:00 Fix meetings relative link in readme
+  - f71cdcb4 2024-05-20T13:29:57-07:00 node-dpu needs to handle POD add events for running pods
+  - b9d79433 2024-05-17T18:01:11+02:00 Add template for feature documentation
+  - 6732b9af 2024-05-17T13:59:48+00:00 kind-common: nits
+  - 69142c14 2024-05-17T13:59:41+00:00 helm: basic_deploy skip AdminNetworkPolicy so it does not need external crds
+  - 6304ff2c 2024-05-17T13:59:20+00:00 workflows/test.yml: re-enable metalLB tests for helm lane
+  - 95f4c233 2024-05-17T15:34:40+02:00 Add OKEP Template
+  - fdb84efe 2024-05-16T12:03:49-06:00 Refactor NetworkController interface: Cleanup method doesn't need netName, as it should be already known to the NetworkController.
+  - a6fa4ff5 2024-05-14T11:07:29-07:00 fix host-networked pod backed cluster service issue
+  - f988a0d9 2024-05-14T17:45:38+00:00 kind-helm.sh: use kind-common to support new flags
+  - da6f79d7 2024-05-14T17:45:03+00:00 create kind-common out of kind.sh
+  - 4e6ab641 2024-04-08T19:43:10-07:00 Add nb-connection-status & sb-connection-status metrics for ovn-northd
+
+- kubernetes image-arm64 b574b11f6b28f06e17333bb110e9374db3259bad to f1cd924886037a20bc23538a5d146b5cb43245e1
+  - 04f3f6f40 2024-05-28T13:20:21+02:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
+  - 6911225c3 2024-05-14T10:42:02+00:00 Release commit for Kubernetes v1.30.1
+  - ad1353499 2024-05-10T14:24:29+02:00 Clean up PersistentVolumeLabel admission plugin
+  - 42742942f 2024-05-08T13:06:43+00:00 scheduler: preallocation for NodeToStatusMap
+  - d17cd6ef7 2024-05-06T12:22:12+00:00 tag service.spec.TrafficDistribution field as alpha
+  - d37953536 2024-05-06T12:22:12+00:00 tag TrafficDistribution tests to avoid running on clusters without the feature enabled
+  - 37e7cbdd3 2024-05-04T21:43:21+02:00 fix(api): make LocalObjectReference.Name and HostAlias.IP required (#124553)
+  - 1410806d2 2024-04-26T20:00:56+03:00 kubeadm: check for available nodes during 'CreateJob' preflight
+  - e1594967b 2024-04-24T21:57:15+02:00 Idempotent transformers in scheduler & kcm
+  - dabc4428f 2024-04-24T10:36:25+03:00 kubeadm: fix bug of kubeletconfig not being downloaded on upgrade
+  - 7e5e4c3f6 2024-04-19T18:27:56+02:00 e2e framework: configure Ginkgo logger and klog consistently
+  - 6bb6b07b1 2024-04-19T18:27:56+02:00 e2e node: fix -v support
+  - 4d1dd9cd0 2024-04-18T14:22:46+02:00 Update applyconfig-gen for pacakges where group and dir differ in name
+  - 933272d33 2024-04-18T14:22:45+02:00 kube_codegen: expose applyconfig-openapi-schema flag for client generation
+  - 502d9434a 2024-04-17T17:56:15+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.0
+

scripts/auto-rebase/commits.txt

@@ -26,13 +26,13 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
 https://github.com/openshift/ovn-kubernetes image-amd64 d5664bf3414ff6a66e76100a18570ed0297e0f47
 https://github.com/openshift/kubernetes image-amd64 4a87b5377b72baed624e7afa315bb8622117ebf9
 https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
-https://github.com/openshift/oc image-arm64 4be3c8609f101a8c5867abc47bda33caae629113
+https://github.com/openshift/oc image-arm64 a5a43b9e6407f8ddf4a73fe995c5eca75a9ac5ab
 https://github.com/openshift/coredns image-arm64 4989dc716d946d61642989412fe3f4f92bc28bad
 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
 https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6
 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216
-https://github.com/openshift/ovn-kubernetes image-arm64 d5664bf3414ff6a66e76100a18570ed0297e0f47
-https://github.com/openshift/kubernetes image-arm64 b574b11f6b28f06e17333bb110e9374db3259bad
+https://github.com/openshift/ovn-kubernetes image-arm64 e7d5a8bbe1c040ed5fedfa8313178c96284e7976
+https://github.com/openshift/kubernetes image-arm64 f1cd924886037a20bc23538a5d146b5cb43245e1
 https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac

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-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-05-28-132741"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-05-29-121948"