Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-27-153906_amd64-2024-07-27_arm64-2024-07-27 #3685

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
Jul 29, 2024
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-27-153906_amd64-2024-07-27_arm64-2024-07-27 #3685

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
9637c76
update last_rebase.sh
Jul 28, 2024
a76b005
update changelog
Jul 28, 2024
02ac9d4
update manifests
Jul 28, 2024
b31aabf
update buildfiles
Jul 28, 2024
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.16.0-0.nightly-arm64-2024-07-22-205134
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-27-225759
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.16.0-0.nightly-2024-07-22-113430
OCP_VERSION := 4.16.0-0.nightly-2024-07-27-153906
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-07-22-205134"
"base": "4.16.0-0.nightly-arm64-2024-07-27-225759"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2163937c0603665d84995a0cbce385fc4378ed0f928ffe25601526872692cdf4",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-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.16.0-0.nightly-2024-07-22-113430"
"base": "4.16.0-0.nightly-2024-07-27-153906"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:897f93d7062d3adcebaffdb4e11f7873d87fbb3a9ade8cc613e3a3c3926f5ccb",
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6952ece64fc9d4f3fd58044f26efa9d41bef2ac2e1fc4490684297c64073c086
digest: sha256:2d378407ecbf792f1a5c0e70f9f4aff6c503af46c1ceff862bb10d7021c599c3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:846f8857bb83504031bcbaf9a66debc5c705c0f59df4fe8a0ae8af5a52f005dc
digest: sha256:bca4c965e66748109b9bb5e2e80bae657fa79a3e54dd85626b90bf4ba0784502
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:846f8857bb83504031bcbaf9a66debc5c705c0f59df4fe8a0ae8af5a52f005dc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bca4c965e66748109b9bb5e2e80bae657fa79a3e54dd85626b90bf4ba0784502
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6952ece64fc9d4f3fd58044f26efa9d41bef2ac2e1fc4490684297c64073c086
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d378407ecbf792f1a5c0e70f9f4aff6c503af46c1ceff862bb10d7021c599c3
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7d20f27600b52cf83acbb131accdcdb7c451505f621a35e0d7aa50d992e1928d
digest: sha256:abbcc149f2c5e5e37c5e639ac96e82a30f9fc17802b10140b5358f8e59b13a40
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f8fcb9d34f9fdaff63932f5aa6f5d2f713678f1a9126fcf0266951a92864bb71
digest: sha256:9cb17ddb221a3eacb2b1367c83e2ed35e1cd9402cdece23e8e2c9131f81e0ce8
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8fcb9d34f9fdaff63932f5aa6f5d2f713678f1a9126fcf0266951a92864bb71
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cb17ddb221a3eacb2b1367c83e2ed35e1cd9402cdece23e8e2c9131f81e0ce8
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d20f27600b52cf83acbb131accdcdb7c451505f621a35e0d7aa50d992e1928d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abbcc149f2c5e5e37c5e639ac96e82a30f9fc17802b10140b5358f8e59b13a40
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-07-22-205134"
"base": "4.16.0-0.nightly-arm64-2024-07-27-225759"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6952ece64fc9d4f3fd58044f26efa9d41bef2ac2e1fc4490684297c64073c086",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:846f8857bb83504031bcbaf9a66debc5c705c0f59df4fe8a0ae8af5a52f005dc",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d378407ecbf792f1a5c0e70f9f4aff6c503af46c1ceff862bb10d7021c599c3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bca4c965e66748109b9bb5e2e80bae657fa79a3e54dd85626b90bf4ba0784502",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-07-22-113430"
"base": "4.16.0-0.nightly-2024-07-27-153906"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d20f27600b52cf83acbb131accdcdb7c451505f621a35e0d7aa50d992e1928d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8fcb9d34f9fdaff63932f5aa6f5d2f713678f1a9126fcf0266951a92864bb71",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abbcc149f2c5e5e37c5e639ac96e82a30f9fc17802b10140b5358f8e59b13a40",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cb17ddb221a3eacb2b1367c83e2ed35e1cd9402cdece23e8e2c9131f81e0ce8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-07-22-205134"
"base": "4.16.0-0.nightly-arm64-2024-07-27-225759"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c918e69bc4561451d56b9936ddb472fc2bac107f16d3de0b31f2c72caa776d96",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:120c6288a3bf87628dd545e3d92835dcfd3ca9496d2a040151f9b9cd436e22fd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c228d04f2e4bc9f6d1713b69da37ba154e40f98ad6b9957c016a539bf93bfa6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc6b85c73f5906ea0cc7d63919ba2fb61b5b93452e5d1f26da87847bcae83cd2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdd9d09fae00ab53a545ca739d6999a7550293da6b62ba2c0776e7e56c76bba2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:271d8843a5c3b6f36a80b69ecf8073b68455ca30a108689caf03f7e7b6011e47",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cded20c4ee55460943b0da062ba4550d44dcca449778ab7880445d27af2daf17",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
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.16.0-0.nightly-2024-07-22-113430"
"base": "4.16.0-0.nightly-2024-07-27-153906"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbb9aef83ccbad35b4c6001d1f0d9e7749e15fe1c6445502a65b3ed9c844c7b4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e46bf4c5952793b5bd9aee06280e57eb07a61cd6be3dc411c4c2242e62dd151",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37b7a73669052d17e6daaf245cc3490e0faabaff994ef075682dee6b79d5c530",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:099b9026285b78d6ca6d79992251dc8f3d4d6ce31232b0b1e90e34a99b55707e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e155c33835af2b06109c38bbc9c58499757ceee5a0af5c3ec1b3b245022847f0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e4bf03c5f9b61c47711e488588cd3e04cae1d534157928af8f648906a006b0e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f13c2f02c89a76224e65143c61a65808c9a83cb5e7a60ec402824ad35e8f0067",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
23 changes: 23 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,23 @@
- cluster-kube-apiserver-operator embedded-component 0afad8a00186e1e7a2712e9addf026e17b8cd950 to de2f2ac2fc9a811bd2b1db4f912c5a0092bfc3d0
- 69ea72a 2024-07-22T12:43:20+00:00 p/o/podsecurityreadinesscontroller: add disabled syncer
- 3c9753a 2024-07-22T12:43:20+00:00 p/o/psreadinesscontroller: make ctrl owner aware
- 05cca26 2024-07-22T12:43:20+00:00 p/o/psreadinesscontroller: minor refactoring

