Skip to content

Commit 5b26cdc

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-14-061055_amd64-2025-03-14_arm64-2025-03-17 (#4693)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent e59ffd8 commit 5b26cdc

File tree

7 files changed

+11
-35
lines changed

7 files changed

+11
-35
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-15-105008
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-17-210236

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

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:4057de7550f9fa31bb8437ee43436b6949719b61b80c7cf9ce0e4e5e13cdd5ee
5+
digest: sha256:ea4a6155d39da15f5053c2e475e895caadac7f940a29d5d66a94dace35d12806
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:455e6946241d7d9ba51088d5854ee8f99b1a98dc4e023ded8b99d18d25873091
8+
digest: sha256:02f7690b65cba9c96686161a96d577ea72dac91f95f91158be3c19604e49330b
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:cf218c10be35ac48a7b4dc7f7fae559cdda361e96de69a18f871ed58e28e60a7
@@ -16,12 +16,12 @@ patches:
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:455e6946241d7d9ba51088d5854ee8f99b1a98dc4e023ded8b99d18d25873091
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02f7690b65cba9c96686161a96d577ea72dac91f95f91158be3c19604e49330b
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4057de7550f9fa31bb8437ee43436b6949719b61b80c7cf9ce0e4e5e13cdd5ee
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4a6155d39da15f5053c2e475e895caadac7f940a29d5d66a94dace35d12806
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-15-105008"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-17-210236"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4057de7550f9fa31bb8437ee43436b6949719b61b80c7cf9ce0e4e5e13cdd5ee",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:455e6946241d7d9ba51088d5854ee8f99b1a98dc4e023ded8b99d18d25873091",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4a6155d39da15f5053c2e475e895caadac7f940a29d5d66a94dace35d12806",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02f7690b65cba9c96686161a96d577ea72dac91f95f91158be3c19604e49330b",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf218c10be35ac48a7b4dc7f7fae559cdda361e96de69a18f871ed58e28e60a7"
99
}
1010
}

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

‎scripts/auto-rebase/changelog.txt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +0,0 @@
1-
- api embedded-component 14a17c7009c4bea5534e3a2ea0d0a42e4f15d79a to 8a7efbfb531684ef0ff566a882096df03e0f499c
2-
- 378e9d79 2025-03-12T10:18:13-04:00 machine_config: add ManagedBootImages status
3-
- cedb2795 2025-03-04T11:59:38-05:00 add explicit opt-out for boot image update
4-
5-
- kubernetes embedded-component 2f2cf3874c491fae316a4537b274f31ec899dc05 to d6f2dd28529e5ecc8cdffaf443253f74382c2b60
6-
- 12b2c093a 2025-03-12T09:01:59-04:00 UPSTREAM: <drop>: Revert "UPSTREAM: <drop>: disable ResilientWatchCacheInitialization feature"
7-
8-
- machine-config-operator embedded-component 6e460d14449088ca10549456b27d1f85cca93db8 to adafd58169f40eec1110a9fd47473457ca8e5f9d
9-
- ea829ccf 2025-03-06T12:46:29-05:00 kubelet_config_controller: Update ObservedGeneration render_controller: Make function name AreMCGeneratingSubControllersCompletedForPool explicit apihelpers: match the KubeletConfig to the Pool using MachineConfigPoolSelector
10-
- be631aca 2025-03-05T11:45:03-05:00 RHEL-79554: Consolidate OpenStack and PowerVS hostname handling into mco-hostname script
11-
12-
- oc image-amd64 6de369b1203d09db5ce6d7d9fa8ed668504ccc75 to fe18ae25a123e896fd218210073141f7f5811465
13-
- d9607d19 2025-03-11T16:12:33-04:00 OCPBUGS-23514: status: Adjust impact summary for Failing=Unknown
14-
15-
- kubernetes image-amd64 2f2cf3874c491fae316a4537b274f31ec899dc05 to d6f2dd28529e5ecc8cdffaf443253f74382c2b60
16-
- 12b2c093a 2025-03-12T09:01:59-04:00 UPSTREAM: <drop>: Revert "UPSTREAM: <drop>: disable ResilientWatchCacheInitialization feature"
17-
18-
- oc image-arm64 6de369b1203d09db5ce6d7d9fa8ed668504ccc75 to fe18ae25a123e896fd218210073141f7f5811465
19-
- d9607d19 2025-03-11T16:12:33-04:00 OCPBUGS-23514: status: Adjust impact summary for Failing=Unknown
20-
21-
- kubernetes image-arm64 2f2cf3874c491fae316a4537b274f31ec899dc05 to f4a27c46e464f735615c60fc0b067471e7073e13
22-
- 12b2c093a 2025-03-12T09:01:59-04:00 UPSTREAM: <drop>: Revert "UPSTREAM: <drop>: disable ResilientWatchCacheInitialization feature"
23-
- 40e44d8ef 2025-03-07T18:08:33+01:00 UPSTREAM: <carry>: Add volume group snapshot test driver
24-

‎scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-14-061055" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-15-105008"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-14-061055" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-17-210236"

0 commit comments

Comments
 (0)