Skip to content

Commit f70198d

Browse files
copejonclaude
andcommitted
USHIFT-6951: use OCP payload images instead of registry.redhat.io
The release JSONs and kustomization overlays referenced registry.redhat.io pullspecs that don't exist for pre-release builds. Switch to quay.io/openshift-release-dev/ocp-v5.0-art-dev pullspecs from the OCP 5.0 EC2 payload, matching the pattern used by core components and OLM. Also fix rebase.sh to use the ART pullspec directly instead of remapping to registry.redhat.io. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 81264bb commit f70198d

5 files changed

Lines changed: 8 additions & 25 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
images:
22
- name: quay.io/openshift/kube-metrics-server
3-
newName: registry.redhat.io/openshift4/kube-metrics-server-rhel9
4-
digest: sha256:f3005f47c12b265745081503e03e7403d2cf71a7bda84f15ec4411409e5a8eb8
3+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
4+
digest: sha256:35daed97a2d279f2543334cfb209f81be440e423042cc7dae6784985d71f2f8d
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
images:
22
- name: quay.io/openshift/kube-metrics-server
3-
newName: registry.redhat.io/openshift4/kube-metrics-server-rhel9
4-
digest: sha256:0a7797ec4b905af06705b70f2f6d1c36578abf899e98ed71a701364a4edfd177
3+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
4+
digest: sha256:cb84656c5b900f21b7984f917ac0473cf7b5e58cd1ec7d782b01fbe99d39bee7

assets/optional/metrics-server/release-metrics-server-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"base": "placeholder"
44
},
55
"images": {
6-
"metrics_server": "registry.redhat.io/openshift4/kube-metrics-server-rhel9@sha256:f3005f47c12b265745081503e03e7403d2cf71a7bda84f15ec4411409e5a8eb8"
6+
"metrics_server": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:35daed97a2d279f2543334cfb209f81be440e423042cc7dae6784985d71f2f8d"
77
}
88
}

assets/optional/metrics-server/release-metrics-server-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"base": "placeholder"
44
},
55
"images": {
6-
"metrics_server": "registry.redhat.io/openshift4/kube-metrics-server-rhel9@sha256:0a7797ec4b905af06705b70f2f6d1c36578abf899e98ed71a701364a4edfd177"
6+
"metrics_server": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cb84656c5b900f21b7984f917ac0473cf7b5e58cd1ec7d782b01fbe99d39bee7"
77
}
88
}

scripts/auto-rebase/rebase.sh

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,21 +1137,6 @@ update_metrics_images() {
11371137
["node_exporter"]="prometheus-node-exporter"
11381138
)
11391139

1140-
# Maps release JSON key -> registry.redhat.io image path
1141-
declare -A METRICS_REDHAT_REGISTRY_MAP=(
1142-
["metrics_server"]="registry.redhat.io/openshift4/kube-metrics-server-rhel9"
1143-
["kube_state_metrics"]="registry.redhat.io/openshift4/ose-kube-state-metrics-rhel9"
1144-
["node_exporter"]="registry.redhat.io/openshift4/ose-prometheus-node-exporter-rhel9"
1145-
)
1146-
1147-
# Maps kustomization placeholder -> registry.redhat.io image path
1148-
declare -A KUSTOMIZE_REDHAT_REGISTRY_MAP=(
1149-
["quay.io/openshift/kube-metrics-server"]="registry.redhat.io/openshift4/kube-metrics-server-rhel9"
1150-
["quay.io/openshift/kube-state-metrics"]="registry.redhat.io/openshift4/ose-kube-state-metrics-rhel9"
1151-
["quay.io/openshift/node-exporter"]="registry.redhat.io/openshift4/ose-prometheus-node-exporter-rhel9"
1152-
["quay.io/openshift/kube-rbac-proxy"]="registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9"
1153-
)
1154-
11551140
for goarch in amd64 arm64; do
11561141
arch=${GOARCH_TO_UNAME_MAP["${goarch}"]:-noarch}
11571142

@@ -1173,10 +1158,8 @@ update_metrics_images() {
11731158
>&2 echo "ERROR: Release tag '${release_tag}' not found in payload for ${component_dir}"
11741159
return 1
11751160
fi
1176-
local new_digest="${new_image#*@}"
1177-
local redhat_name="${METRICS_REDHAT_REGISTRY_MAP[$json_key]}"
11781161
local component_release_json="${REPOROOT}/assets/optional/${component_dir}/release-${component_dir}-${arch}.json"
1179-
jq -n --arg base "$base_release" --arg img "${redhat_name}@${new_digest}" \
1162+
jq -n --arg base "$base_release" --arg img "${new_image}" \
11801163
"{\"release\": {\"base\": \$base}, \"images\": {\"${json_key}\": \$img}}" > "${component_release_json}"
11811164

11821165
local kustomization_arch_file="${REPOROOT}/assets/optional/${component_dir}/kustomization.${arch}.yaml"
@@ -1203,7 +1186,7 @@ EOF
12031186
>&2 echo "ERROR: Image for release tag '${release_tag}' not found in payload for ${component_dir}"
12041187
return 1
12051188
fi
1206-
local new_image_name="${KUSTOMIZE_REDHAT_REGISTRY_MAP[$orig_image]}"
1189+
local new_image_name="${new_image%@*}"
12071190
local new_image_digest="${new_image#*@}"
12081191

12091192
cat <<EOF >> "${kustomization_arch_file}"

0 commit comments

Comments
 (0)