From 908ef61dab2c1a1ce904be7bd12c032a89c59fb5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 15 Jul 2024 04:13:16 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 80bb151d0e..d3d2948977 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-11-080553" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-11-232251" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-14-093612" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-14-235456" From 7d1c0ce426af192f029600c8f19a1f5790c02008 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 15 Jul 2024 04:13:17 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 29 +++++++++++++++++++++++------ scripts/auto-rebase/commits.txt | 10 +++++----- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 59002f1245..855b64a1f0 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,8 +1,25 @@ -- cluster-ingress-operator embedded-component 6d63904f882d23871e332e93dfb740b05aca7097 to 28bcd5f6f2ce8496e1967860ee5646f0f5c373b3 - - 03299df 2024-07-09T11:10:04+02:00 OCPBUGS-28673: Add e2e test for connect timeout - - ff0d10b 2024-07-09T11:10:04+02:00 OCPBUGS-28673: Implement connect timeout tuning option - - 188bd86 2024-07-09T11:09:57+02:00 OCPBUGS-28673: Bump API to get connect timeout tuning option +- cluster-ingress-operator embedded-component 28bcd5f6f2ce8496e1967860ee5646f0f5c373b3 to 0928822bf67774af6798b218bff54ff5d14594cd + - 357c1a7 2024-07-02T20:23:53-04:00 Delete & recreate canary route to clear spec.host + - a1d3934 2024-07-02T20:23:53-04:00 Allow operator to update Route spec.subdomain -- machine-config-operator embedded-component 0b30396ac09af31e99f99a75e8ad0ed26d4fff47 to e45c36964262382c4d320317ea3efe0cca56dce4 - - a9648555 2024-07-09T17:22:42+00:00 daemon: Handle correctly OS Version for 4.1 and 4.2 bootimages +- machine-config-operator embedded-component e45c36964262382c4d320317ea3efe0cca56dce4 to cee5dd7922f666583d92128b72fe7adac77c04ae + - 11e8f78d 2024-06-10T13:47:43+00:00 OCPBUGS-33357: Check both ready and health ingress endpoints + - a2db2f2f 2024-03-04T17:15:20+01:00 OCPBUGS-22324: Fix wait-for-br-ex-up enablement logic + - acf9f5d0 2024-03-04T17:15:19+01:00 Wait for br-ex up event before node-valid-hostname + - 2e12a64a 2024-03-04T17:15:18+01:00 OCPBUGS-27162: Add dependency on crio-wipe to resolv-prepender + - 4efd96aa 2024-03-04T17:15:17+01:00 OCPBUGS-29732: Always touch resolv-prepender file at end of script + - cb26598a 2024-03-04T17:15:16+01:00 OPNET-469: Apply new DNS configuration only if changed + - 0740a606 2024-03-04T17:15:15+01:00 OCPBUGS-29624: Restart resolv-prepender on failure + - d7d1c96b 2024-03-04T17:15:14+01:00 OPNET-355: Use NM's dns-change event for resolv.conf + +- operator-framework-olm embedded-component 89cf3705e28c59cc9228f606de8b555771eb474a to 28befe20a9f97db2a4a47c655b483de3197622da + - 1849397f 2024-07-10T10:16:43-04:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) + - 8c4e7516 2024-07-02T10:50:25-07:00 Unpack Job Creation Failure Test (#3297) + - 2069e356 2024-07-02T10:50:25-07:00 Fix: Ensure jobs without unpack label are considered (#3262) + +- oc image-amd64 44edfb50c55756395abc844fc4f7edb19dfefa50 to 1e41aa3e007fc60af9edfc77be1c610205943f4a + - f976e195 2024-07-05T15:01:09+01:00 debug: set required-scc annotation to privileged for node debug pods + +- oc image-arm64 44edfb50c55756395abc844fc4f7edb19dfefa50 to 1e41aa3e007fc60af9edfc77be1c610205943f4a + - f976e195 2024-07-05T15:01:09+01:00 debug: set required-scc annotation to privileged for node debug pods diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index de132163de..3bf07030ae 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,6 +1,6 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 65dbb12b710b7126f662f5f7f2d8272f9f6868cc https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 -https://github.com/openshift/cluster-ingress-operator embedded-component 28bcd5f6f2ce8496e1967860ee5646f0f5c373b3 +https://github.com/openshift/cluster-ingress-operator embedded-component 0928822bf67774af6798b218bff54ff5d14594cd https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 62a9eff944bfbdc1b4e79332fe4d8ae2df053c8c https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796 @@ -11,12 +11,12 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd https://github.com/openshift/kubernetes embedded-component add48d0c4f679a95d1c06d80a00be54644bbdeaf https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb -https://github.com/openshift/machine-config-operator embedded-component e45c36964262382c4d320317ea3efe0cca56dce4 +https://github.com/openshift/machine-config-operator embedded-component cee5dd7922f666583d92128b72fe7adac77c04ae https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813 -https://github.com/openshift/operator-framework-olm embedded-component 89cf3705e28c59cc9228f606de8b555771eb474a +https://github.com/openshift/operator-framework-olm embedded-component 28befe20a9f97db2a4a47c655b483de3197622da https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 -https://github.com/openshift/oc image-amd64 44edfb50c55756395abc844fc4f7edb19dfefa50 +https://github.com/openshift/oc image-amd64 1e41aa3e007fc60af9edfc77be1c610205943f4a https://github.com/openshift/coredns image-amd64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f https://github.com/openshift/ovn-kubernetes image-amd64 e460a139450a9319e05014005738531a12016bd2 https://github.com/openshift/kubernetes image-amd64 add48d0c4f679a95d1c06d80a00be54644bbdeaf https://github.com/openshift/service-ca-operator image-amd64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 -https://github.com/openshift/oc image-arm64 44edfb50c55756395abc844fc4f7edb19dfefa50 +https://github.com/openshift/oc image-arm64 1e41aa3e007fc60af9edfc77be1c610205943f4a https://github.com/openshift/coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 From e07da7724e7d3a0a3435de52fbb8be78554bdc2d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 15 Jul 2024 04:13:54 +0000 Subject: [PATCH 3/4] update manifests --- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index b08269a89b..f3b6f60bea 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:80627a645ec00d80b5c3c1844fd7e6c6dd8ed833c077adeab93c208fbc033189 + digest: sha256:c873743346f1f8c4da05c3a01d34f2c7c123949ae27467bd18a7d60afe998b67 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:aa569f7d081e2966e59663404d73017096fede0f276460861828897cbff34ad9 + digest: sha256:c7a1b19216bf3f228a442a60f5a610e3ab03fd7aaf9825d7f91c39282111c0de - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:50d1a1036769a445f1fbeecd0e3c984824ac0c5ca1e53ef4c98df9cf3693b7c4 @@ -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:aa569f7d081e2966e59663404d73017096fede0f276460861828897cbff34ad9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7a1b19216bf3f228a442a60f5a610e3ab03fd7aaf9825d7f91c39282111c0de - 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:80627a645ec00d80b5c3c1844fd7e6c6dd8ed833c077adeab93c208fbc033189 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c873743346f1f8c4da05c3a01d34f2c7c123949ae27467bd18a7d60afe998b67 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index c0f7acea27..66419e3565 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:080c367ed98097189adff01272e2a9a7ab3d68b74a80318ddfa18608f046abe3 + digest: sha256:3f69c1fba79e6e413e299560a0d82347b545788efb620ededf90639ae0671054 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6c3f49444d418a33128125a509a3ba91f6afe35e6c1385dd5738d10208556a58 + digest: sha256:a4c433f2292a172cacbb3e302a41c00eeb49083eb5300f5e437580bfbb829222 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc @@ -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:6c3f49444d418a33128125a509a3ba91f6afe35e6c1385dd5738d10208556a58 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4c433f2292a172cacbb3e302a41c00eeb49083eb5300f5e437580bfbb829222 - 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:080c367ed98097189adff01272e2a9a7ab3d68b74a80318ddfa18608f046abe3 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f69c1fba79e6e413e299560a0d82347b545788efb620ededf90639ae0671054 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 1054200359..b4bdbb068b 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-11-232251" + "base": "4.15.0-0.nightly-arm64-2024-07-14-235456" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80627a645ec00d80b5c3c1844fd7e6c6dd8ed833c077adeab93c208fbc033189", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa569f7d081e2966e59663404d73017096fede0f276460861828897cbff34ad9", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c873743346f1f8c4da05c3a01d34f2c7c123949ae27467bd18a7d60afe998b67", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7a1b19216bf3f228a442a60f5a610e3ab03fd7aaf9825d7f91c39282111c0de", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50d1a1036769a445f1fbeecd0e3c984824ac0c5ca1e53ef4c98df9cf3693b7c4" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 1135fcd535..e78e34d469 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-11-080553" + "base": "4.15.0-0.nightly-2024-07-14-093612" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:080c367ed98097189adff01272e2a9a7ab3d68b74a80318ddfa18608f046abe3", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c3f49444d418a33128125a509a3ba91f6afe35e6c1385dd5738d10208556a58", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f69c1fba79e6e413e299560a0d82347b545788efb620ededf90639ae0671054", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4c433f2292a172cacbb3e302a41c00eeb49083eb5300f5e437580bfbb829222", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 5d11aefbcf..81c0b1edcf 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-11-232251" + "base": "4.15.0-0.nightly-arm64-2024-07-14-235456" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75b3d2698e118c5cbc55a997a55c03755db3e67e1106a7a7cf235b5dd8e6d511", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6c7447aea28bc530d5688e0b61bffa3ab626f10f850fef7a495ddd6583047e", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9f8482886c0000dc0084a103c200083eb22b72baa71a3b3a6e9237873a9ab3e", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed80264aec44ba73c2a9cc18f564fae22fb35ef2acb63d10d6ac60a8ab8462de", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50d1a1036769a445f1fbeecd0e3c984824ac0c5ca1e53ef4c98df9cf3693b7c4", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 09d89fb37d..613c1db68f 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-11-080553" + "base": "4.15.0-0.nightly-2024-07-14-093612" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dfc4ecb963ff42e8da864e9821b6afc8790e3d566b2dfaae1299063a6cea648", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b6e2497941cc22e6539224697c1e99eaa012d3dcdc96456800dd89f470bd86", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddf3ba9c13bde66e020550989d333bb23616fa9832253228a53760faa1f9c09a", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3d68f7a4936f8dfaa97c1b6e38d454d822fbfca0048df643db13c84653b359b", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc", From cbc58629f24fc7a08f1789e50bb7b8530263a57b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 15 Jul 2024 04:14:07 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 6c779fc997..9df16861f0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-11-232251 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-14-235456 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 7b49496b07..975929bb87 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-07-11-080553 +OCP_VERSION := 4.15.0-0.nightly-2024-07-14-093612