NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-20-191204_amd64-2024-0…

…7-20_arm64-2024-07-23 (#3674)

* update last_rebase.sh

* update changelog

* update microshift/go.mod

* 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-07-22-172231
+OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-23-221753

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:8b9f3ed107b736e87a74b8f9f2d9c98ef022f4e599ba1475a10816c00b528a81
+    digest: sha256:fba91b43df563fcdbe7e448e39310e293add75bc414718e5f1f9b0363037fd94
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:524ca6a06eadda4f54262b540852bf4f9c90d6d583389e2c2426d14a08bd7fc8
+    digest: sha256:1e25e30cd8cc7c068fd512a85db3ce1bb69c02d3e971d16924c027e7b4fe0a02

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-07-22-172231"
+    "base": "4.17.0-0.nightly-arm64-2024-07-23-221753"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b9f3ed107b736e87a74b8f9f2d9c98ef022f4e599ba1475a10816c00b528a81",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524ca6a06eadda4f54262b540852bf4f9c90d6d583389e2c2426d14a08bd7fc8"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fba91b43df563fcdbe7e448e39310e293add75bc414718e5f1f9b0363037fd94",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e25e30cd8cc7c068fd512a85db3ce1bb69c02d3e971d16924c027e7b4fe0a02"
   }
 }

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:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06
+    digest: sha256:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d37df72a476a4fb5e247b007d6db6f18e4962741d4415e5607036fdb54916444
+    digest: sha256:fcefa234e850036b03d063238e57eb15eada240b785c21656ea642ad82af09eb
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872
+    digest: sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925
 
 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:d37df72a476a4fb5e247b007d6db6f18e4962741d4415e5607036fdb54916444
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcefa234e850036b03d063238e57eb15eada240b785c21656ea642ad82af09eb
      - 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:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236
     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-07-22-172231"
+    "base": "4.17.0-0.nightly-arm64-2024-07-23-221753"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d37df72a476a4fb5e247b007d6db6f18e4962741d4415e5607036fdb54916444",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcefa234e850036b03d063238e57eb15eada240b785c21656ea642ad82af09eb",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925"
   }
 }

assets/release/release-aarch64.json

@@ -1,18 +1,18 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-07-22-172231"
+    "base": "4.17.0-0.nightly-arm64-2024-07-23-221753"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6b0c1543790f5f4223a7f487e7b00607dcbe502414116c2b530700e48f8f15e",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3db6babc1a28c99574b0f606fc3035d694ff68859581352356335c7a89481c4e",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f9d0fb53a9a11f789bcbce164e85652034df7447123f9b84287b6bc1a74fef",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac0f45732c2c19b639f70b1d8d980a41264ccebca23d482252b53d52e18cf461",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed63cf399a60fce79d0cb1cffd0e745e02d932a84f619a0fb9a48d4bfa72d669",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9edfbdbfadc0a286347f0020acbe6ebf4c98c188b413a45b53b54d5484f1105",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925",
     "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56d3a1e014dc92149acf5beee82933c9914c87563ee98f26936e601975957455",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbbf753d670010dd8cafeb2345e70b22540c9ee3cdf702d8746b4438fd798352",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff7539db47ad662df593fc13c4a95d73f4dc603e8743760063de1367725a731",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d7ea0408c1fcf875d36896369b584c0ac93e7727f7e26637751f1bdbb58ce91",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e39993a3101ffcb6e6a83866bc4aa8a04741ee696333047cd318e60c61aba661",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8421b56e4f68e78f16bc5f739c8fc12d454998e9ae6c396f38e2dd3a9a7b68e",
     "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:1901bc1f4affaf9db870dd6eaea6eb5d0a33eb60aaca2ed12253b48ceafa2d90",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87a2bd5917d1a3b7d9b24c9708ff91949b0aea839a2917dcd41a5ebc340fb577",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d17833b85dcd3ec8cb51446b4591a6ab93026b2bc51294e2052e329029eb6d91"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb7b287df7a261f46c5e692a2d63dd21ca40b0b6f8ceb131b55d601f0e17e7d",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6a128a6209b5faeb3f0cba9aff2e06f3c4973370980b660d6db8f7b7f250a0c"
   }
 }

go.mod

@@ -39,6 +39,7 @@ require (
 )
 
 require (
+	github.com/fsnotify/fsnotify v1.7.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/utils v0.0.0-20240102154912-e7106e64919e
 	sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
@@ -86,7 +87,6 @@ require (
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect

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