NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2024-10-15-194152_amd6…

…4-2024-10-15_arm64-2024-10-16 (#4068) * update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
openshift · Oct 16, 2024 · 58f725f · 58f725f
1 parent 30e6c56
commit 58f725f
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 12 deletions.
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.17.0-0.nightly-arm64-2024-10-15-001838
+OCP_VERSION := 4.17.0-0.nightly-arm64-2024-10-16-001937
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.17.0-0.nightly-2024-10-14-090421
+OCP_VERSION := 4.17.0-0.nightly-2024-10-15-194152
diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-10-15-001838"
+    "base": "4.17.0-0.nightly-arm64-2024-10-16-001937"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56bf413abc659c78d4e60905b8be758499f57cd1ccd07f54aaf802793564bec6",

diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-2024-10-14-090421"
+    "base": "4.17.0-0.nightly-2024-10-15-194152"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6fc620709bd562ad81fa459c9210e56ff140954dca0691c4dacc4e4ea07a66",

diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-10-15-001838"
+    "base": "4.17.0-0.nightly-arm64-2024-10-16-001937"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b4755dfe4c26925dfe2596cdd3dbe10d1c73b0e46711693cdaf1b835d5f8825",

diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-2024-10-14-090421"
+    "base": "4.17.0-0.nightly-2024-10-15-194152"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3434847fbe81d8cbbecbc25a5d85b15270156e32b4ed42e3440ec2e75fcaaba6",

diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,14 +1,14 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-arm64-2024-10-15-001838"
+    "base": "4.17.0-0.nightly-arm64-2024-10-16-001937"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57443e914f1949d4b4a8c8f9ef9fe1cebdcfc895239f225885018805365150f0",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45a88330d838c16be69f4d3b14cea2a83b0fe6066b2083039b9d29cd964b7846",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84e3a9cd0fbaaf37a9aecda79939155ee7032aa7bd70b24a5eb4addab365e570",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74496d923c85545ac0c50716bfdb21f63356efbf3f31516658058b8ae1bffff1",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3339c716c08f4bcef1fd2728963eed2ed5a0a912c436853bff17f51a94757d8",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eaaa5ce599fd909d6444e6a9d327bd0e3ac3a2f1b950846e6c1654bbb51e9ee6",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b041cb43a17ba6d7326b2a18d132f191e2c3e3368a5dbdec3aebdf8f1c32377",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:085711b1e487fb0b6e77f51d301bd68a2c75fe53920aacaa994f74cfb14d9fbf",
     "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:12dd688be79fc9e832509bef11afaadfed2df89c0c2ad3a85339e02f3403a056",

diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.17.0-0.nightly-2024-10-14-090421"
+    "base": "4.17.0-0.nightly-2024-10-15-194152"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:042a19ff845041a952525f1a2492c03a72c1eb68f0df97cf258279027239c282",

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:eaaa5ce599fd909d6444e6a9d327bd0e3ac3a2f1b950846e6c1654bbb51e9ee6"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b041cb43a17ba6d7326b2a18d132f191e2c3e3368a5dbdec3aebdf8f1c32377"
 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
@@ -0,0 +1,3 @@
+- kubernetes image-arm64 9f6734309b7466648dcdca0d43223368ff840ae6 to 6816ea6a977365195404d43756efd1c42ac0b2a7
+  - 5cfe93b58 2024-10-11T10:57:02-03:00 Revert "OCPBUGS-42640: Revert #2089 "OCPBUGS-42167: Bump k8s api to 1.30.5""
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc5523
 https://github.com/openshift/router image-arm64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a
 https://github.com/openshift/kube-rbac-proxy image-arm64 b2d2c462e801d7b8890347c017184153c3c8eaab
 https://github.com/openshift/ovn-kubernetes image-arm64 62451d12851aebdd1a3b009a9829f8df796998ad
-https://github.com/openshift/kubernetes image-arm64 9f6734309b7466648dcdca0d43223368ff840ae6
+https://github.com/openshift/kubernetes image-arm64 6816ea6a977365195404d43756efd1c42ac0b2a7
 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.17.0-0.nightly-2024-10-14-090421" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-10-15-001838"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-10-15-194152" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-10-16-001937"