From 401bacca37de16bdeff1c4ac4cdfac6a7ac5c89f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:15:12 +0000 Subject: [PATCH 1/9] 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 ada41ec25b..7cde39dff6 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-2024-05-01-111315" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-04-30-133616" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-05-05-102537" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-05-06-000205" From e540237d91ece197d2b5d477a89609cccbed5479 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:15:12 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 94 +++++++++++++++++++++++++++---- scripts/auto-rebase/commits.txt | 22 ++++---- 2 files changed, 95 insertions(+), 21 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index c695c417e2..fbc6082aff 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,21 +1,95 @@ -- cluster-network-operator embedded-component 874b16f376c8664da9c4a6eb079f2cf4ddb2bd15 to 7604c189b47723fd932cf959c8c15d694262b1f5 - - b66fe1d 2024-04-30T13:17:47+02:00 Update EQoS CRD to latest +- cluster-ingress-operator embedded-component b7d42a2535904aab104e1f3d709832b1c104204c to 5b42422d0f5f488fc1deb3db08a7b97367cfd2a6 + - f7f09bb 2024-04-25T00:06:21-04:00 Bump controller-runtime to v0.17.3 -- machine-config-operator embedded-component 4ea63f5a4cfe8ac8b5a31f48b7d8828c5244c7e8 to 69944ada37af73f874bc436cbd79e5b9af4c16de - - e04c6b04 2024-04-26T16:33:09-04:00 update feature gate refs: config/v1 -> features - - cc9e1705 2024-04-26T16:33:09-04:00 make go-deps & make update - - 3bc24f6f 2024-02-13T12:21:51+00:00 OCPBUGS-11936: Wait for OpenStack Metadata service +- cluster-kube-apiserver-operator embedded-component 1d9a2d0d604601640d318ea0cf973d23d711e970 to 8fae6b51944c1f90e6875f55072a3d85db40e743 + - 7b66bf3 2024-05-03T11:04:06-07:00 Fix incorrect name for SCC ClusterRole -- oc image-amd64 5ffe8230ec8aa94dc37dfa589c108402d12f8615 to 51e5705eaace0d3a8b359913cb82e69a8bf0eaf1 +- cluster-network-operator embedded-component 7604c189b47723fd932cf959c8c15d694262b1f5 to 4ce35caa8b689db45d65aae76881fd01ad5b46f1 + - 582092d 2024-05-01T13:23:45-04:00 OCPBUGS-28230: enforce termination message policy on all platform pods + +- etcd embedded-component aa0c441f97e070fed62cc3e1423537eb42c661a3 to f6dd3fb9c8b351dce11af0161e58e2edc644ee3a + - a861c997 2024-05-02T16:29:14+02:00 CORS-3249: DOWNSTREAM : installer: make etcd binaries static + - c145bd16 2024-05-02T16:10:10+02:00 DOWNSTREAM : add installer Dockerfile for ART builds + +- machine-config-operator embedded-component 69944ada37af73f874bc436cbd79e5b9af4c16de to 203afde4a93e2c6c7672d6669dd6fe7644ccd388 + - 7df3a46a 2024-05-01T15:57:18-07:00 pkg/daemon: logSystem the Kube API errors that trigger a re-bootstrap + - dc4f6a36 2024-03-18T17:23:47-04:00 Fix volumeMounts within cloud platform bootstrap coredns.yaml + +- oc image-amd64 51e5705eaace0d3a8b359913cb82e69a8bf0eaf1 to 941fe49866979576189f764217deae6029e15e9b + - 65c2c3d7 2024-05-03T10:36:23+03:00 Switch cli-artifacts default oc to RHEL9 + - 9e11d643 2024-04-30T09:32:35+03:00 Switch cli image to RHEL9 base image + +- router image-amd64 b6f7c63c52e6b20fde2549a3c3e69a052ab453cc to 56ab14f257e123317c00ce7ba5b4ecae7b2e0102 + - 0bc6f5e 2024-05-03T10:26:03-04:00 generateHAProxyCertConfigMap: No H2 with dup certs + - 13ab1dd 2024-05-01T19:11:45-04:00 Optimize Upgrade Validation plugin by skipping unnecessary changes + +- ovn-kubernetes image-amd64 7682c449ded3889b111f8aefe43134e30bd89118 to e7517c1c125d482c01e53baf0670ba777ca2c9d2 + - 12c5f08d 2024-05-01T12:40:01-04:00 Delete site directory + - cd072da0 2024-05-01T12:38:07-04:00 Update static.yml + - 4cbcd0db 2024-04-30T16:14:50-04:00 Create static.yml + - 5803c727 2024-04-30T20:48:02+02:00 docs: Add site to our repo + - d119bae8 2024-04-30T13:34:35-04:00 Update CODEOWNERS + - c059c9f4 2024-04-30T13:21:19-04:00 Update CODEOWNERS -testing + - d929d5d7 2024-04-30T09:53:41-04:00 Fix codeowners location + - 71efbfdb 2024-04-30T15:44:58+02:00 docs: setup github pages with mkdocs + - df235d19 2024-04-30T09:23:33+02:00 Revert "Cleanup docs and Add Integration to Github Pages" + - 6454f344 2024-04-30T08:39:08+02:00 docs: setup github pages with mkdocs + - c54dc7b0 2024-04-29T15:24:42-04:00 Create index.html + - 27617a28 2024-04-29T13:05:44-04:00 Update _config.yml + - 0af2abd0 2024-04-29T13:02:06-04:00 Update _config.yml + - be863ab8 2024-04-29T12:55:17-04:00 Create index.md + - 4c3a4e4b 2024-04-29T12:39:07-04:00 Add github pages conf + - 2acb20d2 2024-04-29T12:26:23-04:00 Delete CNAME + - d99ea735 2024-04-29T12:08:23-04:00 Create CNAME + - dff5dc7f 2024-04-29T15:56:01+02:00 EQoS: Set force:true for server-side-apply + - afe0b649 2024-04-29T18:36:56+05:30 Reuse node-subnet from cache if exists + - cb10a72d 2024-04-25T14:54:11-04:00 Add back CODEOWNERS + - b7d827a2 2024-04-25T17:59:20+02:00 Remove skip for ETP=local+terminating endpoints + - c5906c8c 2024-04-24T13:47:15-04:00 Remove CODEOWNERS + - 3dd254d0 2024-04-22T12:47:58-07:00 Follow up fix how detect any network following lib change + - 235e81e8 2024-03-31T10:57:45+03:00 e2e, multi-net policies: Add ingress deny all test + - 6fd4e31a 2024-03-31T10:57:45+03:00 e2e, multi-net policies: Add ingress allow all tests + - afb364f3 2024-03-31T10:57:45+03:00 e2e, multi-net policies: Add missing MultiPolicyType + +- oc image-arm64 ba1f00b782ff8dc385b5b55f437e0557133a48c2 to 941fe49866979576189f764217deae6029e15e9b + - 65c2c3d7 2024-05-03T10:36:23+03:00 Switch cli-artifacts default oc to RHEL9 + - 9e11d643 2024-04-30T09:32:35+03:00 Switch cli image to RHEL9 base image - 197eb62a 2024-04-29T15:24:02-07:00 pkg/cli/admin/upgrade/status: Drop free-form Progressing output line - - 7977ec94 2024-04-29T11:34:03-07:00 pkg/cli/admin/upgrade/status: Move Failing from free-form to updateInsight -- router image-amd64 8762aa4c58f0407c235d284d0cf6a8dba7176243 to b6f7c63c52e6b20fde2549a3c3e69a052ab453cc +- router image-arm64 8762aa4c58f0407c235d284d0cf6a8dba7176243 to 56ab14f257e123317c00ce7ba5b4ecae7b2e0102 + - 0bc6f5e 2024-05-03T10:26:03-04:00 generateHAProxyCertConfigMap: No H2 with dup certs + - 13ab1dd 2024-05-01T19:11:45-04:00 Optimize Upgrade Validation plugin by skipping unnecessary changes - 44f217f 2024-04-30T09:39:07-04:00 Make ingressConditionsEqual more efficient - 3f17190 2024-04-29T18:50:28-04:00 Add log for attempting to update route status - 66eb223 2024-04-29T18:50:11-04:00 Add verbose logging for plugin chain execution - efcba1b 2024-04-25T12:36:36-04:00 Log election results in writerlease -- ovn-kubernetes image-amd64 8a08bc0ef1d8cdefe8d6ad7be3d5abb367efac15 to 7682c449ded3889b111f8aefe43134e30bd89118 +- ovn-kubernetes image-arm64 8a08bc0ef1d8cdefe8d6ad7be3d5abb367efac15 to e7517c1c125d482c01e53baf0670ba777ca2c9d2 + - 12c5f08d 2024-05-01T12:40:01-04:00 Delete site directory + - cd072da0 2024-05-01T12:38:07-04:00 Update static.yml + - 4cbcd0db 2024-04-30T16:14:50-04:00 Create static.yml + - 5803c727 2024-04-30T20:48:02+02:00 docs: Add site to our repo + - d119bae8 2024-04-30T13:34:35-04:00 Update CODEOWNERS + - c059c9f4 2024-04-30T13:21:19-04:00 Update CODEOWNERS -testing + - d929d5d7 2024-04-30T09:53:41-04:00 Fix codeowners location + - 71efbfdb 2024-04-30T15:44:58+02:00 docs: setup github pages with mkdocs + - df235d19 2024-04-30T09:23:33+02:00 Revert "Cleanup docs and Add Integration to Github Pages" + - 6454f344 2024-04-30T08:39:08+02:00 docs: setup github pages with mkdocs + - c54dc7b0 2024-04-29T15:24:42-04:00 Create index.html + - 27617a28 2024-04-29T13:05:44-04:00 Update _config.yml + - 0af2abd0 2024-04-29T13:02:06-04:00 Update _config.yml + - be863ab8 2024-04-29T12:55:17-04:00 Create index.md + - 4c3a4e4b 2024-04-29T12:39:07-04:00 Add github pages conf + - 2acb20d2 2024-04-29T12:26:23-04:00 Delete CNAME + - d99ea735 2024-04-29T12:08:23-04:00 Create CNAME + - dff5dc7f 2024-04-29T15:56:01+02:00 EQoS: Set force:true for server-side-apply + - afe0b649 2024-04-29T18:36:56+05:30 Reuse node-subnet from cache if exists - 27c4ed7d 2024-04-28T15:15:48+02:00 Dockerfile: Bump OVS to 3.3.0-2. + - cb10a72d 2024-04-25T14:54:11-04:00 Add back CODEOWNERS + - b7d827a2 2024-04-25T17:59:20+02:00 Remove skip for ETP=local+terminating endpoints + - c5906c8c 2024-04-24T13:47:15-04:00 Remove CODEOWNERS + - 3dd254d0 2024-04-22T12:47:58-07:00 Follow up fix how detect any network following lib change + - 235e81e8 2024-03-31T10:57:45+03:00 e2e, multi-net policies: Add ingress deny all test + - 6fd4e31a 2024-03-31T10:57:45+03:00 e2e, multi-net policies: Add ingress allow all tests + - afb364f3 2024-03-31T10:57:45+03:00 e2e, multi-net policies: Add missing MultiPolicyType diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index d298935923..3dd918ee39 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,38 +1,38 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 66048040bb40915f0903a0e7de0bbc6f4b4faef5 https://github.com/openshift/cluster-dns-operator embedded-component 2d77b099cd229949067d7de843b9d1538aab7403 -https://github.com/openshift/cluster-ingress-operator embedded-component b7d42a2535904aab104e1f3d709832b1c104204c -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 1d9a2d0d604601640d318ea0cf973d23d711e970 +https://github.com/openshift/cluster-ingress-operator embedded-component 5b42422d0f5f488fc1deb3db08a7b97367cfd2a6 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8fae6b51944c1f90e6875f55072a3d85db40e743 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component f0f485f3c1d70416c242e3159820331a36fb2d2a https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6 -https://github.com/openshift/cluster-network-operator embedded-component 7604c189b47723fd932cf959c8c15d694262b1f5 +https://github.com/openshift/cluster-network-operator embedded-component 4ce35caa8b689db45d65aae76881fd01ad5b46f1 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d291c51f0becf065fbe740cf7b113b81378ee34a 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 aa0c441f97e070fed62cc3e1423537eb42c661a3 +https://github.com/openshift/etcd embedded-component f6dd3fb9c8b351dce11af0161e58e2edc644ee3a https://github.com/openshift/kubernetes embedded-component d1ec84aa4c0ca46e90b22b364a62d38c78487c12 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51 -https://github.com/openshift/machine-config-operator embedded-component 69944ada37af73f874bc436cbd79e5b9af4c16de +https://github.com/openshift/machine-config-operator embedded-component 203afde4a93e2c6c7672d6669dd6fe7644ccd388 https://github.com/openshift/openshift-controller-manager embedded-component 8f6f90a1e8b7057588006508cc2be22949d3b0e2 https://github.com/openshift/operator-framework-olm embedded-component 56b7b9d5a6a063dad50e5f5a31b6dca7012c8345 https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6 https://github.com/openshift/service-ca-operator embedded-component cb3093f23618be6898e540b97855450cc198db2d -https://github.com/openshift/oc image-amd64 51e5705eaace0d3a8b359913cb82e69a8bf0eaf1 +https://github.com/openshift/oc image-amd64 941fe49866979576189f764217deae6029e15e9b https://github.com/openshift/coredns image-amd64 f937ebfb6b8a31fc194597a1ade0e93e73e474b5 https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 -https://github.com/openshift/router image-amd64 b6f7c63c52e6b20fde2549a3c3e69a052ab453cc +https://github.com/openshift/router image-amd64 56ab14f257e123317c00ce7ba5b4ecae7b2e0102 https://github.com/openshift/kube-rbac-proxy image-amd64 04d0a78154b45ce300e176836bd47c6004603e88 -https://github.com/openshift/ovn-kubernetes image-amd64 7682c449ded3889b111f8aefe43134e30bd89118 +https://github.com/openshift/ovn-kubernetes image-amd64 e7517c1c125d482c01e53baf0670ba777ca2c9d2 https://github.com/openshift/kubernetes image-amd64 d1ec84aa4c0ca46e90b22b364a62d38c78487c12 https://github.com/openshift/service-ca-operator image-amd64 cb3093f23618be6898e540b97855450cc198db2d -https://github.com/openshift/oc image-arm64 ba1f00b782ff8dc385b5b55f437e0557133a48c2 +https://github.com/openshift/oc image-arm64 941fe49866979576189f764217deae6029e15e9b https://github.com/openshift/coredns image-arm64 f937ebfb6b8a31fc194597a1ade0e93e73e474b5 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 -https://github.com/openshift/router image-arm64 8762aa4c58f0407c235d284d0cf6a8dba7176243 +https://github.com/openshift/router image-arm64 56ab14f257e123317c00ce7ba5b4ecae7b2e0102 https://github.com/openshift/kube-rbac-proxy image-arm64 04d0a78154b45ce300e176836bd47c6004603e88 -https://github.com/openshift/ovn-kubernetes image-arm64 8a08bc0ef1d8cdefe8d6ad7be3d5abb367efac15 +https://github.com/openshift/ovn-kubernetes image-arm64 e7517c1c125d482c01e53baf0670ba777ca2c9d2 https://github.com/openshift/kubernetes image-arm64 d1ec84aa4c0ca46e90b22b364a62d38c78487c12 https://github.com/openshift/service-ca-operator image-arm64 cb3093f23618be6898e540b97855450cc198db2d From a99ffaf44fe36d07882ac8504409dfc0eb390b76 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:15:41 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 684b3880c6..94c0c37595 100644 --- a/go.mod +++ b/go.mod @@ -266,9 +266,9 @@ replace ( ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator diff --git a/go.sum b/go.sum index 5d928a8cdf..4a996596f7 100644 --- a/go.sum +++ b/go.sum @@ -494,12 +494,12 @@ github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8 h1:HGfbllzRcrJ github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8/go.mod h1:+VvvaMSTUhOt+rBq7NwRLSNxq06hTeRCBqm0j0PQEq8= github.com/openshift/cluster-policy-controller v0.0.0-20240311102810-eaea543f4c84 h1:aGtVz0VmcWvTx7cUIN8+38RdttDQJy2pqnVSX96DaXY= github.com/openshift/cluster-policy-controller v0.0.0-20240311102810-eaea543f4c84/go.mod h1:xGUXh6jWYgH/ihR5MIBZ/FgTEdftTlUaiPYg7a8SduY= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:Qz8nq7v3hwkvyrS6scwQSGKiLwcw7hDQRzlilbXv0pA= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:q9L2hEwkgYgeO0t/6EFuHvdcWVlyKeRQ3aGnIrrQmII= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:0zR2bWun/bpR3pVDpW6qwswD5tp2dtKofZ9EGAsX9p4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:EjTj5oHRths5idHlNsWUMIWmarsXMgIkOdg8oyJiF/Y= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:GHDwQ/Eb+kMddXmBmvQVkWTfEosrLOhqlKZc8briLhg= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:3qI1kA3Gd/zCBd/o+mZ1XhtQCcvy0vxbrXS8aBED/oI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/openshift/kubernetes v0.0.0-20240425192117-d1ec84aa4c0c h1:ODsoAY1OCJeIVaam/09vp35k3SBc/CUVD4QpSAJv/Bk= From 6b60b237debd25774b257931a8c54647b3968850 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:16:06 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/modules.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index d5763c0cd0..cba76a9e40 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -949,7 +949,7 @@ github.com/vmware/govmomi/vim25/xml # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -957,7 +957,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -965,7 +965,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -3343,8 +3343,8 @@ sigs.k8s.io/yaml # k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240425192117-d1ec84aa4c0c # k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240425192117-d1ec84aa4c0c # k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240425192117-d1ec84aa4c0c -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 # k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240425192117-d1ec84aa4c0c From 245e954e0b73fb53dbff7dd7e8ac52b9aa1f8f81 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:16:06 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 12 ++++++------ etcd/go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 363a812262..8040300087 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -145,12 +145,12 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240408095611-aa0c441f97e0 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 // from etcd k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240425192117-d1ec84aa4c0c // staging kubernetes k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240425192117-d1ec84aa4c0c // staging kubernetes k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240425192117-d1ec84aa4c0c // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index e924be61eb..266b2b163c 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -192,18 +192,18 @@ github.com/openshift/api v0.0.0-20240405095747-3e50337fcaea h1:cjCo7sUIjL+Q2ZGMf github.com/openshift/api v0.0.0-20240405095747-3e50337fcaea/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4= github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8 h1:cu3YUMVGsKIyFyJGO3F6BZKGYQZpCKxAv9cBPgQAca8= github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:Qz8nq7v3hwkvyrS6scwQSGKiLwcw7hDQRzlilbXv0pA= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:q9L2hEwkgYgeO0t/6EFuHvdcWVlyKeRQ3aGnIrrQmII= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:0zR2bWun/bpR3pVDpW6qwswD5tp2dtKofZ9EGAsX9p4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:3wenBFJ94tcwkXc+c5yS5CN6HWFR/0efjfqQtjVTt5U= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:QmELEt75XsWU9/QmdnVABDMCb/8zqAMZEtCa+WMiafI= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240408095611-aa0c441f97e0 h1:r4FIZwYfVVkJkQd6ZWbNGzAG2IMKa3tazb3PKBHWPvI= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240408095611-aa0c441f97e0/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:EjTj5oHRths5idHlNsWUMIWmarsXMgIkOdg8oyJiF/Y= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:GHDwQ/Eb+kMddXmBmvQVkWTfEosrLOhqlKZc8briLhg= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:3qI1kA3Gd/zCBd/o+mZ1XhtQCcvy0vxbrXS8aBED/oI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:Cbl5hL13EJeRKDu+z206ljH5JMYmGyJAbwiUO2qm7tY= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:FoXQ6AQYjddatNlR2NkCoSHXLuXI5nKeR+cWcMXq0Zs= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 h1:kqSjxPoae8Lik/DKMKpLYLqV4LieMBdCU7jEAtRFfuk= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240425192117-d1ec84aa4c0c h1:rtuBFc+YcUhGnQLHr9hhE1ToIpvELpSc4AcvZs3xVH8= From 47f3c146214e745ea41b361e1d54c8985db9aa98 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:16:11 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 95f4ee9528..32ba0516dc 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -271,7 +271,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.9 ## explicit; go 1.17 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -280,7 +280,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -293,14 +293,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.13 ## explicit; go 1.21 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.13 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/client/v3 v3.5.13 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.13 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/pkg/v3 v3.5.13 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -317,14 +317,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.13 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/raft/v3 v3.5.13 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 ## explicit; go 1.21 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1043,12 +1043,12 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240408095611-aa0c441f97e0 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240408095611-aa0c441f97e0 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240504150319-f6dd3fb9c8b3 # k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240425192117-d1ec84aa4c0c # k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240425192117-d1ec84aa4c0c # k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240425192117-d1ec84aa4c0c From 08f03b5a9d982852d2fcac7a40809c661b3c40a5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:16:12 +0000 Subject: [PATCH 7/9] 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 914901e96b..304f4fdd2b 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:084a10e4653fa1815a5fac2bbb78dd40527ed5c13f8a2b730a00d26b9aabf069" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b85eeda424b08c9aa7cd6a6457ec75c87387ddb460473dde9d2c58a01809b6b" 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 d3cb9a6a78..1b66a1decc 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:9af3643876d0522f84e804e04cbfd38ac1fd73a45f6e3e4bf8884fef3d3970d1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:541a486aa1fc8c96b86fbf8b25941b88d2e5a8a0d87e68bda86e8ee54b1a22ca" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From a8ac1e21c1714524f57b5b254b33a4187fb542ec Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:16:14 +0000 Subject: [PATCH 8/9] update manifests --- ...r-operator_00_cr-scc-hostmount-anyuid.yaml | 4 ++-- .../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 +++++++++---------- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml index 61ddf78c22..eb2f327a2e 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml @@ -6,12 +6,12 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" rbac.authorization.kubernetes.io/autoupdate: "true" - name: system:openshift:scc:hostmount + name: system:openshift:scc:hostmount-anyuid rules: - apiGroups: - security.openshift.io resourceNames: - - hostmount + - hostmount-anyuid resources: - securitycontextconstraints verbs: diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index fa25395ae4..987536e566 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2aa996d69bf7f2e47605684312b17297daf46b8f21084141c14aa0632d90bb83 + digest: sha256:42466d8108c08c7219eb8e50e60b7e27d0c73432d8b0b063e6a06d2b28b4ea41 - name: container-networking-plugins newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ca96133ec2e7d1f0131eb2d9c6e9088de16b289d4032896d7d3e452ac68812f5 + digest: sha256:6d85d8b5bd6575252f8f363c248fb38df84617be4125a385a9d66d8ffc90c61d diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index c674dae86c..69380cc596 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 newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:49d823fdd7ab89641a48f564319c35a03b35c0ef5e13ae0488e46323dcce41ad + digest: sha256:fcc222b42a518d69bc342e799b56ec38a328ea034d9cdf1368b9f3aff0fcb884 - name: container-networking-plugins newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ea65b85a0d0a798ef49b42659e73c2b3d2daec1d5559ce0c200cd7446fd68387 + digest: sha256:34554f24adfa5216470169952563f633c1e69aa72a5999cec9a26856654241ab diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 4fd25a4474..531ce84f44 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-2024-04-30-133616" + "base": "4.16.0-0.nightly-arm64-2024-05-06-000205" }, "images": { - "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aa996d69bf7f2e47605684312b17297daf46b8f21084141c14aa0632d90bb83", - "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca96133ec2e7d1f0131eb2d9c6e9088de16b289d4032896d7d3e452ac68812f5" + "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42466d8108c08c7219eb8e50e60b7e27d0c73432d8b0b063e6a06d2b28b4ea41", + "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d85d8b5bd6575252f8f363c248fb38df84617be4125a385a9d66d8ffc90c61d" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 0830c341c8..3731d5b847 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-2024-05-01-111315" + "base": "4.16.0-0.nightly-2024-05-05-102537" }, "images": { - "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49d823fdd7ab89641a48f564319c35a03b35c0ef5e13ae0488e46323dcce41ad", - "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea65b85a0d0a798ef49b42659e73c2b3d2daec1d5559ce0c200cd7446fd68387" + "multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcc222b42a518d69bc342e799b56ec38a328ea034d9cdf1368b9f3aff0fcb884", + "container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34554f24adfa5216470169952563f633c1e69aa72a5999cec9a26856654241ab" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 8b1ee98d84..7b610df658 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:7997ce751bd41f337063bb82dc36fc43602f805beb448e7ed655a18cc3f7b253 + digest: sha256:dc5f4825688d8dee7fa8ac1ed46a26d9fec7304c0f90f66c17fee28e993f12bf - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:609f6208bef01ffd54b23fd6b2e72a63e7548b815c302de130f2df7c19b4fb18 + digest: sha256:ad46c0c4d070b171f52c51412b45bfb0e1ca3080faea8ab17e104b708495a31a - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:22bfb1f1ae705e0088b7edc25240856931077f14a4b13eda26d5d43dedb234c5 + digest: sha256:6a8725f121224d014b55f6cfd31a91f54441b0f2ed2587f237571e0b3f25dbd3 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:609f6208bef01ffd54b23fd6b2e72a63e7548b815c302de130f2df7c19b4fb18 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad46c0c4d070b171f52c51412b45bfb0e1ca3080faea8ab17e104b708495a31a - 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:7997ce751bd41f337063bb82dc36fc43602f805beb448e7ed655a18cc3f7b253 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc5f4825688d8dee7fa8ac1ed46a26d9fec7304c0f90f66c17fee28e993f12bf 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 8a9d2532bc..6364380a54 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:6ce786270fdd90748763f038ef3a2ddbacaaf69282fd1665c5fca4cd05474996 + digest: sha256:d3e110e26a1ca79399a07346601a67a198a75fe9b118f7a07ca13434e7625eef - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0c7c5ed0fc928af0e3bd1bb8a83e9455bef2f53be69166c58eb2cb22133de890 + digest: sha256:c587866c3d90d59609957878625e6a2cbfca1670e20a687a93fc0557728e0ccf - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:91bb4f8991ea4b597c9404cec89a984cc3ad3f76a6099d868bc3388dbbd36346 + digest: sha256:0c3bb49e109161166ab049a8923a355f55d9a5086362033d84b1aa396cefeb5a 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:0c7c5ed0fc928af0e3bd1bb8a83e9455bef2f53be69166c58eb2cb22133de890 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c587866c3d90d59609957878625e6a2cbfca1670e20a687a93fc0557728e0ccf - 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:6ce786270fdd90748763f038ef3a2ddbacaaf69282fd1665c5fca4cd05474996 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3e110e26a1ca79399a07346601a67a198a75fe9b118f7a07ca13434e7625eef 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 aca7b94a64..e89e469c92 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-2024-04-30-133616" + "base": "4.16.0-0.nightly-arm64-2024-05-06-000205" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7997ce751bd41f337063bb82dc36fc43602f805beb448e7ed655a18cc3f7b253", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:609f6208bef01ffd54b23fd6b2e72a63e7548b815c302de130f2df7c19b4fb18", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22bfb1f1ae705e0088b7edc25240856931077f14a4b13eda26d5d43dedb234c5" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc5f4825688d8dee7fa8ac1ed46a26d9fec7304c0f90f66c17fee28e993f12bf", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad46c0c4d070b171f52c51412b45bfb0e1ca3080faea8ab17e104b708495a31a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a8725f121224d014b55f6cfd31a91f54441b0f2ed2587f237571e0b3f25dbd3" } } 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 adbf833b59..b2b21bce02 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-2024-05-01-111315" + "base": "4.16.0-0.nightly-2024-05-05-102537" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ce786270fdd90748763f038ef3a2ddbacaaf69282fd1665c5fca4cd05474996", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c7c5ed0fc928af0e3bd1bb8a83e9455bef2f53be69166c58eb2cb22133de890", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91bb4f8991ea4b597c9404cec89a984cc3ad3f76a6099d868bc3388dbbd36346" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3e110e26a1ca79399a07346601a67a198a75fe9b118f7a07ca13434e7625eef", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c587866c3d90d59609957878625e6a2cbfca1670e20a687a93fc0557728e0ccf", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c3bb49e109161166ab049a8923a355f55d9a5086362033d84b1aa396cefeb5a" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index ea9279a510..9bbfaefe00 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-2024-04-30-133616" + "base": "4.16.0-0.nightly-arm64-2024-05-06-000205" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b124cc197986ce8d509e0468cc469e49ce0c6f0c9f37452b4696e41ab445c0f3", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6efd1c44ab0ca6daea763aa53837a4008d86f5e5c4cd035463a94ea8f4b0494", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2840fbe5837758a0de3906355d4a95f927176a588704f8cedbe354afeaf55b0", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22bfb1f1ae705e0088b7edc25240856931077f14a4b13eda26d5d43dedb234c5", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52c5cb36de43798469f0742a9bc157799cb95240b0719d6842a9176f6b66e9c3", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65600e4617bca1acd3e17c00cdb44ae23dc9a56327dfedb7ba0071563c696e6d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90c53910479054c69eae7b5e07aa1a4a72a834c4ec351c55e142b078f6e185d6", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a8725f121224d014b55f6cfd31a91f54441b0f2ed2587f237571e0b3f25dbd3", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3906813f9766ebd1074defe470b007417d5aee790fa6008cc6ca4cc0077f2e6", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9af3643876d0522f84e804e04cbfd38ac1fd73a45f6e3e4bf8884fef3d3970d1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ba2c462e97f1592f02009ccc622e7ca005513907525a5230e8dbbfa01fd44d8", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06e4c3d47feda77ea98a61e925e9519fa801482febaacfe9ab6c7db932e33943", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:541a486aa1fc8c96b86fbf8b25941b88d2e5a8a0d87e68bda86e8ee54b1a22ca", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b00f27debf6ed081b48447bceaf99cb0a7c4859990d319c683a6c12db3ae975", "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:d2bdaae49e64a0cf49a2a72dd931100d1124ab8d799c6b2c8b76baee3101d1a9", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51232b4bba0e91936fadf1282a39eca0bba5da77718b8852e09d3f76c6a25031", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d49c915c1bcfe41a63b4541f778249b424e571fd9d97d17825e9375258c0d190" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdd7c620797846a3a441b6106fc41d0247368e8613516ae634922eb3d3f42392", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60135fe7527420bf498a6680685d57342f95d5c01b608938cb5eacb753244209", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d0d30779fd12fdfc2ffc0ac3734cf02623cae8241d71a461ca8bd91b0e65b34" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index a78623a6a8..9b1558e462 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-2024-05-01-111315" + "base": "4.16.0-0.nightly-2024-05-05-102537" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24c59e2d289b3cae53dadd7b3e77b39ceb8c633082cd1991fb6702fa9d522ef0", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d91ddc7f8a6a540348a1b5eb8202e411d352ddb2a5b21149abf1625a45e9eca", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7dfe1c5a5cc117070a8176b7ea189310da274a96244962d9e267c3341c17253d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91bb4f8991ea4b597c9404cec89a984cc3ad3f76a6099d868bc3388dbbd36346", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c8f996bb9fedc7d0681a80766b574a26dac51be7282ec5fd70ac4f699adb080", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44d06cc3d0c5499e668557f4feffa35f0f663f4c8ec9bead221866a8d294e801", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9349166a758717df0afae1dea9b3c64e2b978cacc773c34cc6a09cc79ae6160", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c3bb49e109161166ab049a8923a355f55d9a5086362033d84b1aa396cefeb5a", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2ac882967c484ac43e9cad357e93679f4e056e3b07cc193704f6d7c47ba59b3", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:084a10e4653fa1815a5fac2bbb78dd40527ed5c13f8a2b730a00d26b9aabf069", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59b8de87d49b39c0f32b54917cb658e8012fd7796c34012a1414f98b4d10eab3", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:962aeff25ecdde40517fe380b03df5c4b7cab5d5a4862352e85064259e892e0c", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b85eeda424b08c9aa7cd6a6457ec75c87387ddb460473dde9d2c58a01809b6b", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12a305ac00169e6a49142ed2480f31f38301b8af88a96552e67bf72ddf739e9b", "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:4cb0712230ceb5fb483a27bf3ff453e800efe31ce4b15c9d98b8281ec90ebb7d", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:528a9df32e5ca2653ff6f202ced7d7287580a9eeab0617f619f9ac2d9d50eadf", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de5bd7b4478e1433f0adc26ed45c189deb4bbb4f86773f1267bcfb3270e2f052" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ceea86d3546f392487b6e3323f2dc3e6b99eb262760a13df5a1c3d52d635e98", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f08949bf81280a4264d0bdfc888c7ea82c7c1af15dc40fcd308c15f12d697465", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93a4ae08905dc76791d4e57c4de4a39b71814278b50feb0ada5996eef761ea9b" } } From f706af1e725df3a69d764ec7a493b690c807d07c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 May 2024 05:16:16 +0000 Subject: [PATCH 9/9] 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 06a0a8aa7f..d7be209479 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-04-30-133616 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-06-000205 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 86e3ed7541..0daf7fa16d 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-05-01-111315 +OCP_VERSION := 4.16.0-0.nightly-2024-05-05-102537