From f32d41817818bb2367c2d43419963eb298bfe65c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Jan 2025 04:22:39 +0000 Subject: [PATCH 1/5] 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 42a0a4e0d1..68cea6a4a5 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.16.0-0.nightly-2025-01-22-190903" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-01-22-221630" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2025-01-26-043131" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-01-26-043132" From 61465178596fe1eb151fa3477df270fe95129be1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Jan 2025 04:22:39 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 50 ++++--------------------------- scripts/auto-rebase/commits.txt | 4 +-- 2 files changed, 7 insertions(+), 47 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 2791cc3251..8927e03a50 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,47 +1,7 @@ -- kubernetes embedded-component 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca to ef2a55c520f6a4c95996ff54c41fb58959750306 - - 699b05928 2024-12-13T13:54:28+00:00 UPSTREAM: 129011: skip TestCreateBlobDisk test - - 8ca52ceff 2024-12-10T13:58:07+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 4cbf88203 2024-12-10T13:43:03+00:00 UPSTREAM: : manually resolve conflicts - - 960a2f019 2024-11-20T13:40:02+00:00 Release commit for Kubernetes v1.29.11 - - 99b90640b 2024-11-07T10:51:24+00:00 Build etcd image v3.5.16 - - 7aced6f0c 2024-11-07T09:41:34+00:00 Update etcd from v3.5.15 to v3.5.16 - - 994aaf907 2024-10-31T09:05:29+01:00 server/config: assing system:apiserver user to system:authenticated group - - 69066c22e 2024-10-30T15:39:38+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. - - 0fadafe69 2024-10-22T20:59:52+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.10 - - f2d5b1d26 2024-10-12T11:17:54+08:00 tests for nodes with different nodeName and name - - c4a818406 2024-10-12T10:33:21+08:00 manually revert #109877 +- cluster-openshift-controller-manager-operator embedded-component 2280f54414cf403aed0a02b3fdb86ee6bf672410 to 2ed3cf9965f8e6832cffde84f3de2fe210b79b49 + - 66d1396 2025-01-21T11:11:22+00:00 OCPBUGS-48657: Add new team members to owners file -- operator-framework-olm embedded-component 32cbf3f7b400d89e131ac00713cd426afd0fcce5 to 4ff31a477af44f7804c188fbd1946b9b239ab3fd - - f0b6089b 2025-01-21T08:41:40+01:00 [CARRY] address lint issues in namespace labeler plugin - - 1e2919e2 2025-01-21T08:41:32+01:00 [CARRY] fixup ns labeler plugin - - 231e3e58 2025-01-21T08:41:22+01:00 :bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483) - - 1fcca4a3 2025-01-20T11:21:26+01:00 bump golang.org/x/net to 0.34.0 (#3485) - - c5af7203 2025-01-20T11:20:49+01:00 Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1527) - - fbd4cea9 2025-01-20T10:38:09+01:00 bump golang.org/x/net to 0.34.0 (#387) - -- kubernetes image-amd64 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca to ef2a55c520f6a4c95996ff54c41fb58959750306 - - 699b05928 2024-12-13T13:54:28+00:00 UPSTREAM: 129011: skip TestCreateBlobDisk test - - 8ca52ceff 2024-12-10T13:58:07+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 4cbf88203 2024-12-10T13:43:03+00:00 UPSTREAM: : manually resolve conflicts - - 960a2f019 2024-11-20T13:40:02+00:00 Release commit for Kubernetes v1.29.11 - - 99b90640b 2024-11-07T10:51:24+00:00 Build etcd image v3.5.16 - - 7aced6f0c 2024-11-07T09:41:34+00:00 Update etcd from v3.5.15 to v3.5.16 - - 994aaf907 2024-10-31T09:05:29+01:00 server/config: assing system:apiserver user to system:authenticated group - - 69066c22e 2024-10-30T15:39:38+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. - - 0fadafe69 2024-10-22T20:59:52+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.10 - - f2d5b1d26 2024-10-12T11:17:54+08:00 tests for nodes with different nodeName and name - - c4a818406 2024-10-12T10:33:21+08:00 manually revert #109877 - -- kubernetes image-arm64 67d33871ba24f0e8c4d2d201a4c4decaabfa1eca to ef2a55c520f6a4c95996ff54c41fb58959750306 - - 699b05928 2024-12-13T13:54:28+00:00 UPSTREAM: 129011: skip TestCreateBlobDisk test - - 8ca52ceff 2024-12-10T13:58:07+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 4cbf88203 2024-12-10T13:43:03+00:00 UPSTREAM: : manually resolve conflicts - - 960a2f019 2024-11-20T13:40:02+00:00 Release commit for Kubernetes v1.29.11 - - 99b90640b 2024-11-07T10:51:24+00:00 Build etcd image v3.5.16 - - 7aced6f0c 2024-11-07T09:41:34+00:00 Update etcd from v3.5.15 to v3.5.16 - - 994aaf907 2024-10-31T09:05:29+01:00 server/config: assing system:apiserver user to system:authenticated group - - 69066c22e 2024-10-30T15:39:38+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it. - - 0fadafe69 2024-10-22T20:59:52+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.10 - - f2d5b1d26 2024-10-12T11:17:54+08:00 tests for nodes with different nodeName and name - - c4a818406 2024-10-12T10:33:21+08:00 manually revert #109877 +- operator-framework-olm embedded-component 4ff31a477af44f7804c188fbd1946b9b239ab3fd to 48d68f52674ad5afb2d40d032abb0892a5dafee6 + - 88a1bbf9 2025-01-22T11:14:31+01:00 sort lists of identifiers and conflict messages to reduce SAT solver non-determinism (#3491) + - 6bbfb0a1 2025-01-22T11:14:25+01:00 :bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490) diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 499fd86706..ba83a94028 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -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 0338b3be6912024d03def2c26f0fa10218fc2c25 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6 https://github.com/openshift/cluster-network-operator embedded-component b5eb4ae75b428e748cbf6a7e6b68da2b4687cbf3 -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2280f54414cf403aed0a02b3fdb86ee6bf672410 +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2ed3cf9965f8e6832cffde84f3de2fe210b79b49 https://github.com/openshift/cluster-policy-controller embedded-component eaea543f4c845a7b65705f12e162cc121bb12f88 https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/etcd embedded-component e7911c0d19925c0a67328052a8580a80fb40cb5b @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component ef2a55c520f6a4c95996f https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51 https://github.com/openshift/machine-config-operator embedded-component adc9ad759067e02cf643ec4beaf731d5245bbfe3 https://github.com/openshift/openshift-controller-manager embedded-component bcf6e58edbcc8e7ce6f7e4d0658635688e0fc114 -https://github.com/openshift/operator-framework-olm embedded-component 4ff31a477af44f7804c188fbd1946b9b239ab3fd +https://github.com/openshift/operator-framework-olm embedded-component 48d68f52674ad5afb2d40d032abb0892a5dafee6 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 cf533b548154f7f2e828a44864477bbbb881692d From 62a53ca972f6de5fdf634594b5d82e79e36c939d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Jan 2025 04:23:17 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 369b4d4d9e..29577b6576 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f46e78078ce043688e3762a4985101a751551a7dcf99e8eed2106537e6e5892" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57574e9a41103d84d713251cfd189a8027060c3fdd2a8cf31438acba24c33095" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index d961ce70f4..50ac2b2e16 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b17a3779457df48bcd585a00ed7fcb01710cabc44f7f38be3d7399cb22d33ab" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1e1bfd4aea4bd5769152d56db6ecc4fb312c89090c3024578fc7c76ab423999" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 7d0d2e9f00024176d6da799eb95cb98798cf07d7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Jan 2025 04:23:19 +0000 Subject: [PATCH 4/5] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 ++--- .../multus/release-multus-x86_64.json | 6 ++--- .../kustomization.aarch64.yaml | 10 ++++----- .../kustomization.x86_64.yaml | 10 ++++----- .../release-olm-aarch64.json | 8 +++---- .../release-olm-x86_64.json | 8 +++---- assets/release/release-aarch64.json | 22 +++++++++---------- assets/release/release-x86_64.json | 22 +++++++++---------- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 916bf1fcec..4139979bc4 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9f3c3a60e78bd2dcf3e2a38c5f685565dc54d6f7ca719cb75dde0e36637884eb + digest: sha256:050e7e70a606bd0188e6f9dcda0b45cbfec33555834e33440127bd5d03a2f276 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a3dd8b203ccd4e9e53e1b1231807607dbc7c4bc2885650d995a2d0d22df6d1d9 + digest: sha256:119360fae82ceff2c9f664ffa747aba6b2b320e51b4bd1bb2c262ce413ed0be6 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 9890e0a648..239e9d1b58 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:206b23c9a596391210050367b64d28085421f3889b53792082e42890526f14f7 + digest: sha256:733362b95b97f1d40bb24f1395f49342d8afdd8890e734b5759081267ed1f689 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b0efc598d2b6c8ce93c1dc6ee0634e32ed8bde90ccc28bf061c4bd02835f07d2 + digest: sha256:cfb41b9109877b0d93fbab9ae237ae0b8936240c9e2f2ef05ed8a22cf7713191 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 668a3e2b48..23de6a1425 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-01-22-221630" + "base": "4.16.0-0.nightly-arm64-2025-01-26-043132" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f3c3a60e78bd2dcf3e2a38c5f685565dc54d6f7ca719cb75dde0e36637884eb", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3dd8b203ccd4e9e53e1b1231807607dbc7c4bc2885650d995a2d0d22df6d1d9" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:050e7e70a606bd0188e6f9dcda0b45cbfec33555834e33440127bd5d03a2f276", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:119360fae82ceff2c9f664ffa747aba6b2b320e51b4bd1bb2c262ce413ed0be6" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index e897543d84..335be3707d 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-2025-01-22-190903" + "base": "4.16.0-0.nightly-2025-01-26-043131" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:206b23c9a596391210050367b64d28085421f3889b53792082e42890526f14f7", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0efc598d2b6c8ce93c1dc6ee0634e32ed8bde90ccc28bf061c4bd02835f07d2" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:733362b95b97f1d40bb24f1395f49342d8afdd8890e734b5759081267ed1f689", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfb41b9109877b0d93fbab9ae237ae0b8936240c9e2f2ef05ed8a22cf7713191" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 26e2d1e5be..82cd35d678 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:da8be02edd6e8510e685a6d752d0c89600e2f5c7ca336521ac6769ec89559674 + digest: sha256:0cd8b923ddc9e584e3704229528a6dcbcbb62a4e93e2d61472dab150c3b11852 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:43520b9f8d1b7c511033f5aa79e876a43df07b0ff5c089027a3d69af8a08d976 + digest: sha256:75d96db37658a478500780d3fe85f8b209fe49e708cfdf9bf6d1cff5ba80a8dc - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bdc2ae727e369092a86e1d70459fa23e251aedcbb5f7e560cd0ef3c7c5520562 + digest: sha256:eeb681df8e76f687e3b81fa6b590260beb7bc4ec583efc45aaae1664c668b91b patches: - patch: |- @@ -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:43520b9f8d1b7c511033f5aa79e876a43df07b0ff5c089027a3d69af8a08d976 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75d96db37658a478500780d3fe85f8b209fe49e708cfdf9bf6d1cff5ba80a8dc - 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:da8be02edd6e8510e685a6d752d0c89600e2f5c7ca336521ac6769ec89559674 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cd8b923ddc9e584e3704229528a6dcbcbb62a4e93e2d61472dab150c3b11852 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 fb1d384290..8c694c7e29 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3c4ea9e86a1a511633d154012b39e444df67cc2259ac6c22acfec2cb853b5f4d + digest: sha256:d460ec0b3508462002ec9b9cb167a6b7f458da0db3246bdf5fecb807149ef621 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d7785691d67e492b5bd6562eb1b65e431135bb0d3351ef1637e2b9f1310322ff + digest: sha256:385759a2447a4eb6cb59fc3fb37b0f65e38b6186d67aa1c3d2a59717d5af24a3 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:336d5f09ef32e91f592ad178fae9dfdc8e0292d3802aa4f6ecc5488623527fd8 + digest: sha256:5132ebcc968e354969cbbf0133d7e7a5a97b752e0045bda125d22309c2b60c6f patches: - patch: |- @@ -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:d7785691d67e492b5bd6562eb1b65e431135bb0d3351ef1637e2b9f1310322ff + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:385759a2447a4eb6cb59fc3fb37b0f65e38b6186d67aa1c3d2a59717d5af24a3 - 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:3c4ea9e86a1a511633d154012b39e444df67cc2259ac6c22acfec2cb853b5f4d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d460ec0b3508462002ec9b9cb167a6b7f458da0db3246bdf5fecb807149ef621 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 a723f28b89..31f2521819 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.16.0-0.nightly-arm64-2025-01-22-221630" + "base": "4.16.0-0.nightly-arm64-2025-01-26-043132" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da8be02edd6e8510e685a6d752d0c89600e2f5c7ca336521ac6769ec89559674", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43520b9f8d1b7c511033f5aa79e876a43df07b0ff5c089027a3d69af8a08d976", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdc2ae727e369092a86e1d70459fa23e251aedcbb5f7e560cd0ef3c7c5520562" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cd8b923ddc9e584e3704229528a6dcbcbb62a4e93e2d61472dab150c3b11852", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75d96db37658a478500780d3fe85f8b209fe49e708cfdf9bf6d1cff5ba80a8dc", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eeb681df8e76f687e3b81fa6b590260beb7bc4ec583efc45aaae1664c668b91b" } } 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 66525e9e7c..f1f78ef7fe 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.16.0-0.nightly-2025-01-22-190903" + "base": "4.16.0-0.nightly-2025-01-26-043131" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c4ea9e86a1a511633d154012b39e444df67cc2259ac6c22acfec2cb853b5f4d", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7785691d67e492b5bd6562eb1b65e431135bb0d3351ef1637e2b9f1310322ff", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336d5f09ef32e91f592ad178fae9dfdc8e0292d3802aa4f6ecc5488623527fd8" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d460ec0b3508462002ec9b9cb167a6b7f458da0db3246bdf5fecb807149ef621", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:385759a2447a4eb6cb59fc3fb37b0f65e38b6186d67aa1c3d2a59717d5af24a3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5132ebcc968e354969cbbf0133d7e7a5a97b752e0045bda125d22309c2b60c6f" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f0beff191b..9630d7bba2 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2025-01-22-221630" + "base": "4.16.0-0.nightly-arm64-2025-01-26-043132" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4e259d678fe17aa43da2afce590ae8168b1bb9e517c3d371f863464bcc68e55", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11ab264fa68b91be4cd81d665814544aec3873884acf8b3082c107cf7c92d5ad", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a46359929f37c3cb035fe2e4845fa669571a79dd8b81e3eec759520558b9929", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdc2ae727e369092a86e1d70459fa23e251aedcbb5f7e560cd0ef3c7c5520562", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2402140741db6d8825349568c462a5e51f6908a1e9657ee9917ee8642c110708", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9298dd7683f08be8a1e116857ef52b4d1b48a42ab7ddd49cc2bb2ad42c5d17f", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e1eb5c178b58b42e1aec1fea456004ccd4251ccb804747cbdd0552856ae1ce5", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eeb681df8e76f687e3b81fa6b590260beb7bc4ec583efc45aaae1664c668b91b", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55a8b1d26b1ebbfa3f0058084600c3c8a97e5d80500c76f7c87bb9781ce1c8ee", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b17a3779457df48bcd585a00ed7fcb01710cabc44f7f38be3d7399cb22d33ab", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9461df932934bc0646461a7ba1561904fbf994e55c05ce6407178ae181fb734", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:134fa9d441b4bd63c630de91ce88f40495b2c421da216e0c7184e14b7c3fbf5a", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1e1bfd4aea4bd5769152d56db6ecc4fb312c89090c3024578fc7c76ab423999", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61d1e15fb29553fadd445c30c9a92dce4eabd3b9173be196ab324d504f89d8b1", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8a68ed33e1b3f847d44b7c4ba5f598ca714697a22d2a42595597abb425a1ee7", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9088e2d93b0ce7c0e59f399b5c3df9b86681d6d3ae7139c08b1ab5cd3bf0edf7", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a46af22619677bfdd3109a5e13778f0df89f5fa1bd896386e8a2d348d2282645" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cdfe9e9aba498d960179159dccb4f6bbdc50dec99bd4a334669149ad918232f", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd9167c03388ea1bd71db0f054053fbd439a0b03ace490f93632dc40ec5a1d1c", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0a00ce2541012eb34d61d9179e06511cb0f429b4d859ec2143f520e80969674" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 93d28f07b9..f01be19faf 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-2025-01-22-190903" + "base": "4.16.0-0.nightly-2025-01-26-043131" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1191f7f0277da8d27b0e513bc41df7955e4d3fd59652ddad0efec0c860e2cc6", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ded7349d8f21678508f7c4dc65b007350422cf8f07115a8ebc21804f8d625b21", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8246b63cdf76387c06913a97738ad88110f7a3a55d9d57661d09b41e00b8369b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336d5f09ef32e91f592ad178fae9dfdc8e0292d3802aa4f6ecc5488623527fd8", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56b0752ce53c489eaaeb852b93b184c78feaa993296957afa89274924dd1c8bb", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9369e778dda4192a08d8e0534a25d44af2c235ce74748a30cfe06b7efe6f4173", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e77309570f0a8716292a8466e445fe720f50ec0714782bf75826361d88c2fa83", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5132ebcc968e354969cbbf0133d7e7a5a97b752e0045bda125d22309c2b60c6f", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bdce6aae7b204b90597b01407a0307c5d350cb315f720a682202d0728f78e44", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f46e78078ce043688e3762a4985101a751551a7dcf99e8eed2106537e6e5892", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e244052a2470f09c4669720e3cc7675c212a7c7f35ebfc3b2104682bc2ec758e", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44e98d6e8c51992dc4e011a540c40686e7c3ac48eaa3ba1974ba0a41aa76f206", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57574e9a41103d84d713251cfd189a8027060c3fdd2a8cf31438acba24c33095", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c26bc0695bc3ae142abb84de5fcb2fa483a80b0ae7824e88a6af8181aaf5f62d", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f4060706adcc300124ae2933403056790211477595743ad015a53e9f99b30bc", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98939168b6a1bfe45a497044ff1aa1893a26adaf809f27d8c3ffde67595fd5a3", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c1719d2a4cbb17990bb0fb20e7fc5fc9ed53ceed5e6412299abfbb521016ddb" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f41a96ade16fc34e2ff4bbe94939e23aadbee33d6dfac2d00d439e8377fc6a40", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b1c6df18efe6f3872b73f3f3f5ec59a21f4909a71d973d5898ac0d308343ae2", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1a110e6f586a710c2763d3938b9dc1ddb50ed5738f4273b1e1973b057379cba" } } From 5a7c986c5fa98add1092038a9042ae444dd85de7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Jan 2025 04:23:19 +0000 Subject: [PATCH 5/5] 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 b12b1e89d6..652592c3b9 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2025-01-22-221630 +OCP_VERSION := 4.16.0-0.nightly-arm64-2025-01-26-043132 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 3d2233f815..6165076dd1 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2025-01-22-190903 +OCP_VERSION := 4.16.0-0.nightly-2025-01-26-043131