Merge pull request #28 from mhjacks/main

Add localClusterDomain and fix two nits
RedHatNordicsSA · Jan 19, 2022 · 675693e · 675693e
2 parents f00c01c + 6f61782
commit 675693e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 50 deletions.
diff --git a/acm/templates/policies/application-policies.yaml b/acm/templates/policies/application-policies.yaml
@@ -57,6 +57,8 @@ spec:
                         value: {{ coalesce .valuesDirectoryURL $.Values.global.valuesDirectoryURL }}
                       - name: global.hubClusterDomain
                         value: {{ $.Values.global.hubClusterDomain }}
+                      - name: global.localClusterDomain
+                        value: '{{`{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain  }}`}}'
                      {{- range .helmOverrides }}
                       - name: {{ .name }}
                         value: {{ .value | quote }}

diff --git a/clustergroup/templates/applications.yaml b/clustergroup/templates/applications.yaml
@@ -41,7 +41,7 @@ spec:
           value: {{ $.Values.global.hubClusterDomain }}
         {{- range .overrides }}
         - name: {{ .name }}
-          value: {{ .value }}
+          value: {{ .value | quote }}
         {{- if .forceString }}
           forceString: true
         {{- end }}

diff --git a/clustergroup/templates/subsciptions.yaml b/clustergroup/templates/subsciptions.yaml
diff --git a/clustergroup/templates/subscriptions.yaml b/clustergroup/templates/subscriptions.yaml
@@ -1,17 +1,40 @@
 {{- range .Values.clusterGroup.subscriptions }}
+{{- $subs := . }}
+{{- $installPlanValue := .installPlanApproval }}
+
+{{- if $subs.namespaces }}
+{{- range .namespaces }}
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: {{ .name }}
-  namespace: {{ default "openshift-operators" .namespace }}
+  name: {{ $subs.name }}
+  namespace: {{ default "openshift-operators" . }}
 spec:
-  name: {{ .name }}
-  source: {{ default "redhat-operators" .source }}
-  sourceNamespace: {{ default "openshift-marketplace" .sourceNamespace }}
-  channel: {{ default "stable" .channel }}
-  installPlanApproval: {{ coalesce .installPlanApproval $.Values.global.options.installPlanApproval }}
+  name: {{ $subs.name }}
+  source: {{ default "redhat-operators" $subs.source }}
+  sourceNamespace: {{ default "openshift-marketplace" $subs.sourceNamespace }}
+  channel: {{ default "stable" $subs.channel }}
+  installPlanApproval: {{ coalesce $installPlanValue $.Values.global.options.installPlanApproval }}
   {{- if $.Values.global.options.useCSV }}
-  startingCSV: {{ .csv }}
-  {{- end }}  
+  startingCSV: {{ $subs.csv }}
+  {{- end }}
 ---
 {{- end }}
+{{- else }}
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: {{ $subs.name }}
+  namespace: {{ default "openshift-operators" $subs.namespace }}
+spec:
+  name: {{ $subs.name }}
+  source: {{ default "redhat-operators" $subs.source }}
+  sourceNamespace: {{ default "openshift-marketplace" $subs.sourceNamespace }}
+  channel: {{ default "stable" $subs.channel }}
+  installPlanApproval: {{ coalesce  $installPlanValue $.Values.global.options.installPlanApproval }}
+  {{- if $.Values.global.options.useCSV }}
+  startingCSV: {{ $subs.csv }}
+  {{- end }}
+---
+{{- end }}
+{{- end }}