- machine-config-operator embedded-component d70a17fc8fee26d27c0624522f000504838f4b22 to 6c5920917486dc9ff7fb7600e35211ace02f05cb
- a2da3240 2024-07-23T10:25:18-04:00 controller: add annotation filter for node drains
- 5d965f5e 2024-07-23T13:03:03+00:00 add node ready check in getAllCandidateMachines
- 842b2027 2024-07-22T15:37:38-04:00 manifests: add vap defaults

- operator-framework-olm embedded-component 1551101943313e3546cba7d9bc78effc79b40a8e to a897b786370bbb7d3f9cc2f523aa4c5e5c9fcd55
- 27ccca42 2024-07-16T09:09:29+02:00 mark flaky test as flaky (#3340)
- 9c5343ff 2024-07-16T09:09:29+02:00 [CARRY] add output-dir to E2E_GINKGO_OPTS
- aedde0e9 2024-07-16T09:09:29+02:00 [CARRY] add junit report
- a27fb655 2024-07-16T09:09:29+02:00 mark flaky tests (#3333)
- 22a76ede 2024-07-16T09:09:29+02:00 update ginkgo opts (#3337)

- ovn-kubernetes image-amd64 7f412836bd26c3d6e9735552a7fd615e7e7e9695 to 2dbb7fa6ab109ebd440a35eda9d4a7c14ca027e9
- aab07b8d 2024-07-05T09:52:26+02:00 ovspinning: Set affinity of each thread

- ovn-kubernetes image-arm64 7f412836bd26c3d6e9735552a7fd615e7e7e9695 to 2dbb7fa6ab109ebd440a35eda9d4a7c14ca027e9
- aab07b8d 2024-07-05T09:52:26+02:00 ovspinning: Set affinity of each thread

10 changes: 5 additions & 5 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 439826e1a723c094717877db0f2ca1848d0fb10a
https://github.com/openshift/cluster-dns-operator embedded-component a14431f277364605ede8e95530453c5fb7267e33
https://github.com/openshift/cluster-ingress-operator embedded-component af5d3f6c171354c387e0cfc901110a7211715e9b
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 0afad8a00186e1e7a2712e9addf026e17b8cd950
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component de2f2ac2fc9a811bd2b1db4f912c5a0092bfc3d0
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0338b3be6912024d03def2c26f0fa10218fc2c25
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6
https://github.com/openshift/cluster-network-operator embedded-component dc0ef57c8512a150435226f5774a0f2263b0080b
Expand All @@ -11,9 +11,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37
https://github.com/openshift/etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305
https://github.com/openshift/kubernetes embedded-component aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component d70a17fc8fee26d27c0624522f000504838f4b22
https://github.com/openshift/machine-config-operator embedded-component 6c5920917486dc9ff7fb7600e35211ace02f05cb
https://github.com/openshift/openshift-controller-manager embedded-component f0536caff57932e0b5fb88987477f4978463574a
https://github.com/openshift/operator-framework-olm embedded-component 1551101943313e3546cba7d9bc78effc79b40a8e
https://github.com/openshift/operator-framework-olm embedded-component a897b786370bbb7d3f9cc2f523aa4c5e5c9fcd55
https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6
https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-amd64 ada2fa874dc7dc175da036dae67e8d7a61a27291
Expand All @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415
https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6
https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-amd64 7f412836bd26c3d6e9735552a7fd615e7e7e9695
https://github.com/openshift/ovn-kubernetes image-amd64 2dbb7fa6ab109ebd440a35eda9d4a7c14ca027e9
https://github.com/openshift/kubernetes image-amd64 aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-arm64 ada2fa874dc7dc175da036dae67e8d7a61a27291
Expand All @@ -33,6 +33,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415
https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6
https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-arm64 7f412836bd26c3d6e9735552a7fd615e7e7e9695
https://github.com/openshift/ovn-kubernetes image-arm64 2dbb7fa6ab109ebd440a35eda9d4a7c14ca027e9
https://github.com/openshift/kubernetes image-arm64 aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac
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.16.0-0.nightly-2024-07-22-113430" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-22-205134"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-07-27-153906" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-27-225759"