From d01bedade74add28ab36c1ccb33f239ea2a395e6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Jul 2024 04:08:14 +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 4b4b464850..8473f6e528 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-22-164621" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-22-235508" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-23-185402" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-23-233254" From 4dc33fae05620d81ea2521ffcfe5f0301abb7925 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Jul 2024 04:08:14 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 10 ++++++++++ scripts/auto-rebase/commits.txt | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..252aaaab5c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,10 @@ +- operator-framework-olm embedded-component 28befe20a9f97db2a4a47c655b483de3197622da to f3f8de5d0caa7387630272260e9e4e0db1b8ef85 + - f3c75774 2024-07-17T10:46:15+02:00 [CARRY] Bump github.com/containers/image/v5 + - ea327068 2024-07-10T13:11:33+00:00 fix sorting unpack jobs (#3299) + +- coredns image-amd64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a to 1326282c9e158078634be4261b75ded247d233d7 + - f70cdab 2024-07-16T18:18:10+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 + +- coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a to 1326282c9e158078634be4261b75ded247d233d7 + - f70cdab 2024-07-16T18:18:10+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 3603685529..5bff705b0c 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -13,11 +13,11 @@ https://github.com/openshift/kubernetes embedded-component add48d0c4f679a95d1c06 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb https://github.com/openshift/machine-config-operator embedded-component b730129374d90da5a32235fd104fba6385f4b3a9 https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813 -https://github.com/openshift/operator-framework-olm embedded-component 28befe20a9f97db2a4a47c655b483de3197622da +https://github.com/openshift/operator-framework-olm embedded-component f3f8de5d0caa7387630272260e9e4e0db1b8ef85 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 1e41aa3e007fc60af9edfc77be1c610205943f4a -https://github.com/openshift/coredns image-amd64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a +https://github.com/openshift/coredns image-amd64 1326282c9e158078634be4261b75ded247d233d7 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 @@ -27,7 +27,7 @@ https://github.com/openshift/ovn-kubernetes image-amd64 e460a139450a9319e0501400 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 1e41aa3e007fc60af9edfc77be1c610205943f4a -https://github.com/openshift/coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a +https://github.com/openshift/coredns image-arm64 1326282c9e158078634be4261b75ded247d233d7 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 From 4f84e6558e4ef854d4bf0c9d0df9af94b84f92c8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Jul 2024 04:08:52 +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 | 6 +++--- assets/release/release-x86_64.json | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 4f16b238c7..507609c949 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:9991ee1a719ce80adfea357788ff3d54f35dbc0be92733b694e15fdffb111fb7 + digest: sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a0c2cb59ea96126544cd7b2e8004e144441e51c6590c8827d2133bfda7f101ed + digest: sha256:6ae849b54e1e3560e2a8ff5fa76cce15214c23f83aaca5f99e2332e375c97e26 - 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:a0c2cb59ea96126544cd7b2e8004e144441e51c6590c8827d2133bfda7f101ed + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ae849b54e1e3560e2a8ff5fa76cce15214c23f83aaca5f99e2332e375c97e26 - 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:9991ee1a719ce80adfea357788ff3d54f35dbc0be92733b694e15fdffb111fb7 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe 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 66419e3565..f8afd4c663 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:3f69c1fba79e6e413e299560a0d82347b545788efb620ededf90639ae0671054 + digest: sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a4c433f2292a172cacbb3e302a41c00eeb49083eb5300f5e437580bfbb829222 + digest: sha256:d00b50929f7a486fd4c91bc3c03d60e2b7e8cf9072564af5674834254115b3da - 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:a4c433f2292a172cacbb3e302a41c00eeb49083eb5300f5e437580bfbb829222 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d00b50929f7a486fd4c91bc3c03d60e2b7e8cf9072564af5674834254115b3da - 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:3f69c1fba79e6e413e299560a0d82347b545788efb620ededf90639ae0671054 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925 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 8d98265a77..53cfa87a04 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-22-235508" + "base": "4.15.0-0.nightly-arm64-2024-07-23-233254" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9991ee1a719ce80adfea357788ff3d54f35dbc0be92733b694e15fdffb111fb7", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0c2cb59ea96126544cd7b2e8004e144441e51c6590c8827d2133bfda7f101ed", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ae849b54e1e3560e2a8ff5fa76cce15214c23f83aaca5f99e2332e375c97e26", "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 65c55bb2f5..b1302c0367 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-22-164621" + "base": "4.15.0-0.nightly-2024-07-23-185402" }, "images": { - "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", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d00b50929f7a486fd4c91bc3c03d60e2b7e8cf9072564af5674834254115b3da", "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 2b57f0fb2e..328e038eb6 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,11 +1,11 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-22-235508" + "base": "4.15.0-0.nightly-arm64-2024-07-23-233254" }, "images": { "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", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c16d413ea08c1eccbdb6706ca43118de919a279ab86c66c95201883ac54e889", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:186ec95c56f6c742173523873d4f1166564b06cdd4af9dae055af1b03f4a19de", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50d1a1036769a445f1fbeecd0e3c984824ac0c5ca1e53ef4c98df9cf3693b7c4", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c056f9e26e7428580754d1a6cdbf789caa1ec7aa45a41951019656faf1ef8682", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f77ea160e7..e5642f53f0 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-22-164621" + "base": "4.15.0-0.nightly-2024-07-23-185402" }, "images": { "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", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d96a087eac8c22a30b2b39478d248f6404855e794762329539aabfb46eaeb80", "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", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", From 333a331deb028a75fec8d3bf3b652f8986a00061 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Jul 2024 04:08:52 +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 be73848060..f173359f2a 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-22-235508 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-23-233254 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 80cebaf05e..9395959ed1 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-07-22-164621 +OCP_VERSION := 4.15.0-0.nightly-2024-07-23-185402