Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2023-11-28-181957_amd64-2023-11-28_arm64-2023-11-28 #2666

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
Nov 29, 2023
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2023-11-28-181957_amd64-2023-11-28_arm64-2023-11-28 #2666

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
fd2e5a2
update last_rebase.sh
Nov 29, 2023
99f6460
update changelog
Nov 29, 2023
b3fe25d
update manifests
Nov 29, 2023
3550089
update buildfiles
Nov 29, 2023
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-2023-11-27-001137
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-28-194629
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-2023-11-25-091215
OCP_VERSION := 4.14.0-0.nightly-2023-11-28-181957
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-2023-11-27-001137"
"base": "4.14.0-0.nightly-arm64-2023-11-28-194629"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c86512dda27777916d9ede64ddc1d0ca64e246ad63e190093c604fd4da2aa8ef",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.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-2023-11-25-091215"
"base": "4.14.0-0.nightly-2023-11-28-181957"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1cdb58a08536687708c22cbffed5a0524a32fabe593d9af074e0aee4adf869d",
Expand Down
8 changes: 2 additions & 6 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
- cluster-csi-snapshot-controller-operator embedded-component 5d8bae88fdceefd3cc6e9befe3da641839403d9c to 73dc400fbbbd7dc131c98199e3b5c5cac957ee83
- fa7d1b2 2023-11-08T13:24:44-05:00 CVE-2023-44487: bump github.com/openshift/library-go to release-4.14

- cluster-network-operator embedded-component 75a0a6c043df981dcf8e23e78b5254d3a68bd5ee to 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc
- 67929e9 2023-10-25T01:48:51+00:00 OCPBUGS-19370: Added HCP labels to CNO pods
- 599c168 2023-10-23T22:10:32+00:00 hypershift: adjust backoff on infrastructure name retry
- cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e to 77e0d6a07854665a7e9c8458db67e25d02da934a
- 90449dd 2023-11-21T12:13:08+03:00 Remove blockage of ConfigObserver by build informer has synced flag

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 @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-kube-apiserver-operator embedded-component
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component bc9ef03545147204bf6692d02db8e167a023ff44
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 6e43991c07e36757a00c4ec26888e040917cf2df
https://github.com/openshift/cluster-network-operator embedded-component 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 77e0d6a07854665a7e9c8458db67e25d02da934a
https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59
https://github.com/openshift/csi-external-snapshotter embedded-component 0bf9276611e57cb87a05576c974fea1c38e3eb96
https://github.com/openshift/etcd embedded-component ba21c5bca59afce3800577c1cbb073c5556ca990
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-2023-11-25-091215" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-11-27-001137"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-11-28-181957" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-11-28-194629"