fix: Parameterize OperatorGroup for cert manager

Signed-off-by: Denilson Nastacio <[email protected]>
IBM · Jan 9, 2024 · 2a9b83a · 2a9b83a
1 parent 1d049ca
commit 2a9b83a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/config/argocd-cloudpaks/cp-shared/Chart.yaml b/config/argocd-cloudpaks/cp-shared/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.4
+version: 0.6.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml
@@ -35,6 +35,12 @@ spec:
           value: "{{.Values.dedicated_cs.namespace_mapping.cp4i}}"
         - name: dedicated_cs.namespace_mapping.cp4s
           value: "{{.Values.dedicated_cs.namespace_mapping.cp4s}}"
+        - name: metadata.ibm_cert_manager_channel
+          value: {{.Values.metadata.ibm_cert_manager_channel}}
+        - name: metadata.ibm_cert_manager_namespace
+          value: {{.Values.metadata.ibm_cert_manager_namespace}}
+        - name: metadata.ibm_cert_manager_operator_group
+          value: {{.Values.metadata.ibm_cert_manager_operator_group}}
         - name: online_catalog_source_priority
           value: "{{.Values.online_catalog_source_priority}}"
         - name: red_hat_cert_manager

diff --git a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-operators-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-operators-app.yaml
@@ -23,6 +23,12 @@ spec:
   source:
     helm:
       parameters:
+        - name: metadata.ibm_cert_manager_channel
+          value: {{.Values.metadata.ibm_cert_manager_channel}}
+        - name: metadata.ibm_cert_manager_namespace
+          value: {{.Values.metadata.ibm_cert_manager_namespace}}
+        - name: metadata.ibm_cert_manager_operator_group
+          value: {{.Values.metadata.ibm_cert_manager_operator_group}}
         - name: online_catalog_source_priority
           value: "{{.Values.online_catalog_source_priority}}"
         - name: red_hat_cert_manager

diff --git a/config/argocd-cloudpaks/cp-shared/values.yaml b/config/argocd-cloudpaks/cp-shared/values.yaml
@@ -7,6 +7,9 @@ serviceaccount:
 metadata:
   argocd_app_namespace: ibm-cloudpaks
   argocd_namespace: openshift-gitops
+  ibm_cert_manager_channel: v4.2
+  ibm_cert_manager_namespace: ibm-cert-manager
+  ibm_cert_manager_operator_group: ibm-cert-manager-operator-group
 dedicated_cs:
   control_namespace: cs-control
   enabled: false

diff --git a/config/cloudpaks/cp-shared/operators/Chart.yaml b/config/cloudpaks/cp-shared/operators/Chart.yaml
@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "1.2.0"
+appVersion: "1.2.1"
diff --git a/config/cloudpaks/cp-shared/operators/templates/0050-sync-cluster-scoped-operators.yaml b/config/cloudpaks/cp-shared/operators/templates/0050-sync-cluster-scoped-operators.yaml
@@ -20,9 +20,11 @@ spec:
             - name: RED_HAT_CERT_MANAGER_ENABLED
               value: "{{.Values.red_hat_cert_manager}}"
             - name: IBM_CERT_MANAGER_NAMESPACE
-              value: {{.Values.metadata.cert_manager_namespace}}
+              value: {{.Values.metadata.ibm_cert_manager_namespace}}
+            - name: IBM_CERT_MANAGER_OPERATOR_GROUP
+              value: {{.Values.metadata.ibm_cert_manager_operator_group}}
             - name: IBM_CERT_MANAGER_CHANNEL
-              value: {{.Values.metadata.cert_manager_channel}}
+              value: {{.Values.metadata.ibm_cert_manager_channel}}
           command:
             - /bin/sh
             - -c
@@ -48,7 +50,7 @@ spec:
               apiVersion: operators.coreos.com/v1
               kind: OperatorGroup
               metadata:
-                name: ibm-cert-manager
+                name: ${IBM_CERT_MANAGER_OPERATOR_GROUP:?}
                 namespace: ${IBM_CERT_MANAGER_NAMESPACE:?}
               spec:
                 upgradeStrategy: Default

diff --git a/config/cloudpaks/cp-shared/operators/values.yaml b/config/cloudpaks/cp-shared/operators/values.yaml
@@ -2,8 +2,9 @@
 red_hat_cert_manager: false
 metadata:
   argocd_namespace: openshift-gitops
-  cert_manager_namespace: ibm-cert-manager
-  cert_manager_channel: v4.2
+  ibm_cert_manager_channel: v4.2
+  ibm_cert_manager_namespace: ibm-cert-manager
+  ibm_cert_manager_operator_group: ibm-cert-manager-operator-group
 serviceaccount:
   argocd_application_controller: openshift-gitops-argocd-application-controller
 online_catalog_source_priority: -1
diff --git a/config/cloudpaks/cp4a/operators/values.yaml b/config/cloudpaks/cp4a/operators/values.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
   argocd_app_namespace: ibm-cloudpaks
-  cert_manager_namespace: ibm-cert-manager
-  cert_manager_channel: v4.2
 red_hat_cert_manager: false
 serviceaccount:
   argocd_application_controller: openshift-gitops-argocd-application-controller