Merge pull request #373 from jtudelag/operators-install-improve

Add spec.config to OLM Subscription objet
redhat-cop · Nov 5, 2023 · 6f246c0 · 6f246c0
2 parents 7ca29dc + da012e2
commit 6f246c0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/charts/operators-installer/Chart.yaml b/charts/operators-installer/Chart.yaml
@@ -15,7 +15,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: 2.4.0
+version: 2.4.1
 
 home: https://github.com/redhat-cop/helm-charts
 

diff --git a/charts/operators-installer/ci/test-install-operator-subscription-with-config.yaml b/charts/operators-installer/ci/test-install-operator-subscription-with-config.yaml
@@ -0,0 +1,20 @@
+approveManualInstallPlanViaHook: true
+
+installPlanApproverAndVerifyJobsImage: registry.redhat.io/openshift4/ose-cli:v4.12
+
+operators:
+- channel: gitops-1.10
+  installPlanApproval: Manual
+  name: openshift-gitops-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+  csv: openshift-gitops-operator.v1.10.1
+  namespace: openshift-gitops-operator
+  config:
+    env:
+    - name: DISABLE_DEFAULT_ARGOCD_INSTANCE
+      value: "true"
+
+operatorGroups:
+- name: openshift-gitops-operator
+  createNamespace: openshift-gitops-operator
diff --git a/charts/operators-installer/templates/Job_installplan-approver.yaml b/charts/operators-installer/templates/Job_installplan-approver.yaml
@@ -5,7 +5,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ printf "%s-%s" .csv "-approver" | trunc -63 | trimAll "-" }}
+  name: {{ printf "%s-%s" .csv "approver" | trunc -63 | trimAll "-" }}
   namespace: {{ .namespace | default $.Release.Namespace }}
   labels:
     {{- include "operators-installer.labels" $ | nindent 4 }}

diff --git a/charts/operators-installer/templates/Job_installplan-complete-verifier.yaml b/charts/operators-installer/templates/Job_installplan-complete-verifier.yaml
@@ -5,7 +5,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ printf "%s-%s" .csv "-verifier" | trunc -63 | trimAll "-" }}
+  name: {{ printf "%s-%s" .csv "verifier" | trunc -63 | trimAll "-" }}
   namespace: {{ .namespace | default $.Release.Namespace }}
   labels:
     {{- include "operators-installer.labels" $ | nindent 4 }}

diff --git a/charts/operators-installer/templates/Subscription.yaml b/charts/operators-installer/templates/Subscription.yaml
@@ -12,6 +12,10 @@ metadata:
     argocd.argoproj.io/sync-wave: "-40"
 spec:
   channel: "{{ .channel }}"
+  {{- if .config }}
+  config:
+    {{ .config | toYaml | indent 4 | trim }}
+  {{- end }}
   installPlanApproval: "{{ .installPlanApproval }}"
   name: "{{ .name }}"
   source: "{{ .source }}"

diff --git a/charts/operators-installer/values.yaml b/charts/operators-installer/values.yaml
@@ -20,6 +20,17 @@ operators:
 #   source: community-operators
 #   sourceNamespace: openshift-marketplace
 #   csv: external-secrets-operator.v0.8.2
+# - channel: gitops-1.10
+#   installPlanApproval: Manual
+#   name: openshift-gitops-operator
+#   source: redhat-operators
+#   sourceNamespace: openshift-marketplace
+#   csv: openshift-gitops-operator.v1.10.1
+#   namespace: openshift-gitops-operator
+#   config:
+#     env:
+#     - name: DISABLE_DEFAULT_ARGOCD_INSTANCE
+#       value: "true"
 
 # configuration for control of OperatorGroups
 operatorGroups: