Skip to content

Commit 6225d7a

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-10-29-212217_amd64-2025-10-29_arm64-2025-10-29 (#5675)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 408fd97 commit 6225d7a

28 files changed

+640
-494
lines changed

Makefile.kube_git.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=30
33
KUBE_GIT_VERSION=v1.30.14
4-
KUBE_GIT_COMMIT=ff6c884c3d829c5e8e0d26eb8088b976c908cef1
4+
KUBE_GIT_COMMIT=ac453edd5ce7d88cf916149399627c93ab30cf16
55
KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-10-26-203449
1+
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-10-29-180925

Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.17.0-0.nightly-2025-10-26-203608
1+
OCP_VERSION := 4.17.0-0.nightly-2025-10-29-212217

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-arm64-2025-10-26-203449"
3+
"base": "4.17.0-0.nightly-arm64-2025-10-29-180925"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2faa870471b5b8279a8cf6ea9bf1cbf2302adf0224121f8b455a1866ff5ad3ab",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-2025-10-26-203608"
3+
"base": "4.17.0-0.nightly-2025-10-29-212217"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bc4e2ad0833a6bb25c93ffc34098ae4b7237c916dd3f4f245fe36236a7c3d59",

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-arm64-2025-10-26-203449"
3+
"base": "4.17.0-0.nightly-arm64-2025-10-29-180925"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cb63a793e28c68ed2c48ebaa1c396c893ef5ea2c661fcd28b36c8e21051c4bd",

assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-2025-10-26-203608"
3+
"base": "4.17.0-0.nightly-2025-10-29-212217"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f952f0926c928da160a6c58b7f4859ea03baddee8553178268beaeb695a60cdb",

assets/release/release-aarch64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-arm64-2025-10-26-203449"
3+
"base": "4.17.0-0.nightly-arm64-2025-10-29-180925"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d349b758923c6cb2e26f505cb7cf3e003bfced4465c421ca1c938b8d0954242",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d7bb658720b68fc7085150dbb75ca123af7fb1c70ae76520afcc8649dc4eb18",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bba97f49fdb2d2dcf34baa7f1dfbca53400f0864223caa35b62b664fa212b4cb",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ebd6ac428ef69d0242d739b94d64dd92b3b7d333827a9bd30777e497f7caa67",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea116cf11b6ca970d02107bb8f15d9a91b977efedefd6acb615b7e287ba71d5c",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dc5c1576a3a393b4b4fe674b71415a695e83a9a1058e19be63499ccc7ef65e0",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:055cd2eab8687aa24745e2ec8fad219ae86ab44b1f2a2af912c119d22c426b4e",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7932183e9dbcc19a3ffe12c5a42875c43b2fdaa35259e1d36ab63f5c55545976",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
1414
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3153c5d27fa846b9c12bcabf323b94ce578d1e980f0b77efe21a9e7e9ff609",

assets/release/release-x86_64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-2025-10-26-203608"
3+
"base": "4.17.0-0.nightly-2025-10-29-212217"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b877962f8a2af5d5570c8233d226f1a2403f9c51873ddd482aaca681c121a31",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b541b96ca7d4a6e8bd56b1d9cc0128717be5fcd85cd83132f9c661f5cddf4efb",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70e6f03d32a0d6781e991820d2eeb9f375b8dea6e029ef8eccf6783107a5b59d",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51b6c7ddfeeef5be3c9df70c5300cc72fc186e49d608289f3418596a0d40ffff",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7e52d3d8afea768540308c1f3d4574719f052ccff405078384b4227d4d4652a",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4771d0812b27bd85dda49ee2beee11e65c1bd8e4674cb1cb8bd6b7c67fe6eded",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f496aa93cabd6ef899776f400e1e94b17214f475e2139b2310c4c056ff4f7f2",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c8f37fdcb030e3f631d39caed0281f49325c0f19615f73a377b9011843db104",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
1414
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d5ca6fcc6fd5e98bcd3a063537a05bd7ddb281ada7c8bb9df3d91497fb93432",

etcd/go.mod

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -150,35 +150,35 @@ replace (
150150
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
151151
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
152152
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
153-
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
154-
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
155-
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
156-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
157-
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20251021195315-ff6c884c3d82 // from kubernetes
158-
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
159-
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
160-
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
161-
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
162-
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
163-
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
164-
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
165-
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
166-
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
167-
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
168-
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
169-
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
170-
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
171-
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
172-
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
173-
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20251021195315-ff6c884c3d82 // from kubernetes
174-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
175-
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
176-
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
177-
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
178-
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
179-
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
180-
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
181-
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
153+
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
154+
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
155+
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
156+
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
157+
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20251028150759-ac453edd5ce7 // from kubernetes
158+
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
159+
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
160+
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
161+
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
162+
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
163+
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
164+
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
165+
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
166+
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
167+
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
168+
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
169+
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
170+
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
171+
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
172+
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
173+
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20251028150759-ac453edd5ce7 // from kubernetes
174+
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
175+
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
176+
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
177+
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
178+
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
179+
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
180+
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
181+
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes
182182
)
183183

184-
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20251021195315-ff6c884c3d82 // staging kubernetes
184+
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20251028150759-ac453edd5ce7 // staging kubernetes

0 commit comments

Comments
 (0)