From d5c0eb76b7cc2ab3d1fa2c588c8fae976cddaf90 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 13 Oct 2025 09:45:16 -0400 Subject: [PATCH] Allow openshift catalog versions to be configurable via helm Signed-off-by: Todd Short --- .../clustercatalog-openshift-certified-operators.yml | 2 +- .../clustercatalog-openshift-community-operators.yml | 2 +- .../clustercatalog-openshift-redhat-marketplace.yml | 2 +- .../clustercatalog-openshift-redhat-operators.yml | 2 +- helm/olmv1/values.yaml | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-certified-operators.yml b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-certified-operators.yml index 995e8bd9a..86c92fd55 100644 --- a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-certified-operators.yml +++ b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-certified-operators.yml @@ -9,5 +9,5 @@ spec: type: Image image: pollIntervalMinutes: 10 - ref: registry.redhat.io/redhat/certified-operator-index:v4.20 + ref: registry.redhat.io/redhat/certified-operator-index:{{- .Values.options.openshift.catalogs.version }} {{- end -}} diff --git a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-community-operators.yml b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-community-operators.yml index d4c1576bf..529af4ad5 100644 --- a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-community-operators.yml +++ b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-community-operators.yml @@ -9,5 +9,5 @@ spec: type: Image image: pollIntervalMinutes: 10 - ref: registry.redhat.io/redhat/community-operator-index:v4.20 + ref: registry.redhat.io/redhat/community-operator-index:{{- .Values.options.openshift.catalogs.version }} {{- end -}} diff --git a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml index 285acf189..b8d6bcff4 100644 --- a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml +++ b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-marketplace.yml @@ -9,5 +9,5 @@ spec: type: Image image: pollIntervalMinutes: 10 - ref: registry.redhat.io/redhat/redhat-marketplace-index:v4.20 + ref: registry.redhat.io/redhat/redhat-marketplace-index:{{- .Values.options.openshift.catalogs.version }} {{- end -}} diff --git a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml index ca1ec8376..d7d94dac1 100644 --- a/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml +++ b/helm/olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml @@ -9,5 +9,5 @@ spec: type: Image image: pollIntervalMinutes: 10 - ref: registry.redhat.io/redhat/redhat-operator-index:v4.20 + ref: registry.redhat.io/redhat/redhat-operator-index:{{ .Values.options.openshift.catalogs.version }} {{- end -}} diff --git a/helm/olmv1/values.yaml b/helm/olmv1/values.yaml index e896f2530..4b14a664c 100644 --- a/helm/olmv1/values.yaml +++ b/helm/olmv1/values.yaml @@ -20,6 +20,8 @@ options: enabled: false openshift: enabled: false + catalogs: + version: v4.20 # This can be one of: standard or experimental featureSet: standard