Skip to content

Commit 8dcf28a

Browse files
committed
backport "add ocpVersions.doc to specify target OCP docs version"
1 parent 9fe68bd commit 8dcf28a

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

hack/generate/csv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ yaml_keys[spec.minKubeVersion]="$(metadata.get requirements.kube.minVersion)"
142142
yaml_keys[spec.replaces]="$(metadata.get project.name).v$(metadata.get olm.replaces)"
143143

144144
declare -A vars
145-
vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
145+
vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.doc')"
146146
vars[VERSION_MAJOR_MINOR]="$(versions.major_minor $(metadata.get 'project.version'))"
147147

148148
function add_related_image {

hack/generate/override-snapshot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
EOF
5353

5454
tmp_catalog_dir=$(mktemp -d)
55-
max_ocp_version="$(metadata.get requirements.ocpVersion.max)"
55+
max_ocp_version="$(metadata.get requirements.ocpVersion.list[-1])"
5656
max_ocp_version=${max_ocp_version/./}
5757
latest_index_image="${registry_quay}-fbc-${max_ocp_version}/serverless-index-${so_version}-fbc-${max_ocp_version}:latest"
5858

hack/generate/quickstart.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target="${2:?Provide a target quickstart file as arg[2]}"
99
source "$(dirname "${BASH_SOURCE[0]}")/../lib/metadata.bash"
1010

1111
declare -A vars
12-
vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
12+
vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.doc')"
1313

1414
# Start fresh
1515
cp "$template" "$target"

olm-catalog/serverless-operator/project.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ requirements:
3030
- "4.18"
3131
- "4.19"
3232
min: '4.14'
33-
max: '4.19'
33+
# Version to use for OCP docs links (in CSV or Quickstarts)
34+
doc: '4.19'
35+
# deprecated, use requirements.ocpVersion.list[-1]
36+
max: '4.20'
3437
label: 'v4.14'
3538
# OCP stream for kube-rbac-proxy image.
3639
kube-rbac-proxy: "4.17"

0 commit comments

Comments
 (0)