Skip to content

Commit ea99c2d

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-03-03-170005_amd64-2025-03-03_arm64-2025-03-03 (#4628)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent f01e333 commit ea99c2d

File tree

18 files changed

+95
-186
lines changed

18 files changed

+95
-186
lines changed

‎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-03-02-211136
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-03-211136

‎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-28-132549
1+
OCP_VERSION := 4.19.0-0.nightly-2025-03-03-170005

‎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-03-02-211136"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-03-211136"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17accae06c6875ea8c558b9b68ff0947033f63d0e5c7b45bf2220b14d961fa49",

‎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-28-132549"
3+
"base": "4.19.0-0.nightly-2025-03-03-170005"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbb7dbcb8f21f10d1c87a623271c635cdd6d3229ab671a8dbbd4b79f181a01ca",

‎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-03-02-211136"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-03-211136"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7",

‎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-28-132549"
3+
"base": "4.19.0-0.nightly-2025-03-03-170005"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9",

‎assets/release/release-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-03-02-211136"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-03-211136"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c258dc6115d77a23444ee554dc000f5ac0911798960633b849a2a07c519c72a8",

‎assets/release/release-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-28-132549"
3+
"base": "4.19.0-0.nightly-2025-03-03-170005"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6ee3a3dae1c2cfd2cb5b40ec2aaf32e3892a440b169db0b2b02b8fd863d9cb3",

‎etcd/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ require (
144144

145145
replace (
146146
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes
147-
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd
148-
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd
149-
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd
150-
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd
151-
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd
152-
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd
147+
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250228231120-e9234c8be833 // from etcd
148+
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250228231120-e9234c8be833 // from etcd
149+
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250228231120-e9234c8be833 // from etcd
150+
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250228231120-e9234c8be833 // from etcd
151+
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250228231120-e9234c8be833 // from etcd
152+
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250228231120-e9234c8be833 // from etcd
153153
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes
154154
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes
155155
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes

‎etcd/go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,18 @@ github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhC
162162
github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
163163
github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I=
164164
github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
165-
github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:eBxtqfzBf7l+mUHGPbaOYIkQG8SpUTqJLVyclT5JWEQ=
166-
github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU=
167-
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:b4Ei8dZfabfm97StPm1BTKvmK3DDiUIapjOhQqsUchk=
168-
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4=
169-
github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:/h9Ua1gjVKSOftm8Tc0RQ3uFcEMO2MdfQ1zO/l/S7f4=
170-
github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E=
171-
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:4m3dmokRhQY25GKs3DG0hoq3J1EX2xyd6j9ATczk/S0=
172-
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8=
173-
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:FXDSOT7ZYIXLzllHIuGVnKbE/NpIqaoLwO2X2G07aj8=
174-
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs=
175-
github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:u69/yR6Cz8Fhvj2+vBoWOCcVy3hOnp5xMPe/P2Jmw0M=
176-
github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng=
165+
github.com/openshift/etcd/api/v3 v3.5.1-0.20250228231120-e9234c8be833 h1:zLEHa9l25OitraxvjnWGiIXYuu8yOUe3RbsojN3+Zeg=
166+
github.com/openshift/etcd/api/v3 v3.5.1-0.20250228231120-e9234c8be833/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU=
167+
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250228231120-e9234c8be833 h1:d/tjCNIp/6a5QxYMOV62RsTtKWB9do+TRIn9p8R5boE=
168+
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250228231120-e9234c8be833/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4=
169+
github.com/openshift/etcd/client/v3 v3.5.1-0.20250228231120-e9234c8be833 h1:ghTLRKrILtzPG/o6QxGzodCaakLxHHssBA8aCgTZs0I=
170+
github.com/openshift/etcd/client/v3 v3.5.1-0.20250228231120-e9234c8be833/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E=
171+
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250228231120-e9234c8be833 h1:5UJiLRVkVifrIZbSce58+pMkxhsxj+XBIKavKhfzy5k=
172+
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250228231120-e9234c8be833/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8=
173+
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250228231120-e9234c8be833 h1:VXkWNgf5I6ZOks+PT9DDYaEu+kisvP7y1VbGVEiDe10=
174+
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250228231120-e9234c8be833/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs=
175+
github.com/openshift/etcd/server/v3 v3.5.1-0.20250228231120-e9234c8be833 h1:Jkp5zHXXltOwr403wkRUkaik7pqSDz7tYBxmLnObi2w=
176+
github.com/openshift/etcd/server/v3 v3.5.1-0.20250228231120-e9234c8be833/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng=
177177
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a h1:2AcZuUu2yRCywC2pyxQf5s+GMWPW5ginnlqrDLR07RY=
178178
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us=
179179
github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a h1:UDGYhZvFKg8iqwR0Upd4Q+1BT77G9KmywaRm4ugCmOo=

0 commit comments

Comments
 (0)