Skip to content

Commit 0296cf7

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-05-033447_amd64-2025-02-05_arm64-2025-02-05 (#4511)
* 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 86d3a51 commit 0296cf7

23 files changed

+290
-334
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=31
33
KUBE_GIT_VERSION=v1.31.4
4-
KUBE_GIT_COMMIT=ff3bcb85459e1c94917fbde7c4528c644b09ca2a
4+
KUBE_GIT_COMMIT=5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275
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.18.0-0.nightly-arm64-2025-02-04-235102
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-05-235102

‎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.18.0-0.nightly-2025-02-04-192134
1+
OCP_VERSION := 4.18.0-0.nightly-2025-02-05-033447

‎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.18.0-0.nightly-arm64-2025-02-04-235102"
3+
"base": "4.18.0-0.nightly-arm64-2025-02-05-235102"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",

‎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.18.0-0.nightly-2025-02-04-192134"
3+
"base": "4.18.0-0.nightly-2025-02-05-033447"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",

‎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.18.0-0.nightly-arm64-2025-02-04-235102"
3+
"base": "4.18.0-0.nightly-arm64-2025-02-05-235102"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427",

‎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.18.0-0.nightly-2025-02-04-192134"
3+
"base": "4.18.0-0.nightly-2025-02-05-033447"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2",

‎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.18.0-0.nightly-arm64-2025-02-04-235102"
3+
"base": "4.18.0-0.nightly-arm64-2025-02-05-235102"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0730b0c09e2f2e0a25a9b7bd65f2ecf65012465124b87ffdcbf6cd847a3ed8d0",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:419f8e79712482517a331012d338610011aee0d4f8fba5f14608b9e42e63b651",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a1695a2a0178836842cc65b9765e2476155c96cf550596d06fdbd5be2bb68f5",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:258c0b8d31226677694d37fa634ffd12ad62089d1fca00e55fca1d0d7f4dfb5c",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1c57c5d9fe9b9bf69b949af105819436f8ce48b75fc3b90fc1ab8b20d9783b4",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336299bf1f964f6ffa1ba8251cc65432894b9ba279e26a6129a1c46bf5583eed",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feba216e445c3bbfa47871a9a3125b5eadf1d9b3a2b86e226ebfea8ded3067d9",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8a9f8d1e9eb9ce227bb761ca924c1723e7204ac1c96b4a4abcb7ba9e25ecdda",
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:cc0122a02bb15b0bebb834153ca4edb2ea47245c2f183fc6ada74fd158608795"

‎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.18.0-0.nightly-2025-02-04-192134"
3+
"base": "4.18.0-0.nightly-2025-02-05-033447"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35512335ac39aed0f55b7f799f416f4f6445c20c1b19888cf2bb72bb276703f2",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:487c0a8d5200bcdce484ab1169229d8fcb8e91a934be45afff7819c4f7612f57",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe009d03910e18795e3bd60a3fd84938311d464d2730a2af5ded5b24e4d05a6b",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:242b3d66438c42745f4ef318bdeaf3d793426f12962a42ea83e18d06c08aaf09",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f7093ff0639c463f8c9ac05be7fcd27f7dd756adf29ec2202e667b29942746b",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:391036a8c2a81db19153621535113703b6e8624175562cf23d500e29ab1ee022",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eafc90ff79ad4b3a77db747b7f8e010822f895fcebcaee69ac8e0e5937bbb397",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898cae57123c5006d397b24af21b0f24a0c42c9b0be5ee8251e1824711f65820",
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:d38bd1b30905149a8ec481e37ddb8812e9ea66b25333a80f08f09c467b805a39"

‎etcd/go.mod

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

185-
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204121558-ff3bcb85459e // staging kubernetes
185+
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes
186186

187-
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204121558-ff3bcb85459e // staging kubernetes
187+
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250204204913-5f71ced928d0 // staging kubernetes

0 commit comments

Comments
 (0)