Skip to content

Commit 9cfd10a

Browse files
microshift-rebase-script[bot]ci-robotcopejon
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-03-12-184246_amd64-2025-03-12_arm64-2025-03-12 (#4665)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update manifests * update buildfiles * manual intervention required to update the unit test's expected argument list Signed-off-by: Jon Cope <[email protected]> --------- Signed-off-by: Jon Cope <[email protected]> Co-authored-by: ci-robot <[email protected]> Co-authored-by: Jon Cope <[email protected]>
1 parent d50c1b8 commit 9cfd10a

File tree

20 files changed

+100
-138
lines changed

20 files changed

+100
-138
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-11-220901
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-12-220901

‎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-03-09-063419
1+
OCP_VERSION := 4.19.0-0.nightly-2025-03-12-184246

‎assets/controllers/kube-controller-manager/defaultconfig.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ extendedArguments:
2020
- "-ttl" # TODO: this is excluded in kube-core, but not in #21092
2121
- "-bootstrapsigner"
2222
- "-tokencleaner"
23+
# Most upstream clusters don't care about SELinux, therefore this controller is opt-in. OCP cares.
24+
# Owner: OCP storage team, @jsafrane.
25+
- "selinux-warning-controller"
2326
cloud-provider:
2427
- "external"
2528
cluster-signing-duration:

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

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

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

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

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

‎assets/release/release-x86_64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-03-09-063419"
3+
"base": "4.19.0-0.nightly-2025-03-12-184246"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c932b7514f8a9990a7e9b69dc7976f9e9adf5e4950ebb374c032ae1160d381b0",
@@ -9,7 +9,7 @@
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5598bb4202a4832e6702a662921bee1ecbc61b47d5a4d686cad64ebe46966d60",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:741319d978f4d330fe060976155d08c8e0f920645c591594f4dab7224446d521",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8047d0cc22966ef0152d94f46c1b89dc04a50ec9cd10fa4f8290391124d230d1",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b218d15219fabf2a83c934fa4a6bf3ce41ebbf229355216faf3d69e31512216c",
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:a403e7e23287b4dc77ce28895e31018ac1cde5e4040c6caddcfeea1c208e51d0"
1515
}

‎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.20250307195440-63a774631341 // from etcd
148-
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250307195440-63a774631341 // from etcd
149-
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250307195440-63a774631341 // from etcd
150-
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250307195440-63a774631341 // from etcd
151-
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250307195440-63a774631341 // from etcd
152-
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250307195440-63a774631341 // from etcd
147+
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd
148+
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd
149+
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd
150+
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd
151+
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd
152+
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd
153153
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250306183419-2f2cf3874c49 // staging kubernetes
154154
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250306183419-2f2cf3874c49 // staging kubernetes
155155
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250306183419-2f2cf3874c49 // staging kubernetes

0 commit comments

Comments
 (0)