Skip to content

Commit 248d181

Browse files
divyansh42tekton-bot
authored andcommitted
chore: update third-party image digests
Signed-off-by: tekton-bot <tekton-bot@users.noreply.github.com>
1 parent 739417f commit 248d181

4 files changed

Lines changed: 60 additions & 91 deletions

File tree

config/openshift/base/operator.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,19 @@ spec:
9090
- name: IMAGE_HUB_TEKTON_HUB_DB
9191
value: registry.redhat.io/rhel9/postgresql-13@sha256:36647bd6d50d2e0e9c99ecf190bd515577c7ce9476e49d927c4d4065011e3441
9292
- name: IMAGE_ADDONS_PARAM_BUILDER_IMAGE
93-
value: registry.redhat.io/rhel9/buildah@sha256:18453ab0a62154283aaf4c45efd7543d1c8ecca1aebae46dedc7ddc0f410b232
93+
value: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a
9494
- name: IMAGE_ADDONS_PARAM_KN_IMAGE
9595
value: registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:0fa6d15d38601f266347cdd098e80bec9893f7e6b06e84efc4a8c50b3ff3c6cc
9696
- name: IMAGE_ADDONS_MVN_SETTINGS
97-
value: registry.redhat.io/ubi9/ubi-minimal@sha256:2f06ae0e6d3d9c4f610d32c480338eef474867f435d8d28625f2985e8acde6e8
97+
value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c
9898
- name: IMAGE_ADDONS_SKOPEO_COPY
99-
value: registry.redhat.io/rhel9/skopeo@sha256:a65a413f8a2864389a09dc750690d97afbcdc5c70821e0f85e99e8adba7954e0
99+
value: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9
100100
- name: IMAGE_ADDONS_GENERATE
101101
value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:3696cf724ce7865626ae408d82fd87727c741e4d3eb3475c271ec6d56f0882a4
102102
- name: IMAGE_ADDONS_GEN_ENV_FILE
103103
value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:3696cf724ce7865626ae408d82fd87727c741e4d3eb3475c271ec6d56f0882a4
104104
- name: IMAGE_ADDONS_PARAM_MAVEN_IMAGE
105-
value: registry.redhat.io/ubi9/openjdk-17@sha256:555c8bcd2596637befd1a6da4aa949c5a2640cf66e09c2dfb932afe37e39095e
105+
value: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42
106106
- name: IMAGE_ADDONS_OC
107107
value: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
108108
- name: openshift-pipelines-operator-cluster-operations # tektoninstallerset reconciler

hack/openshift/update-image-sha.sh

Lines changed: 47 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,72 @@
11
#!/usr/bin/env bash
22
set -e -u -o pipefail
33

4-
declare -r SCRIPT_NAME=$(basename "$0")
5-
declare -r SCRIPT_DIR=$(cd $(dirname "$0") && pwd)
6-
declare -r USERNAME=${REGISTRY_USER}
7-
declare -r PASSWORD=${REGISTRY_PASSWORD}
8-
9-
log() {
10-
local level=$1; shift
11-
echo -e "$level: $@"
12-
}
13-
14-
15-
err() {
16-
log "ERROR" "$@" >&2
17-
}
18-
19-
info() {
20-
log "INFO" "$@"
21-
}
22-
23-
die() {
24-
local code=$1; shift
25-
local msg="$@"; shift
26-
err $msg
27-
exit $code
28-
}
29-
30-
usage() {
31-
local msg="$1"
32-
cat <<-EOF
33-
Error: $msg
34-
35-
USAGE:
36-
REGISTRY_USER=<registry user name> REGISTRY_PASSWORD=<registry password> $SCRIPT_NAME
37-
38-
Example:
39-
REGISTRY_USER=johnsmith REGISTRY_PASSWORD=pass123 $SCRIPT_NAME
40-
EOF
41-
exit 1
42-
}
43-
44-
#declare -r CATALOG_VERSION="release-v0.7"
45-
4+
# Images to update
465
declare -A IMAGES=(
476
["buildah"]="registry.redhat.io/rhel9/buildah"
48-
["kn"]="registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8"
49-
["postgresql"]="registry.redhat.io/rhel9/postgresql-13"
7+
["kn"]="registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel9"
8+
["postgresql"]="registry.redhat.io/rhel9/postgresql-15"
509
["skopeo-copy"]="registry.redhat.io/rhel9/skopeo"
51-
["s2i"]="registry.redhat.io/source-to-image/source-to-image-rhel8"
10+
["s2i"]="registry.redhat.io/source-to-image/source-to-image-rhel9"
5211
["ubi-minimal"]="registry.redhat.io/ubi9/ubi-minimal"
5312
["java"]="registry.redhat.io/ubi9/openjdk-17"
5413
)
5514

