Skip to content

Commit f7e8b94

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-03-05-160850_amd64-2025-03-05_arm64-2025-03-06 (#4644)
* update last_rebase.sh * update changelog * update microshift/go.mod * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 3267136 commit f7e8b94

File tree

95 files changed

+1389
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1389
-618
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-05-221948
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-06-161948

assets/optional/multus/kustomization.aarch64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ images:
55
digest: sha256:ea1e801f53c7cb86011519dab3f10c5d52f9f92090d4afaa943c1d658db753d6
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:8adf23d87c0efb6d6fb76007122b1a16a85d4be1cc0305cc9d8c7bfba7fcaf94
8+
digest: sha256:d99ec21e51691b1b5fcc029401672943856037061964fa9afe9a1365fc6ed298
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-05-221948"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-06-161948"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea1e801f53c7cb86011519dab3f10c5d52f9f92090d4afaa943c1d658db753d6",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8adf23d87c0efb6d6fb76007122b1a16a85d4be1cc0305cc9d8c7bfba7fcaf94"
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d99ec21e51691b1b5fcc029401672943856037061964fa9afe9a1365fc6ed298"
88
}
99
}

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

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-03-05-221948"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-06-161948"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deadd255553a81763afaaaad9508be81e8b996f9cf2d2dd9590a2976aa0dade4",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fc1a08dc6e15c424adddd3725c033ac24846298ffc8176e13db1b674df32c37",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f1ed729aca82c2d32b00451a98fa68d1d4910fad968e310a50647eec8aa15b",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf218c10be35ac48a7b4dc7f7fae559cdda361e96de69a18f871ed58e28e60a7",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2aa87c7c7bef5e693ee0af9b8dbdabd38d00d5f7c6fdb7c4a3f9969a28fa73d",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37901bd727223653cd2c61c2fb7df00ee9a1f84dce86620c32694bd117df990b",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:897e5a1a07599e9c048ab2fdec7608532d0232b70c6a22b3b19416bea1cea9d4",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3063240051234139b67f4afd0ec7ab5de61724f3a5ce64ab055b040bd9dc08bb",
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:1a77322350b3a5888b1ad6665ef94a3b477beeedb628ae722b7852ff581b834d"

etcd/go.mod

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/go-logr/stdr v1.2.2 // indirect
3030
github.com/google/gnostic-models v0.6.8 // indirect
3131
github.com/google/go-cmp v0.6.0 // indirect
32-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
32+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
3333
github.com/klauspost/compress v1.17.11 // indirect
3434
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
3535
github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 // indirect
@@ -38,10 +38,10 @@ require (
3838
github.com/vishvananda/netns v0.0.4 // indirect
3939
github.com/x448/float16 v0.8.4 // indirect
4040
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
41-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
41+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
4242
golang.org/x/sync v0.11.0 // indirect
43-
google.golang.org/genproto/googleapis/api v0.0.0-20241216192217-9240e9c98484 // indirect
44-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
43+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
44+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
4545
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4646
k8s.io/apiserver v0.32.2 // indirect
4747
)
@@ -64,7 +64,7 @@ require (
6464
github.com/go-errors/errors v1.4.2 // indirect
6565
github.com/go-logr/logr v1.4.2 // indirect
6666
github.com/go-openapi/jsonpointer v0.21.0 // indirect
67-
github.com/go-openapi/jsonreference v0.20.4 // indirect
67+
github.com/go-openapi/jsonreference v0.21.0 // indirect
6868
github.com/go-openapi/swag v0.23.0 // indirect
6969
github.com/gogo/protobuf v1.3.2 // indirect
7070
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
@@ -93,9 +93,9 @@ require (
9393
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9494
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
9595
github.com/pkg/errors v0.9.1 // indirect
96-
github.com/prometheus/client_golang v1.20.5 // indirect
96+
github.com/prometheus/client_golang v1.21.0-rc.0 // indirect
9797
github.com/prometheus/client_model v0.6.1 // indirect
98-
github.com/prometheus/common v0.61.0 // indirect
98+
github.com/prometheus/common v0.62.0 // indirect
9999
github.com/prometheus/procfs v0.15.1 // indirect
100100
github.com/sirupsen/logrus v1.9.3 // indirect
101101
github.com/soheilhy/cmux v0.1.5 // indirect
@@ -111,24 +111,24 @@ require (
111111
go.etcd.io/etcd/pkg/v3 v3.5.18 // indirect
112112
go.etcd.io/etcd/raft/v3 v3.5.18 // indirect
113113
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
114-
go.opentelemetry.io/otel v1.33.0 // indirect
115-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
116-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
117-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
118-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
119-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
114+
go.opentelemetry.io/otel v1.34.0 // indirect
115+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
116+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
117+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
118+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
119+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
120120
go.uber.org/multierr v1.11.0 // indirect
121121
go.uber.org/zap v1.27.0 // indirect
122122
golang.org/x/crypto v0.33.0 // indirect
123123
golang.org/x/net v0.35.0 // indirect
124-
golang.org/x/oauth2 v0.24.0 // indirect
124+
golang.org/x/oauth2 v0.25.0 // indirect
125125
golang.org/x/sys v0.30.0 // indirect
126126
golang.org/x/term v0.29.0 // indirect
127127
golang.org/x/text v0.22.0 // indirect
128-
golang.org/x/time v0.8.0 // indirect
128+
golang.org/x/time v0.9.0 // indirect
129129
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
130-
google.golang.org/grpc v1.69.0 // indirect
131-
google.golang.org/protobuf v1.36.0 // indirect
130+
google.golang.org/grpc v1.70.0 // indirect
131+
google.golang.org/protobuf v1.36.4 // indirect
132132
gopkg.in/inf.v0 v0.9.1 // indirect
133133
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
134134
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)