Merge pull request #26 from rh-mobb/foster/acm-stuff

added acm spoke hub clusters

Author: foster-rh

charts/cluster-bootstrap-acm-spoke/Chart.yaml

@@ -8,7 +8,7 @@ dependencies:
   version: ~0.1.0
 - name: application-gitops
   repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
-  version: 1.6.0
+  version: 1.6.1
 description: Chart to kick off gitops installation and bootstrapping of blue print
 name: cluster-bootstrap-acm-spoke
-version: 0.6.9
+version: 0.6.10

charts/cluster-bootstrap-acm-spoke/templates/argocd-crd.yaml

@@ -55,8 +55,12 @@ spec:
       requests:
         cpu: 250m
         memory: 128Mi
-  initialRepositories:
+  initialRepositories: |
+    {{- if kindIs "string" .Values.argocd.initialRepositories }}
+    {{- .Values.argocd.initialRepositories | nindent 4 }}
+    {{- else }}
     {{- toYaml .Values.argocd.initialRepositories | nindent 4 }}
+    {{- end }}
   initialSSHKnownHosts: {}
   monitoring:
     enabled: false

charts/cluster-bootstrap/Chart.yaml

@@ -5,9 +5,9 @@ dependencies:
   version: ~0.1.0
 - name: application-gitops
   repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
-  version: 1.6.0
+  version: 1.6.1
 description: Chart to kick off gitops installation and bootstrapping of blue print
 name: cluster-bootstrap
-version: 0.5.11
+version: 0.5.12
 maintainers:
   - name: rh-mobb

charts/cluster-bootstrap/templates/argocd-crd.yaml

@@ -55,8 +55,12 @@ spec:
       requests:
         cpu: 250m
         memory: 128Mi
-  initialRepositories:
+  initialRepositories: |
+    {{- if kindIs "string" .Values.argocd.initialRepositories }}
+    {{- .Values.argocd.initialRepositories | nindent 4 }}
+    {{- else }}
     {{- toYaml .Values.argocd.initialRepositories | nindent 4 }}
+    {{- end }}
   initialSSHKnownHosts: {}
   monitoring:
     enabled: false