Skip to content

Commit 47fd748

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-13-133005_amd64-2025-03-13_arm64-2025-03-13 (#4675)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent f1e409e commit 47fd748

File tree

12 files changed

+27
-44
lines changed

12 files changed

+27
-44
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-12-220901
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-13-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-12-184246
1+
OCP_VERSION := 4.19.0-0.nightly-2025-03-13-133005

‎assets/components/openshift-router/deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
- name: ROUTER_THREADS
5858
value: '{{ .ThreadCount }}'
5959
- name: SSL_MIN_VERSION
60-
value: '{{ .RouterSSLMinVersion }}'
60+
value: '{{ .RouterSSLMinVersion }}'
6161
- name: ROUTER_USE_PROXY_PROTOCOL
6262
value: "false"
6363
- name: GRACEFUL_SHUTDOWN_DELAY
@@ -146,6 +146,8 @@ spec:
146146
name: '{{ .ClientCAMapName}}'
147147
readOnly: true
148148
{{- end }}
149+
150+
149151
image: '{{ .ReleaseImage.haproxy_router }}'
150152
ports:
151153
- name: http

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

‎scripts/auto-rebase/changelog.txt

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
1-
- api embedded-component b8da3bfeaf773d9dce2ea56edc9a1cf06cfdbd80 to 14a17c7009c4bea5534e3a2ea0d0a42e4f15d79a
2-
- b8d74abd 2025-03-10T16:19:05+01:00 features: add ShortCertRotation
3-
4-
- cluster-csi-snapshot-controller-operator embedded-component 4958fc82ce750b97e49d83f5082127c59d0f05c7 to b1a1105065835fcd881529299bc431921f4aa156
5-
- f5292e6 2025-03-10T12:40:23+01:00 bump library-go
6-
7-
- cluster-ingress-operator embedded-component 69cadab177d66bb2324897db4be50ae67fab1fc7 to 257abf3bdbdfd7ba7264dddf28b8969125da6b11
8-
- 8e73871 2025-03-11T11:19:01+01:00 e2e: serialize TestGatewayAPI to avoid webhook race condition
9-
- 22ca3e4 2025-03-11T11:19:01+01:00 NE-1953: Add Validating Admission Policy for Gateway API CRDs
10-
- 3d72b24 2025-03-10T14:20:58+01:00 NE-1954: Implement GatewayAPIController feature gate
11-
- d9cf3df 2025-03-06T15:01:58+01:00 NE-1954: Bump openshift/api to get GatewayAPIController feature gate
12-
13-
- cluster-kube-controller-manager-operator embedded-component 84e020145ed33c98597f675fff638c83f4d351a4 to 75f30cdb07d58ce71c0a247207a5d91799a48cc0
14-
- 03b7cf2 2025-03-10T12:48:11+01:00 Run SELinux warning controller
15-
16-
- cluster-network-operator embedded-component 972dea1fa5ac0b403496f88b2b0c59e1aa471de8 to 2d60b748416747a0652a10b27aa53b3ee1e30fa0
17-
- 7840900 2025-03-05T15:54:15+02:00 frr-k8s: rename validatingwebhook name
18-
19-
- cluster-policy-controller embedded-component 5cc0d0ecd3cdfe8e2fbb55bb62de7fb047b2a127 to 748524784686a5f397490563882cbfb88f9acd01
20-
- 284f2af 2025-03-10T12:21:37+00:00 pkg/psalabelsyncer: add MinimallySufficientPodSecurityStandard annotation
21-
22-
- etcd embedded-component 63a774631341b1bdf9ad49baedee25e047f62629 to bd0cae2096abb1d2087e858bbce3f9c06b215f8d
23-
- d4e4b326 2024-12-04T14:39:22+00:00 Updating ose-etcd-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/2ea3e6158c93ca104b9d59fd58a71536fa01fb2d/images/ose-etcd.yml
24-
25-
- service-ca-operator embedded-component 1e65678429c82df5ae97da4dde8dbe03d75062e6 to fdd9502ff3446725b4f1fbf6902547dba9266061
26-
- 00a30ff 2025-03-07T15:52:49+08:00 update k8s.io/* dependencies to v0.32.2
27-
- b8cd381 2025-03-07T12:45:31+08:00 Update go 1.23 and ocp 4.19
28-
29-
- service-ca-operator image-amd64 1e65678429c82df5ae97da4dde8dbe03d75062e6 to fdd9502ff3446725b4f1fbf6902547dba9266061
30-
- 00a30ff 2025-03-07T15:52:49+08:00 update k8s.io/* dependencies to v0.32.2
31-
- b8cd381 2025-03-07T12:45:31+08:00 Update go 1.23 and ocp 4.19
1+
- cluster-ingress-operator embedded-component 257abf3bdbdfd7ba7264dddf28b8969125da6b11 to 7dc12cf28557f8c80460435649cfc393761e0285
2+
- 80a7f60 2025-03-12T09:38:20+01:00 Makefile: Enable running specific unit tests
3+
- 3e74ced 2025-03-12T09:37:26+01:00 NE-1981: Move controller test helpers to dedicated package
4+
5+
- cluster-network-operator embedded-component 2d60b748416747a0652a10b27aa53b3ee1e30fa0 to b2f717758e01faa85ece045aaa63f65dbbce7d17
6+
- 2452abe 2025-03-11T12:36:28+02:00 ovn-k: sync EgressService with upstream
7+
8+
- machine-config-operator embedded-component 5dcc44abebbfb5dbeaaa8ef2569ba211032e1c00 to 6e460d14449088ca10549456b27d1f85cca93db8
9+
- d7f6276d 2025-03-07T10:14:03-05:00 e2e: add Ignition upgrade test case
10+
- 410f667d 2025-03-06T15:39:02-05:00 msbic: attempt Ignition stub upgrade
11+
- abc1abe1 2025-03-06T15:39:02-05:00 msbic: use releaseVersion from configmap
12+
- aff0e238 2025-03-06T15:39:02-05:00 msbic: remove injection of managed secret
3213

0 commit comments

Comments
 (0)