Skip to content

Commit 2a3bb86

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-02-19-144151_amd64-2025-02-19_arm64-2025-02-19 (#4580)
* 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 b31f4a8 commit 2a3bb86

21 files changed

+269
-254
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=32
33
KUBE_GIT_VERSION=v1.32.1
4-
KUBE_GIT_COMMIT=cc907f560ac6272d02cbcc6c97122ef098a85649
4+
KUBE_GIT_COMMIT=79a6bafe8c66e9d2fe02cd33a45a5d37519de91e
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.19.0-0.nightly-arm64-2025-02-18-203317
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-19-203317

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.19.0-0.nightly-2025-02-18-040948
1+
OCP_VERSION := 4.19.0-0.nightly-2025-02-19-144151

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.19.0-0.nightly-arm64-2025-02-18-203317"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-19-203317"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:498df400bf9d229019292c450f7ec0a9a8ac73c05dab7fd165505e6c672ccd02",

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.19.0-0.nightly-2025-02-18-040948"
3+
"base": "4.19.0-0.nightly-2025-02-19-144151"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f980a47c06ea793350a0a6a439fb65f3f0f41e2c431f46416540e8be0d2010c",

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.19.0-0.nightly-arm64-2025-02-18-203317"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-19-203317"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88df2c7857afadd987ddc302d4587ae12922e3f94e3d9859eb6b2572d4206276",

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.19.0-0.nightly-2025-02-18-040948"
3+
"base": "4.19.0-0.nightly-2025-02-19-144151"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79",

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.19.0-0.nightly-arm64-2025-02-18-203317"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-19-203317"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87259c9890123980c68fdb91ef253dbc1ed60c85b880934665c41343eb101264",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:511b6ec1692f4bf3a88a820835405a855feee831ceb5d4eb67dd68a21c1ed807",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e985d34f9bcf53de43744e979dc0a06d59a3c138b6649220dff147d80f4fb249",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e31614074e3ef9d16c157869aa370e640a4f6cc1fd7fe85332080ae1cd53f9f",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:360456f924397cb213ca44cda27a2f5102badbf670f333c75c4f4b3a2c6d769c",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acca968d3aea86febaf027a15e939c5dd14323e438c5678402de35c855d90be0",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a14a624f3f24bd3420b50ced02ad26e7485e49bcb9a82a037eb169a02ff1018",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74587fc0632bd2f98a77c64cc8cac148626e231fe31d7419068621ee5ec67db9",
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:ca95f097b18802f163a66a020aedc576741f8c38b19610246ff9b0de4b44f51c"

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.19.0-0.nightly-2025-02-18-040948"
3+
"base": "4.19.0-0.nightly-2025-02-19-144151"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7c3ec7952d190a0dae3efdd23feabb7ad3be30daeca96cb9c184db2c535bd41",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9de1fd4c84142e481f1c81e6f754f4814e7860343d5ed0e12b1e4516f45a03b",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f48387b2c96fe1f8b2450da76b0e54b7f9b057d4b914e79cad11ddde91c3c4",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fb7a33a80053a3cdbba9e8df2110a6188a1e1e684abac6d94ab5528cf4349cc",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a76b83b9d5f094b757169e20f4ae7c4f6a831fa48aed99aba83c8dca641bc48",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b96a467e01207954bd65b890fb94041fb42845ee2a6bde72c4b8d0515a4571c",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:209e650647959ab8d0260670257a364063ce2c9e655509a94cf1b2e4e3712b0e",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c8b3c62e2a4cca60fdc483f021c1f8c7ee5d888b3a880ac1ac8adef5a59fb28",
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:d44128ade44ec280cb241ac15d90dc1ddf37e730a29e8ce6110db69a940f8d88"

etcd/go.mod

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

184-
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250212081427-cc907f560ac6 // staging kubernetes
184+
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250219035048-79a6bafe8c66 // staging kubernetes
185185

186-
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250212081427-cc907f560ac6 // staging kubernetes
186+
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250219035048-79a6bafe8c66 // staging kubernetes
187187

188-
replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250212081427-cc907f560ac6 // staging kubernetes
188+
replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250219035048-79a6bafe8c66 // staging kubernetes

0 commit comments

Comments
 (0)