diff --git a/config/openshift/base/operator.yaml b/config/openshift/base/operator.yaml index 6b8eb976bd..974115c6dd 100644 --- a/config/openshift/base/operator.yaml +++ b/config/openshift/base/operator.yaml @@ -88,21 +88,21 @@ spec: - name: CONFIG_LEADERELECTION_NAME value: tekton-operator-controller-config-leader-election - name: IMAGE_HUB_TEKTON_HUB_DB - value: registry.redhat.io/rhel9/postgresql-15@sha256:327d89e4b62d990dbf55d3c78f271373747816c2e0ab3c943fb016cdcf12f9b5 + value: registry.redhat.io/rhel9/postgresql-15@sha256:0b2579cba0fd9f1754c2c9515d5f873f45de009cf044ce950284dbd1a4e6f10c - name: IMAGE_ADDONS_PARAM_BUILDER_IMAGE - value: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + value: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a - name: IMAGE_ADDONS_PARAM_KN_IMAGE value: registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel9@sha256:aee19896d17a431ba980564fdb73ef08ad1512f586fbdf954cecef6258f7a8df - name: IMAGE_ADDONS_MVN_SETTINGS - value: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c - name: IMAGE_ADDONS_SKOPEO_COPY - value: registry.redhat.io/rhel9/skopeo@sha256:ecc4e3b3aeaadac17f9c0922ea2d7251303761a2695f7e9e08b6d89c7f057388 + value: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9 - name: IMAGE_ADDONS_GENERATE - value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 - name: IMAGE_ADDONS_GEN_ENV_FILE - value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 - name: IMAGE_ADDONS_PARAM_MAVEN_IMAGE - value: registry.redhat.io/ubi9/openjdk-17@sha256:4a1c11377fcd260a2fecfe0ec01e143cc05150c3d9b70b018cdcc68c6f5667a9 + value: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42 - name: IMAGE_ADDONS_OC value: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest - name: openshift-pipelines-operator-cluster-operations # tektoninstallerset reconciler diff --git a/hack/openshift/update-image-sha.sh b/hack/openshift/update-image-sha.sh index 8afef970ad..3e045286e3 100755 --- a/hack/openshift/update-image-sha.sh +++ b/hack/openshift/update-image-sha.sh @@ -26,10 +26,10 @@ find_latest_version() { echo "$version" } -# Get SHA digest for an image:tag -get_image_sha() { +# Get manifest list digest for an image:tag (multi-arch) +get_manifest_list_digest() { local image_url=$1 - skopeo inspect --raw docker://${image_url} | jq -r '.manifests[0].digest // .digest' + skopeo inspect --no-tags docker://${image_url} | jq -r '.Digest' } # Update image SHA in YAML files @@ -59,7 +59,7 @@ main() { echo " Latest version: $latest_version" image_url="${image_registry}:${latest_version}" - image_sha=$(get_image_sha "$image_url") + image_sha=$(get_manifest_list_digest "$image_url") echo " SHA: $image_sha" update_yaml_files "$image_registry" "$image_sha" diff --git a/operatorhub/openshift/config.yaml b/operatorhub/openshift/config.yaml index 1ce0d156fb..0c7d2aa02a 100644 --- a/operatorhub/openshift/config.yaml +++ b/operatorhub/openshift/config.yaml @@ -145,7 +145,7 @@ image-substitutions: containerName: openshift-pipelines-operator-lifecycle envKeys: - IMAGE_ADDONS_OPC -- image: registry.redhat.io/rhel9/skopeo@sha256:ecc4e3b3aeaadac17f9c0922ea2d7251303761a2695f7e9e08b6d89c7f057388 +- image: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9 replaceLocations: envTargets: - deploymentName: openshift-pipelines-operator @@ -153,7 +153,7 @@ image-substitutions: envKeys: - IMAGE_ADDONS_SKOPEO_COPY - IMAGE_ADDONS_SKOPEO_RESULTS -- image: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 +- image: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a replaceLocations: envTargets: - deploymentName: openshift-pipelines-operator @@ -162,7 +162,7 @@ image-substitutions: - IMAGE_ADDONS_PARAM_BUILDER_IMAGE - IMAGE_ADDONS_BUILD - IMAGE_ADDONS_S2I_BUILD -- image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f +- image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 replaceLocations: envTargets: - deploymentName: openshift-pipelines-operator @@ -171,7 +171,7 @@ image-substitutions: - IMAGE_ADDONS_GENERATE - IMAGE_ADDONS_GEN_ENV_FILE - IMAGE_ADDONS_S2I_GENERATE -- image: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 +- image: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c replaceLocations: envTargets: - deploymentName: openshift-pipelines-operator @@ -210,7 +210,7 @@ image-substitutions: containerName: openshift-pipelines-operator-lifecycle envKeys: - IMAGE_CHAINS_TEKTON_CHAINS_CONTROLLER -- image: registry.redhat.io/rhel9/postgresql-15@sha256:327d89e4b62d990dbf55d3c78f271373747816c2e0ab3c943fb016cdcf12f9b5 +- image: registry.redhat.io/rhel9/postgresql-15@sha256:0b2579cba0fd9f1754c2c9515d5f873f45de009cf044ce950284dbd1a4e6f10c replaceLocations: envTargets: - deploymentName: openshift-pipelines-operator @@ -315,7 +315,7 @@ image-substitutions: containerName: openshift-pipelines-operator-lifecycle envKeys: - IMAGE_RESULTS_RETENTION_POLICY_AGENT -- image: registry.redhat.io/ubi9/openjdk-17@sha256:4a1c11377fcd260a2fecfe0ec01e143cc05150c3d9b70b018cdcc68c6f5667a9 +- image: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42 replaceLocations: envTargets: - deploymentName: openshift-pipelines-operator diff --git a/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml b/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml index a91dcaa2d0..b837b6d390 100644 --- a/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml +++ b/operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml @@ -852,35 +852,35 @@ spec: - name: IMAGE_HUB_TEKTON_HUB_DB value: registry.redhat.io/rhel9/postgresql-13@sha256:36647bd6d50d2e0e9c99ecf190bd515577c7ce9476e49d927c4d4065011e3441 - name: IMAGE_ADDONS_PARAM_BUILDER_IMAGE - value: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + value: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a - name: IMAGE_ADDONS_PARAM_KN_IMAGE value: registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel9@sha256:aee19896d17a431ba980564fdb73ef08ad1512f586fbdf954cecef6258f7a8df - name: IMAGE_ADDONS_KN value: registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel9@sha256:aee19896d17a431ba980564fdb73ef08ad1512f586fbdf954cecef6258f7a8df - name: IMAGE_ADDONS_SKOPEO_RESULTS - value: registry.redhat.io/rhel9/skopeo@sha256:ecc4e3b3aeaadac17f9c0922ea2d7251303761a2695f7e9e08b6d89c7f057388 + value: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9 - name: IMAGE_ADDONS_BUILD - value: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + value: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a - name: IMAGE_ADDONS_S2I_BUILD - value: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + value: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a - name: IMAGE_ADDONS_S2I_GENERATE - value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 - name: IMAGE_ADDONS_LOAD_SCRIPTS - value: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c - name: IMAGE_ADDONS_MAVEN_GENERATE - value: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c - name: IMAGE_ADDONS_PREPARE - value: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c - name: IMAGE_ADDONS_MVN_SETTINGS - value: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c - name: IMAGE_ADDONS_SKOPEO_COPY - value: registry.redhat.io/rhel9/skopeo@sha256:ecc4e3b3aeaadac17f9c0922ea2d7251303761a2695f7e9e08b6d89c7f057388 + value: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9 - name: IMAGE_ADDONS_GENERATE - value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 - name: IMAGE_ADDONS_GEN_ENV_FILE - value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + value: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 - name: IMAGE_ADDONS_PARAM_MAVEN_IMAGE - value: registry.redhat.io/ubi9/openjdk-17@sha256:4a1c11377fcd260a2fecfe0ec01e143cc05150c3d9b70b018cdcc68c6f5667a9 + value: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42 - name: IMAGE_ADDONS_OC value: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest - name: IMAGE_PIPELINES_TEKTON_PIPELINES_CONTROLLER @@ -970,7 +970,7 @@ spec: - name: IMAGE_PAC_PAC_CLI value: registry.redhat.io/openshift-pipelines/pipelines-pipelines-as-code-rhel9@ - name: IMAGE_ADDONS_MAVEN_GOALS - value: registry.redhat.io/ubi9/openjdk-17@sha256:4a1c11377fcd260a2fecfe0ec01e143cc05150c3d9b70b018cdcc68c6f5667a9 + value: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42 - name: IMAGE_PIPELINES_CONSOLE_PLUGIN value: registry.redhat.io/openshift-pipelines/pipelines-console-plugin-rhel9@ - name: IMAGE_PIPELINES_CONSOLE_PLUGIN_LEGACY @@ -1094,15 +1094,15 @@ spec: provider: name: Red Hat relatedImages: - - image: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + - image: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a name: IMAGE_ADDONS_PARAM_BUILDER_IMAGE - image: registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel9@sha256:aee19896d17a431ba980564fdb73ef08ad1512f586fbdf954cecef6258f7a8df name: IMAGE_ADDONS_PARAM_KN_IMAGE - - image: registry.redhat.io/rhel9/skopeo@sha256:ecc4e3b3aeaadac17f9c0922ea2d7251303761a2695f7e9e08b6d89c7f057388 + - image: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9 name: IMAGE_ADDONS_SKOPEO_COPY - - image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + - image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 name: IMAGE_ADDONS_GENERATE - - image: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + - image: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c name: IMAGE_ADDONS_MVN_SETTINGS - image: registry.redhat.io/openshift-pipelines/pipelines-rhel9-operator@ name: OPENSHIFT_PIPELINES_OPERATOR @@ -1160,9 +1160,9 @@ spec: name: IMAGE_HUB_TEKTON_HUB_UI - image: registry.redhat.io/openshift-pipelines/pipelines-pipelines-as-code-rhel9@ name: IMAGE_PAC_TRIGGERTEMPLATE_APPLY_AND_LAUNCH - - image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + - image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 name: IMAGE_ADDONS_GEN_ENV_FILE - - image: registry.redhat.io/ubi9/openjdk-17@sha256:4a1c11377fcd260a2fecfe0ec01e143cc05150c3d9b70b018cdcc68c6f5667a9 + - image: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42 name: IMAGE_ADDONS_PARAM_MAVEN_IMAGE - image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest name: IMAGE_ADDONS_OC @@ -1182,19 +1182,19 @@ spec: name: IMAGE_ADDONS_CACHE_FETCH - image: registry.redhat.io/openshift-pipelines/pipelines-sidecarlogresults-rhel9@ name: IMAGE_PIPELINES_ARG__SIDECARLOGRESULTS_IMAGE - - image: registry.redhat.io/rhel9/skopeo@sha256:ecc4e3b3aeaadac17f9c0922ea2d7251303761a2695f7e9e08b6d89c7f057388 + - image: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9 name: IMAGE_ADDONS_SKOPEO_RESULTS - - image: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + - image: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a name: IMAGE_ADDONS_BUILD - - image: registry.redhat.io/rhel9/buildah@sha256:f0432e506a8aea892078322518aedeb12e0f17504dbc29fd293cd8cda06e7f73 + - image: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a name: IMAGE_ADDONS_S2I_BUILD - - image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:70293cb8a80aa548933ff5f502bac89945a5cd08801c4ca3aac08a10dd01f62f + - image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578 name: IMAGE_ADDONS_S2I_GENERATE - - image: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + - image: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c name: IMAGE_ADDONS_LOAD_SCRIPTS - - image: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + - image: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c name: IMAGE_ADDONS_MAVEN_GENERATE - - image: registry.redhat.io/ubi9/ubi-minimal@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362 + - image: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c name: IMAGE_ADDONS_PREPARE - image: registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel9@ name: IMAGE_ADDONS_TKN @@ -1228,7 +1228,7 @@ spec: name: IMAGE_SCHEDULER_WEBHOOK - image: registry.redhat.io/openshift-pipelines/pipelines-syncer-service-rhel9@" name: IMAGE_SYNCER_SERVICE_WORKLOAD_CONTROLLER - - image: registry.redhat.io/ubi9/openjdk-17@sha256:4a1c11377fcd260a2fecfe0ec01e143cc05150c3d9b70b018cdcc68c6f5667a9 + - image: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42 name: IMAGE_ADDONS_MAVEN_GOALS - image: registry.redhat.io/openshift-pipelines/pipelines-console-plugin-rhel9@ name: IMAGE_PIPELINES_CONSOLE_PLUGIN