56-
registry_login() {
57-
podman login --username=${USERNAME} --password=${PASSWORD} registry.redhat.io
58-
}
15+
# Find latest version/tag for an image
16+
find_latest_version() {
17+
local image=$1
18+
# Try to get version from Labels first
19+
local version=$(skopeo inspect docker://${image} 2>/dev/null | jq -r '.Labels.version // empty')
5920

60-
find_latest_versions() {
61-
local image_registry=${1:-""}
62-
local latest_version=""
63-
if ! skopeo inspect docker://${image_registry} 2>/dev/null | jq '.Labels.version' | tr -d '"'
64-
then
65-
podman search --list-tags ${image_registry} | grep -v NAME | tr -s ' ' | cut -d ' ' -f 2 | sort -r | grep -v '\-[a-z0-9\.]*$' | head -n 1
21+
# If no version label, get latest tag
22+
if [[ -z "$version" ]]; then
23+
version=$(skopeo list-tags docker://${image} | jq -r '.Tags[]' | sort -r | grep -v '\-[a-z0-9\.]*$' | head -n 1)
6624
fi
67-
}
6825

69-
find_sha_from_tag() {
70-
local image_url=${1:-""}
71-
podman run --rm docker.io/mplatform/manifest-tool:v2.0.0 --username=${USERNAME} --password=${PASSWORD} inspect $image_url --raw | jq '.digest' | tr -d '"'
26+
echo "$version"
7227
}
7328

74-
update_image_sha() {
75-
local image_prefix=${1:-""}
76-
shift
77-
local image_sha=${1:-""}
78-
shift
79-
echo replacemnet var = ${image_prefix}
80-
sed -i -E 's%('${image_prefix}').*%\1@'${image_sha}'%' config/openshift/base/operator.yaml
81-
sed -i -E 's%('${image_prefix}').*%\1@'${image_sha}'%' operatorhub/openshift/config.yaml
82-
sed -i -E 's%('${image_prefix}').*%\1@'${image_sha}'%' operatorhub/openshift/release-artifacts/bundle/manifests/*.yaml
83-
find cmd/openshift/operator/kodata/tekton-addon/addons/ -type f -name "*.yaml" -exec sed -i -E 's%('${image_prefix}').*%\1@'${image_sha}'%' {} +
29+
# Get manifest list digest for an image:tag (multi-arch)
30+
get_manifest_list_digest() {
31+
local image_url=$1
32+
skopeo inspect --no-tags docker://${image_url} | jq -r '.Digest'
8433
}
8534

35+
# Update image SHA in YAML files
36+
update_yaml_files() {
37+
local image_prefix=$1
38+
local image_sha=$2
39+
40+
echo "Updating: ${image_prefix} -> ${image_sha}"
8641

42+
# Update all YAML files
43+
sed -i -E "s%(${image_prefix}).*%\1@${image_sha}%" config/openshift/base/operator.yaml
44+
sed -i -E "s%(${image_prefix}).*%\1@${image_sha}%" operatorhub/openshift/config.yaml
45+
sed -i -E "s%(${image_prefix}).*%\1@${image_sha}%" operatorhub/openshift/release-artifacts/bundle/manifests/*.yaml
46+
find cmd/openshift/operator/kodata/tekton-addon/addons/ -type f -name "*.yaml" -exec sed -i -E "s%(${image_prefix}).*%\1@${image_sha}%" {} +
47+
}
48+
49+
# Main
8750
main() {
88-
registry_login
89-
for image in ${!IMAGES[@]}; do
90-
latest_version=$(find_latest_versions ${IMAGES[$image]})
91-
echo latest_version=$latest_version
92-
image_url="${IMAGES[$image]}":"${latest_version}"
93-
echo $image_url
94-
image_sha=$(find_sha_from_tag "${image_url}")
95-
echo image_sha=${image_sha}
96-
update_image_sha "${IMAGES[$image]}" $image_sha
51+
echo "Updating Red Hat images to latest SHAs..."
52+
echo
53+
54+
for image_name in "${!IMAGES[@]}"; do
55+
image_registry="${IMAGES[$image_name]}"
56+
57+
echo "Processing: $image_name"
58+
latest_version=$(find_latest_version "$image_registry")
59+
echo " Latest version: $latest_version"
60+
61+
image_url="${image_registry}:${latest_version}"
62+
image_sha=$(get_manifest_list_digest "$image_url")
63+
echo " SHA: $image_sha"
9764

65+
update_yaml_files "$image_registry" "$image_sha"
66+
echo
9867
done
9968

100-
return $?
69+
echo "✓ All images updated successfully"
10170
}
10271

10372
main "$@"

operatorhub/openshift/config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ image-substitutions:
145145
containerName: openshift-pipelines-operator-lifecycle
146146
envKeys:
147147
- IMAGE_ADDONS_OPC
148-
- image: registry.redhat.io/rhel9/skopeo@sha256:a65a413f8a2864389a09dc750690d97afbcdc5c70821e0f85e99e8adba7954e0
148+
- image: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9
149149
replaceLocations:
150150
envTargets:
151151
- deploymentName: openshift-pipelines-operator
152152
containerName: openshift-pipelines-operator-lifecycle
153153
envKeys:
154154
- IMAGE_ADDONS_SKOPEO_COPY
155155
- IMAGE_ADDONS_SKOPEO_RESULTS
156-
- image: registry.redhat.io/rhel9/buildah@sha256:18453ab0a62154283aaf4c45efd7543d1c8ecca1aebae46dedc7ddc0f410b232
156+
- image: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a
157157
replaceLocations:
158158
envTargets:
159159
- deploymentName: openshift-pipelines-operator
@@ -162,7 +162,7 @@ image-substitutions:
162162
- IMAGE_ADDONS_PARAM_BUILDER_IMAGE
163163
- IMAGE_ADDONS_BUILD
164164
- IMAGE_ADDONS_S2I_BUILD
165-
- image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:bc10e7d6122ede5cf4f2882c200447683255465a1080e826761e90bfb983506e
165+
- image: registry.redhat.io/source-to-image/source-to-image-rhel9@sha256:718e59d9aacacbaa16be3ae247bdb8582dc4fd9cbe0c5314dfdfc8f22e4f3578
166166
replaceLocations:
167167
envTargets:
168168
- deploymentName: openshift-pipelines-operator
@@ -171,7 +171,7 @@ image-substitutions:
171171
- IMAGE_ADDONS_GENERATE
172172
- IMAGE_ADDONS_GEN_ENV_FILE
173173
- IMAGE_ADDONS_S2I_GENERATE
174-
- image: registry.redhat.io/ubi9/ubi-minimal@sha256:2f06ae0e6d3d9c4f610d32c480338eef474867f435d8d28625f2985e8acde6e8
174+
- image: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c
175175
replaceLocations:
176176
envTargets:
177177
- deploymentName: openshift-pipelines-operator
@@ -284,7 +284,7 @@ image-substitutions:
284284
containerName: openshift-pipelines-operator-lifecycle
285285
envKeys:
286286
- IMAGE_RESULTS_RETENTION_POLICY_AGENT
287-
- image: registry.redhat.io/ubi9/openjdk-17@sha256:555c8bcd2596637befd1a6da4aa949c5a2640cf66e09c2dfb932afe37e39095e
287+
- image: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42
288288
replaceLocations:
289289
envTargets:
290290
- deploymentName: openshift-pipelines-operator

operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,19 +1297,19 @@ spec:
12971297
- name: IMAGE_HUB_TEKTON_HUB_DB
12981298
value: registry.redhat.io/rhel9/postgresql-13@sha256:36647bd6d50d2e0e9c99ecf190bd515577c7ce9476e49d927c4d4065011e3441
12991299
- name: IMAGE_ADDONS_PARAM_BUILDER_IMAGE
1300-
value: registry.redhat.io/rhel9/buildah@sha256:18453ab0a62154283aaf4c45efd7543d1c8ecca1aebae46dedc7ddc0f410b232
1300+
value: registry.redhat.io/rhel9/buildah@sha256:c54ea681142034817a77275ec770167cb17e64020f8c2dbb57c054c39b6c514a
13011301
- name: IMAGE_ADDONS_PARAM_KN_IMAGE
13021302
value: registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:0fa6d15d38601f266347cdd098e80bec9893f7e6b06e84efc4a8c50b3ff3c6cc
13031303
- name: IMAGE_ADDONS_MVN_SETTINGS
1304-
value: registry.redhat.io/ubi9/ubi-minimal@sha256:2f06ae0e6d3d9c4f610d32c480338eef474867f435d8d28625f2985e8acde6e8
1304+
value: registry.redhat.io/ubi9/ubi-minimal@sha256:463cae32c6f6f5594b11a5c22de275016bd8545ce58a6373388e8b24f13fc15c
13051305
- name: IMAGE_ADDONS_SKOPEO_COPY
1306-
value: registry.redhat.io/rhel9/skopeo@sha256:a65a413f8a2864389a09dc750690d97afbcdc5c70821e0f85e99e8adba7954e0
1306+
value: registry.redhat.io/rhel9/skopeo@sha256:fc58b8a734a34f1fd1b0b31e7e137a8200c72e233fbe2a67a29b7a665b683ce9
13071307
- name: IMAGE_ADDONS_GENERATE
13081308
value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:3696cf724ce7865626ae408d82fd87727c741e4d3eb3475c271ec6d56f0882a4
13091309
- name: IMAGE_ADDONS_GEN_ENV_FILE
13101310
value: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:3696cf724ce7865626ae408d82fd87727c741e4d3eb3475c271ec6d56f0882a4
13111311
- name: IMAGE_ADDONS_PARAM_MAVEN_IMAGE
1312-
value: registry.redhat.io/ubi9/openjdk-17@sha256:555c8bcd2596637befd1a6da4aa949c5a2640cf66e09c2dfb932afe37e39095e
1312+
value: registry.redhat.io/ubi9/openjdk-17@sha256:052c0ab499cfbb24b20339394778dfe6402a66b42398c8e59c87697b9b3f0a42
13131313
- name: IMAGE_ADDONS_OC
13141314
value: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
13151315
image: ghcr.io/tektoncd/operator/operator-1d69a75f22dd094880847eac907fb2c1@sha256:f164d2e5e209765e2ffd267e3af9ac904645937beb84a30d19d938b6780baabf

0 commit comments

Comments
 (0)