From adb0d0e9904c6bb0565c395069d869418891a3f7 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Jun 2026 13:52:07 +1000 Subject: [PATCH] Add subscription config support to OpenShift GitOps workload Allow passing custom subscription configuration to the install_operator role via ocp4_workload_openshift_gitops_subscription_config variable. This enables setting environment variables like ARGOCD_CLUSTER_CONFIG_NAMESPACES to allow the GitOps operator to watch multiple namespaces. Defaults to empty dict {} which is properly handled by the install_operator template's length check. --- .../ocp4_workload_openshift_gitops/defaults/main.yml | 12 ++++++++++++ .../tasks/workload.yml | 1 + 2 files changed, 13 insertions(+) diff --git a/roles/ocp4_workload_openshift_gitops/defaults/main.yml b/roles/ocp4_workload_openshift_gitops/defaults/main.yml index b9e430d..ef281d5 100644 --- a/roles/ocp4_workload_openshift_gitops/defaults/main.yml +++ b/roles/ocp4_workload_openshift_gitops/defaults/main.yml @@ -182,3 +182,15 @@ ocp4_workload_openshift_gitops_catalog_snapshot_image: quay.io/rhpds/olm_snapsho # Catalog snapshot image tag ocp4_workload_openshift_gitops_catalog_snapshot_image_tag: v4.19_2025_07_21 + +# ---------------------------------- +# Subscription Configuration +# ---------------------------------- +# Additional subscription configuration to pass to the operator +# This is useful for setting environment variables like ARGOCD_CLUSTER_CONFIG_NAMESPACES +# Example: +# ocp4_workload_openshift_gitops_subscription_config: +# env: +# - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES +# value: "openshift-gitops,custom-namespace" +ocp4_workload_openshift_gitops_subscription_config: {} diff --git a/roles/ocp4_workload_openshift_gitops/tasks/workload.yml b/roles/ocp4_workload_openshift_gitops/tasks/workload.yml index f7d0dc6..d640e18 100644 --- a/roles/ocp4_workload_openshift_gitops/tasks/workload.yml +++ b/roles/ocp4_workload_openshift_gitops/tasks/workload.yml @@ -19,6 +19,7 @@ install_operator_catalogsource_namespace: openshift-gitops-operator install_operator_catalogsource_image: "{{ ocp4_workload_openshift_gitops_catalog_snapshot_image | default('') }}" install_operator_catalogsource_image_tag: "{{ ocp4_workload_openshift_gitops_catalog_snapshot_image_tag | default('') }}" + install_operator_subscription_config: "{{ ocp4_workload_openshift_gitops_subscription_config }}" - name: Grant cluster-admin permissions to Gitops Service account when: ocp4_workload_openshift_gitops_setup_cluster_admin | bool