Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2025-04-03-062919_amd64-2025-04-03_arm64-2025-04-04 #4774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 4 commits into from
Apr 7, 2025
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2025-04-03-062919_amd64-2025-04-03_arm64-2025-04-04 #4774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0520033
update last_rebase.sh
Apr 7, 2025
5cdd5c4
update changelog
Apr 7, 2025
c678a38
update manifests
Apr 7, 2025
ab02b05
update buildfiles
Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-arm64-2025-04-02-203851
OCP_VERSION := 4.14.0-0.nightly-arm64-2025-04-04-203853
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-2025-04-02-152439
OCP_VERSION := 4.14.0-0.nightly-2025-04-03-062919
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2025-04-02-203851"
"base": "4.14.0-0.nightly-arm64-2025-04-04-203853"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3f935a635587eda498952afff0d9ffa43654cd32e6d24eb62556cbe9767678",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.14.0-0.nightly-2025-04-02-152439"
"base": "4.14.0-0.nightly-2025-04-03-062919"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c08bd2d276de9ad9ae8718b4bccfda2cfe35ca68f1f0a7f433e646514ff47164",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac077cfa2520ab4df950f61960f53cccf4bef2defcc58ab7296ed2a1289810b7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2e20499ad8e2c105487bf09261d6e33ee64779080de3a7f60ee92b6d9fd9d6e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13a291fa1655c6a73b88b9a5670d749e7e254880abc3ffe704caa39ba177ae62",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf3fa2e894946617b389880713ebaa4262c63975edf77fd0fa34684c0a74a48b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d18b8443661586c4a54fcd6c06ad9481765c4aa0e1e3255f62ed76375ec509a1",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2270bf6df04fca583666b7e372e879fa24297ff7427947462839f021647f69fd",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3cf71fd62f67d4556f0ce85a423f6eef0fd2ece6d2bfc89e286804e821d0b6a",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
Expand Down
3 changes: 3 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- machine-config-operator embedded-component e999361cfc7c83c2ffe30a1b64443083da5fccf1 to 555364e98951e9e316aaf91d021b61fe17340bda
- 678b425b 2025-03-25T14:45:07-04:00 kubelet_config_controller: Update ObservedGeneration render_controller: Make function name AreMCGeneratingSubControllersCompletedForPool explicit apihelpers: match the KubeletConfig to the Pool using MachineConfigPoolSelector

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component a683453
https://github.com/openshift/etcd embedded-component 5ed5044c5661c55d297ab0348056b50969af9627
https://github.com/openshift/kubernetes embedded-component 03a907c6d182353a0e9b83a224a6f0398406f6d5
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8558e14a116804168506d06e96eac5a79913a6eb
https://github.com/openshift/machine-config-operator embedded-component e999361cfc7c83c2ffe30a1b64443083da5fccf1
https://github.com/openshift/machine-config-operator embedded-component 555364e98951e9e316aaf91d021b61fe17340bda
https://github.com/openshift/openshift-controller-manager embedded-component 6e86dee5d30921e84f557ca214022e587c824e88
https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e
https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2025-04-02-152439" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-04-02-203851"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2025-04-03-062919" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-04-04-203853"