NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-06-13-010514_amd64-2024-06-13_arm64-2024-06-15

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-13-172024
+OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-15-012117

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:7a1c247336fa43a55f8f86591f0539ea78e94945042d506e72eefae9c7ca364b
+    digest: sha256:0780db0c13f5e18c3e10f32d6da2783888c8b44e1cc369a27576683bdbebf5f2
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:ca824eb8a534a3359621c4ba609c1de166da3d97cd6cec13e302eb907569f02b
+    digest: sha256:1f80aa441c51e8b84b2b30d8186ecb195c6e063ca76f0f752cd6b10e88249f94

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-06-13-172024"
+    "base": "4.17.0-0.nightly-arm64-2024-06-15-012117"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a1c247336fa43a55f8f86591f0539ea78e94945042d506e72eefae9c7ca364b",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca824eb8a534a3359621c4ba609c1de166da3d97cd6cec13e302eb907569f02b"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0780db0c13f5e18c3e10f32d6da2783888c8b44e1cc369a27576683bdbebf5f2",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f80aa441c51e8b84b2b30d8186ecb195c6e063ca76f0f752cd6b10e88249f94"
   }
 }

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:ed9752c1474eecc4a59a92a6850de48655b4b3fe9fab9c2e9f0b9d729cce633e
+    digest: sha256:c0f263b9416790a11deb948236997dea14ef9604ce2ac6a1900750b221df2be5
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:c5d0d71a8d6e5bf9b4c60d92a021dc316ba87d65fca4b9d7e4af513323af7a3f
+    digest: sha256:a1c2578aff1ea6502966cab78d901d30f10b281b9de4cd97b942739edb8dd79a
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:b5ee379eff2abdd39a7fe36374ff12f6c3d41e35be53dca57439e76bbdb385e6
+    digest: sha256:143f63871cb94ebe526744b8d1c910d9217c8ca7162d2dda6211ad47eb1c67cd
 
 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:c5d0d71a8d6e5bf9b4c60d92a021dc316ba87d65fca4b9d7e4af513323af7a3f
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1c2578aff1ea6502966cab78d901d30f10b281b9de4cd97b942739edb8dd79a
      - 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:ed9752c1474eecc4a59a92a6850de48655b4b3fe9fab9c2e9f0b9d729cce633e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0f263b9416790a11deb948236997dea14ef9604ce2ac6a1900750b221df2be5
     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-13-172024"
+    "base": "4.17.0-0.nightly-arm64-2024-06-15-012117"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed9752c1474eecc4a59a92a6850de48655b4b3fe9fab9c2e9f0b9d729cce633e",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5d0d71a8d6e5bf9b4c60d92a021dc316ba87d65fca4b9d7e4af513323af7a3f",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5ee379eff2abdd39a7fe36374ff12f6c3d41e35be53dca57439e76bbdb385e6"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0f263b9416790a11deb948236997dea14ef9604ce2ac6a1900750b221df2be5",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1c2578aff1ea6502966cab78d901d30f10b281b9de4cd97b942739edb8dd79a",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:143f63871cb94ebe526744b8d1c910d9217c8ca7162d2dda6211ad47eb1c67cd"
   }
 }

assets/release/release-aarch64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-06-13-172024"
+    "base": "4.17.0-0.nightly-arm64-2024-06-15-012117"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0a3e3d1eeb4d596d34c5ee1678922b4887a44972019cf293cef13fe8d711da2",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09193f9af7b9baf516ec07f15ca7eef0ec5741e89ce19ec03afe8f4650e5bbf7",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c35bd5b079c676b6aad5ae407fd253e8d65ab1466e6c1afa96989756b39b8b31",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5ee379eff2abdd39a7fe36374ff12f6c3d41e35be53dca57439e76bbdb385e6",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fcfe8fbcc246ee0ee489937fa00eaafddbf9d4743c0ee78fc75b71b3d2a8742",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:276732a7fe4dc9b219af761a17c1381071733bd58eae5d00f451f5dd270ca9f4",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ce658f45b1c0d8e3ddc925921b75fed2fbdd7d40aacceef3d5a5b5653832480",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:143f63871cb94ebe526744b8d1c910d9217c8ca7162d2dda6211ad47eb1c67cd",
     "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f606b21457a3534a3429c6022637de2c27f8b0a4554a20f8260dcf9561d6d2d",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c2f0f8ef897bd7c503b360defd99a521893a1b8fcfb5d8065b93c63175be4d1",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:157ea34f4269aa45867ac25ff810094ec682a876a54d0f005c455f982aef913b",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d708aba3efe2bcea93dadbbaab48fe8dd7072c5fb8ecf874ebfbab0d579b6694",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39a315c85836934f089f38722dfa606ee3dd84594f8be8f7536f4d0e257a2494",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58d999e9f3a80d3f7a24de3f175b1152cf79cc6e86526b9271eddab1afeb1db1",
     "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:e43e56501899e2ba329e53e82f287ed51ec79279557ed0c4e5c111676d4b3954",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0e8e60417d3d98eec2ba39d53f3bfe83a7a49c7187a2e2013f66db4dabe72cb",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b68b1752d51299b8f11d8163337d27851c8fb6632e21a38bb5b33f72e77a4b9"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:885dbed23707b545dbd96326d3b6fb03c593ad7967736f2fa45002d084d37a0c",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6806ea72bb31bb95235d2212117686b2290cc885f99497f9d082f01591e82aa4",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37c656f2bbb84aae9a70ebf3f016f60c05755edcbc4d0f6a93f846dd6c0ba959"
   }
 }

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

scripts/auto-rebase/changelog.txt

@@ -1,16 +1,39 @@
-- cluster-network-operator embedded-component 07bc4e2cb3e0b5cee72dd843229193c220b9e08c to 6addd5e12150973804abf26991dcc6cfb8e9ff36
-  - 73cb30b 2024-06-11T10:31:15+02:00 linter: removed deprecated linters
+- ovn-kubernetes image-arm64 f4509354bc253dbffdd35c0fdf391f476dafeeed to 55341b3c02f1cf622b145d6aed3c818e8cf96cfe
+  - a509b306 2024-06-07T07:22:28-07:00 OVS-DOCA configuration instructions
+  - b95d28d0 2024-06-07T07:21:09-07:00 Support OVS-DOCA
+  - 014b1c5d 2024-06-07T11:13:28+02:00 Add events for >99 priority
+  - 7aeba71f 2024-06-07T11:13:24+02:00 ANP: Allow two ANPs at the same priority
+  - 16da3ced 2024-06-06T14:32:11-07:00 ovnkube-node: add support for comma-separated IPs in external_ids:ovn-encap-ip
+  - f59f8335 2024-06-06T14:32:11-07:00 add multi-vtep doc
+  - b9fc456d 2024-06-06T14:32:11-07:00 multi-vtep: set ovn-encap-ip on OVS Port when adding it to br-int
+  - a8c47e37 2024-06-06T07:11:13-07:00 Added SDN Dashboard helm chart
+  - 85a5c4f4 2024-06-05T21:22:44-07:00 ingress: update image to registry.k8s.io/ingress-nginx/controller:v1.10.1
+  - f046e767 2024-06-05T21:18:54-07:00 CNI: Add VFIO support for SR-IOV enabled systems
+  - 2556a88e 2024-06-05T15:12:15-04:00 Remove FakeAddressSet from EgressIP testing
+  - c70c8927 2024-06-04T21:41:41+02:00 Fix labeler file alingment for github action
+  - 8ce0b0ca 2024-06-04T11:14:49-07:00 Consolidate use of errors
+  - 47408e0d 2024-06-04T23:20:31+05:30 Implementation required to enable Forwarding if it is already disabled
+  - 414a0f2f 2024-06-03T12:13:00-07:00 Add documentation guide
+  - 106177fd 2024-06-03T12:13:00-07:00 Add introduction docs for API Reference
+  - 96c994aa 2024-06-03T12:13:00-07:00 Move API reference to new sub-heading
+  - ce6445db 2024-06-01T09:19:29-07:00 Add labels for ServiceMonitor K8S objects
+  - b221855d 2024-05-31T14:19:09+02:00 Move pr-labeler workflow to workflows
+  - 307dd428 2024-05-29T14:30:36+02:00 Unskip OVS CPU affinity pinning E2Es for IPv6
+  - 0ba87329 2024-05-28T10:27:21-04:00 Modify MEG ingress tests for ICMP
+  - db30a9e7 2024-05-27T21:44:55+02:00 Change area labels on issues
+  - e7670ab9 2024-05-27T21:43:22+02:00 Add labeler workflow for PRs
+  - 948b3171 2024-05-27T20:58:25+02:00 Add github actions for stale issues
+  - 39d3e649 2024-05-27T19:39:09+02:00 e2e: Re-enable PASS action logging
+  - b00345c7 2024-05-27T18:13:37+02:00 Bump OVN to 24.03.2.5
+  - 03f117ef 2024-05-27T10:21:47+02:00 kubevirt: Propertly remove migration leftovers
+  - 8b76acc9 2024-05-24T19:50:02+02:00 Remove stale FAQ
+  - 05f27491 2024-05-24T19:50:02+02:00 Add ovn-kubernetes ADOPTERS
+  - 4e9b559e 2024-05-23T11:16:42-04:00 Fixes waiting for level-driven informers to stop
 
-- machine-config-operator embedded-component eafd0ba4b92d65ea4f93134e9e87ad30f75932aa to fc878b8614b1aed5e2e44e4a1a89e6673674880d
-  - a5dcc6fe 2024-06-11T20:25:52-04:00 Azure: add Azure specific dnsmasq ordering
-  - 51662639 2024-06-10T12:40:58-05:00 crio: migrate metrics port to localhost only
-
-- openshift-controller-manager embedded-component 51b6dbac5caca0db97423b81197629e59be090f0 to dc54a288f78e85e880ee37da2877629efd65c8c6
-  - 6bbfd9a 2024-06-11T15:18:45+05:30 OCPBUGS-32873: Replace deprecated gopkg.in/square/go-jose.v2
-
-- operator-framework-olm embedded-component e45e646787c45749617a91aaa93f4b062beec131 to c921a18b08a10e8d4366b70103a7de0ec6c50747
-  - 8210c1a5 2024-06-12T00:05:01+00:00 build(deps): bump github.com/go-logr/logr from 1.4.1 to 1.4.2 (#3311)
-  - 15a681cd 2024-06-12T00:03:24+00:00 build(deps): bump goreleaser/goreleaser-action from 5 to 6 (#3314)
-  - bb9f8629 2024-06-12T00:03:09+00:00 build(deps): bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 (#3313)
-  - 0222def6 2024-06-12T00:02:50+00:00 build(deps): bump golang.org/x/net from 0.25.0 to 0.26.0 (#3312)
+- kubernetes image-arm64 44fc19fb798581a27cd21fa453a4b9ec50441bdc to fb0e036e8a1032d2ec69711c32d1fcee257ed018
+  - 42d1658bc 2024-06-14T13:30:31+01:00 UPSTREAM: 125337: Account for differences in fork test suite
+  - e5e3222bc 2024-06-14T13:30:17+01:00 UPSTREAM: 125337: add more testing for node.status.addresses
+  - d4f87b5ce 2024-06-12T18:02:35+01:00 UPSTREAM: 125337: document kubelet node-ip with cloud provider external
+  - 7e664dd3d 2024-06-12T18:02:35+01:00 UPSTREAM: 125337: ccm integration test for node status addresses and provided-node-ip annotation
+  - 3b29f23df 2024-06-12T18:02:26+01:00 UPSTREAM: 124516: Fix behavior with external cloud provider and --hostname-override
 

scripts/auto-rebase/commits.txt

@@ -34,6 +34,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f05
 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 f4509354bc253dbffdd35c0fdf391f476dafeeed
-https://github.com/openshift/kubernetes image-arm64 44fc19fb798581a27cd21fa453a4b9ec50441bdc
+https://github.com/openshift/ovn-kubernetes image-arm64 55341b3c02f1cf622b145d6aed3c818e8cf96cfe
+https://github.com/openshift/kubernetes image-arm64 fb0e036e8a1032d2ec69711c32d1fcee257ed018
 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-06-13-010514" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-13-172024"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-13-010514" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-15-012117"