Skip to content

Commit 90cb8c6

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-01-15-030107_amd64-2025-01-15_arm64-2025-01-15 (#4421)
* 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 8e6143b commit 90cb8c6

27 files changed

+589
-280
lines changed

‎Makefile.kube_git.var

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=31
3-
KUBE_GIT_VERSION=v1.31.3
4-
KUBE_GIT_COMMIT=205ac00c56dd2340b90dc0e328be84e77219197c
3+
KUBE_GIT_VERSION=v1.31.4
4+
KUBE_GIT_COMMIT=11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f
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-01-14-173318
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-15-090110

‎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-01-13-114945
1+
OCP_VERSION := 4.18.0-0.nightly-2025-01-15-030107

‎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-01-14-173318"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-15-090110"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af",

‎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-01-13-114945"
3+
"base": "4.18.0-0.nightly-2025-01-15-030107"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9561a8aebe6978367bb21b607369a9c23c7651ddb3002f7b3cdd01b18c89adf",

‎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-01-14-173318"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-15-090110"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3",

‎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-01-13-114945"
3+
"base": "4.18.0-0.nightly-2025-01-15-030107"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a495a5377a92c64bf23b5d770d6e08d7ce6f1f17716bf53bcbb9c2ac412561",

‎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-01-14-173318"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-15-090110"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e97a1610f2cca76626c497f02401518309e3c323d113d4c5eed2aced9a8f895",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f8ab04d2eae86d44d8061bf14662b42e3dfe3718fb08ae1259f94900d5c4bc5",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebf06deb7ce22e50a5c66be3c52674eb53337e967fe7397f7e8327c784ca49b",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f1644f600af057ccf8ae3fd544d6a0dc72f079f97f9db98e00ed8c9779c26d",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc34ba5a77e872e2a7b9918166f522ea22154f87738e34f65acc0fdc4c2e5a30",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b8548a3a65394f4e82397fd759a0a80a77d41c875f2db817d8034e5bd3848bf",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcc1c450c4888d6b759636e508ee77f49592642454d4b59c908da0ae5297a31c",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49f294bfc07141d8d238566373651845cc5137dcf93f9de2029b448d79b26235",
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:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4",

‎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-01-13-114945"
3+
"base": "4.18.0-0.nightly-2025-01-15-030107"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5144aef5994b0ffe47dd2008bf03f61ec0282446af80f5b8fee902f0c9890fd6",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8677b12826bd9d33e8f6bb96d70bbcdaf3c5dec9e28a8b72af2c2e60620b6b19",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cc368c51c39d9826ba0267431389da3f405659ee624d1ce2d112228c60c1801",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cef15546af8dd88a07a4c9715bfc81bc2f43f2e36c80a2d95c3fb3485fb31d48",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eb42e39a62950ce0c4ca98fdac70e6dd8c7a7fdb37ecc133f0234f7b6353dc6",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:420a4b1bb0391c63f0a642e612a248e8e3a7be80c33f60f16fa6bc00966e5752",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:937e6ee08ea4bd899126c8daf2a9fa8c27ea3850257baeb278ecd8cad207fc47",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a870f9818c582a6dda22d591b0121bc1331c26eafc97bf007bcaaacb9c43e743",
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:31d9234ca87bcb644468c00195368de69383310dad22fdb88b4ec0a55eda627a",

‎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-20241129121019-205ac00c56dd // staging kubernetes
155-
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
156-
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
157-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
158-
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241129121019-205ac00c56dd // from kubernetes
159-
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
160-
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
161-
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
162-
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
163-
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
164-
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
165-
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
166-
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
167-
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
168-
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
169-
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
170-
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
171-
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
172-
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
173-
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
174-
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241129121019-205ac00c56dd // from kubernetes
175-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
176-
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
177-
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
178-
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
179-
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
180-
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
181-
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
182-
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
154+
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
155+
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
156+
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
157+
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
158+
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250114233856-11e2f11d1e0c // from kubernetes
159+
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
160+
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
161+
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
162+
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
163+
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
164+
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
165+
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
166+
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
167+
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
168+
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
169+
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
170+
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
171+
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
172+
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
173+
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
174+
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250114233856-11e2f11d1e0c // from kubernetes
175+
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
176+
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
177+
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
178+
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
179+
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
180+
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
181+
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
182+
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
183183
)
184184

185-
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
185+
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes
186186

187-
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20241129121019-205ac00c56dd // staging kubernetes
187+
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250114233856-11e2f11d1e0c // staging kubernetes

0 commit comments

Comments
 (0)