NO-ISSUE: rebase-main-4.19.0-0.nightly-2024-12-10-040415_amd64-2024-1…

…2-10_arm64-2024-12-11 (#4314) * update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
openshift · Dec 12, 2024 · 47bbf17 · 47bbf17
1 parent a5d04c8
commit 47bbf17
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 161 deletions.
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-10-235944
+OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-11-175944
diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/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:2502a55edb748912d9ade5b252e0afc8f3d31f6fa47849a1993d0e17e446d455
+    digest: sha256:a6f3527b7623b7f9e9e2a227700dafb0419009fd7cab43cd2723b5912c68f75c
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:cd02e3482e6fd2c645d18fd0b3468e76a13133c2c0c6cffe07cc84326f95f12f
+    digest: sha256:b735fa28a0e675d131eea3d44166f10201a63e0b8ca3389f9ee9e3eb9230aa90
diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2024-12-10-235944"
+    "base": "4.19.0-0.nightly-arm64-2024-12-11-175944"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2502a55edb748912d9ade5b252e0afc8f3d31f6fa47849a1993d0e17e446d455",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd02e3482e6fd2c645d18fd0b3468e76a13133c2c0c6cffe07cc84326f95f12f"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6f3527b7623b7f9e9e2a227700dafb0419009fd7cab43cd2723b5912c68f75c",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b735fa28a0e675d131eea3d44166f10201a63e0b8ca3389f9ee9e3eb9230aa90"
   }
 }
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/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:6c594eddc2272e91148ad690622259c385ff44762a1716ff5a87385ade2bc4b8
+    digest: sha256:715bf6bfb1b5f66d73626386f424a33a6b27496be42c8b48213a616e453d2ea3
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d6f5551d8fd0c8d7172e720cc9f1541170e8b3fa21200bc5d59a8e376df087b5
+    digest: sha256:3d91f1ee5178ba676690072eb98abfd05a0c9922ff87a6dfb41cf059cb4f7d5a
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:1705fbbd0bb734c7ab2d7e824a977ba414263b4f9add284bfb01de87764bc225
+    digest: sha256:780e5ee29aa3004cf6bae234be6cce704a1b9e859ea18c55ef806c0880cbedda
 
 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:d6f5551d8fd0c8d7172e720cc9f1541170e8b3fa21200bc5d59a8e376df087b5
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d91f1ee5178ba676690072eb98abfd05a0c9922ff87a6dfb41cf059cb4f7d5a
      - 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:6c594eddc2272e91148ad690622259c385ff44762a1716ff5a87385ade2bc4b8
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:715bf6bfb1b5f66d73626386f424a33a6b27496be42c8b48213a616e453d2ea3
     target:
       kind: Deployment
       labelSelector: app=catalog-operator
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2024-12-10-235944"
+    "base": "4.19.0-0.nightly-arm64-2024-12-11-175944"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c594eddc2272e91148ad690622259c385ff44762a1716ff5a87385ade2bc4b8",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6f5551d8fd0c8d7172e720cc9f1541170e8b3fa21200bc5d59a8e376df087b5",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1705fbbd0bb734c7ab2d7e824a977ba414263b4f9add284bfb01de87764bc225"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:715bf6bfb1b5f66d73626386f424a33a6b27496be42c8b48213a616e453d2ea3",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d91f1ee5178ba676690072eb98abfd05a0c9922ff87a6dfb41cf059cb4f7d5a",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:780e5ee29aa3004cf6bae234be6cce704a1b9e859ea18c55ef806c0880cbedda"
   }
 }
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,17 +1,17 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2024-12-10-235944"
+    "base": "4.19.0-0.nightly-arm64-2024-12-11-175944"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23595c87e77b190aeafb6e98c606b9cdaa85154e90cb27bc00a5d4724e8601ec",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:953fe798e54fe5fe437995e7289e2c3bf7e42dc36a37f8b26e083f3fd0464a13",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbf045747bcb1f5df9d0c4f43948fa44a157e1832e26d85ee1e52fec909bd953",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1705fbbd0bb734c7ab2d7e824a977ba414263b4f9add284bfb01de87764bc225",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d780835a9b72d5ce89629ccb66bfbc561cc875b7882074b3b5bdce9830cc690c",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56d239af71f752e75a6a4460529afe1e6c5b68c7363cf839e4f4734a54b0db34",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b6984b9ab1f848a52abb01bcbbff08f8e609c51180b1f27dadee872046ddbcf",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9229afab8040e2d9fe66ede7fdd15b5e9e6079cc145383b0cd775ce904d72a17",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85199b225834ab0dd695b7fd744d57b7d49f8c0724cd6c638bcef54ae1227be9",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76659a3ea551d5027db80b7db1dd144f30ec10a793518ed46b0b66ad8d8c7ca1",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:780e5ee29aa3004cf6bae234be6cce704a1b9e859ea18c55ef806c0880cbedda",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ce6d7e9d3dda301e55cea74866d6973e8516ef3d5be1b15052e46b84e2d64b3",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d978b79759d2b7de775fefd7916e39eeeb9cdc5df8d56e61edd469ae9b5ebd8",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b91f09f44788898c9e309516e08af309e9d986905f8f112c7e1274091a41f4ea",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36bf3b8a038cc1b36d1f1f42e21b3ecbe30a9b49034c96efbebbc4933ba419c9",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57eab1862a2a956bdbe3a8f864940dd5285907f9104ef7071ebc5a68c9475e0e"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52ade1d5484920e6438d7cab099d02108c4913f284f6f256a6fb16537b6656d",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8180f60602238013a1139342230630709f3f9c426792c435f0e7e34e57b3dd5d"
   }
 }
diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/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:56d239af71f752e75a6a4460529afe1e6c5b68c7363cf839e4f4734a54b0db34"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d978b79759d2b7de775fefd7916e39eeeb9cdc5df8d56e61edd469ae9b5ebd8"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-10-235944
		OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-11-175944