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

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

Hide file tree

Showing 10 changed files with 36 additions and 33 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-11-175944
+OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-12-185745
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:a6f3527b7623b7f9e9e2a227700dafb0419009fd7cab43cd2723b5912c68f75c
+    digest: sha256:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:b735fa28a0e675d131eea3d44166f10201a63e0b8ca3389f9ee9e3eb9230aa90
+    digest: sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130
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-11-175944"
+    "base": "4.19.0-0.nightly-arm64-2024-12-12-185745"
   },
   "images": {
-    "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"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130"
   }
 }
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:715bf6bfb1b5f66d73626386f424a33a6b27496be42c8b48213a616e453d2ea3
+    digest: sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3d91f1ee5178ba676690072eb98abfd05a0c9922ff87a6dfb41cf059cb4f7d5a
+    digest: sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:780e5ee29aa3004cf6bae234be6cce704a1b9e859ea18c55ef806c0880cbedda
+    digest: sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754
 
 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:3d91f1ee5178ba676690072eb98abfd05a0c9922ff87a6dfb41cf059cb4f7d5a
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb
      - 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:715bf6bfb1b5f66d73626386f424a33a6b27496be42c8b48213a616e453d2ea3
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5
     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-11-175944"
+    "base": "4.19.0-0.nightly-arm64-2024-12-12-185745"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754"
   }
 }
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-11-175944"
+    "base": "4.19.0-0.nightly-arm64-2024-12-12-185745"
   },
   "images": {
-    "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",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ada8d538316c64e697fdc001191eff9dbaada5e27277521722b74983380f8a62",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac7c46e0acb811055792719a0b1b962912b35ebff52cda8269104f7e928c777b",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:616d02742849576aee0150c394ac45383d5c7f5de5ba1897b64d27f5ca922bd3",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c143ac06857ec6c977abf31f6ddc98197671501b78fad92bbc18f298324bb5a",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95400aeea06aabf48ec24cb9fc7d048d7b6b5d97f276613d2878821d7095ef35",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26ce9277d590307a1b4013882ca1f96f0c049eade459c469fbf34e2c2cb96ef5",
     "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:c52ade1d5484920e6438d7cab099d02108c4913f284f6f256a6fb16537b6656d",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8180f60602238013a1139342230630709f3f9c426792c435f0e7e34e57b3dd5d"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb7d94e9197a4fc5048fd8ba3f5ce0f499b0b9969674eed87651f4a023d7d827",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1794da2d90e4f222aa69fe2ee92ea945e40dfb2b27de34177d2e4258b6eb76b"
   }
 }
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:4d978b79759d2b7de775fefd7916e39eeeb9cdc5df8d56e61edd469ae9b5ebd8"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95400aeea06aabf48ec24cb9fc7d048d7b6b5d97f276613d2878821d7095ef35"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,6 +1,9 @@
-- oc image-arm64 c724dcbbd0e2fc80320ee3a035e88831fe713a4b to 6e588cf64c6575fa0b862a9d497b92687f9d0d6e
-  - cce3f5d0 2024-12-03T05:05:10-05:00 fix oc adm node-image create --pxe command to copy the correct artifacts
+- oc image-arm64 6e588cf64c6575fa0b862a9d497b92687f9d0d6e to 02503fe1c31903252e45f50f55922ef3f11c1360
+  - 398f6f25 2024-12-11T00:18:01-05:00 OCPBUGS-45991: Mark --report and --pxe flags as experimental
+  - b3fb741c 2023-09-13T10:56:58-07:00 pkg/cli/admin/release/extract_tools: Enable ImageRegistry, etc. on 4.13-to-4.14
 
-- ovn-kubernetes image-arm64 97a2e6b7e17fca030dcda1b1edd884ef8c9b46dd to c713669ede0fb5663e72ad055238037ae2e17938
-  - 1bc93172 2024-12-10T13:50:43+08:00 Bump OVS version to 3.4.0-18
+- kubernetes image-arm64 8ac36bf977d93ee5db979a4bda774d4a0f3b3367 to 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b
+  - 6fded69bb 2024-12-06T14:53:42+01:00 UPSTREAM: <carry>: require configuration file enablement
+  - 234263863 2024-12-06T10:51:56+01:00 UPSTREAM: 126750: update comments
+  - 691924b19 2024-12-06T10:51:56+01:00 UPSTREAM: 126750: Add takeByTopologyUnCoreCachePacked if policy option align-cpus-by-uncorecache is enabled.  Adding new function to evaluate uncore cache id. Reverse allocation logic.  Implement preferAlignByUncorecache within TakeByTopologyNUMAPacked, along with new test cases.
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 23f96a23777c1b5fcdb5876
 https://github.com/openshift/ovn-kubernetes image-amd64 97a2e6b7e17fca030dcda1b1edd884ef8c9b46dd
 https://github.com/openshift/kubernetes image-amd64 8ac36bf977d93ee5db979a4bda774d4a0f3b3367
 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
-https://github.com/openshift/oc image-arm64 6e588cf64c6575fa0b862a9d497b92687f9d0d6e
+https://github.com/openshift/oc image-arm64 02503fe1c31903252e45f50f55922ef3f11c1360
 https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a
 https://github.com/openshift/csi-external-snapshotter image-arm64 8ebf69cb405478df19e31d6daded8834876e7871
 https://github.com/openshift/csi-external-snapshotter image-arm64 8ebf69cb405478df19e31d6daded8834876e7871
 https://github.com/openshift/router image-arm64 be831fa5808df9facf7df4f5cdbf2472c504b60d
 https://github.com/openshift/kube-rbac-proxy image-arm64 23f96a23777c1b5fcdb587602c156903c32fe52c
 https://github.com/openshift/ovn-kubernetes image-arm64 c713669ede0fb5663e72ad055238037ae2e17938
-https://github.com/openshift/kubernetes image-arm64 8ac36bf977d93ee5db979a4bda774d4a0f3b3367
+https://github.com/openshift/kubernetes image-arm64 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b
 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
diff --git a/scripts/auto-rebase/last_rebase.sh b/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.19.0-0.nightly-2024-12-10-040415" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-11-175944"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2024-12-10-040415" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-12-185745"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-11-175944
		OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-12-185745