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

Foster/acm stuff

Author: foster-rh

charts/acm-operator/Chart.yaml

@@ -9,6 +9,6 @@ dependencies:
     version: 1.1.0
     repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
 name: acm-operator
-version: 0.5.15
+version: 0.5.16
 apiVersion: v2
 description: Chart to deploy Red Hat Advanced Cluster Management (RHACM) with ArgoCD ApplicationSets for spoke cluster management

charts/acm-operator/values.yaml

@@ -39,27 +39,27 @@ argocd:
   applications:
   - name: spoke-cluster-config
     annotations:
-    helmRepoUrl: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
+    helmRepoUrl: https://rh-mobb.github.io/validated-pattern-helm-charts/
     chart: app-of-apps-infrastructure-acm
     project: cluster-config-project
     targetRevision: 0.2.7
-    gitRepoUrl: https://github.com/rosa-hcp-dedicated-vpc/cluster-config.git
+    gitRepoUrl: https://github.com/rh-mobb/rosa-cluster-config.git
     adGroup: PFAUTHAD
     # gitPathFile will be constructed dynamically as: {{metadata.labels.environment}}/{{name}}/infrastructure.yaml
     gitPathFile: infrastructure.yaml
     repositories:
-    - https://github.com/rosa-hcp-dedicated-vpc/cluster-config.git
-    - https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
+    - https://github.com/rh-mobb/rosa-cluster-config.git
+    - https://rh-mobb.github.io/validated-pattern-helm-charts/
   - name: spoke-application-ns
     annotations:
-    helmRepoUrl: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
+    helmRepoUrl: https://rh-mobb.github.io/validated-pattern-helm-charts/
     chart: app-of-apps-application-acm
     project: application-ns-project
     targetRevision: 1.6.3
-    gitRepoUrl: https://github.com/rosa-hcp-dedicated-vpc/cluster-config.git
+    gitRepoUrl: https://github.com/rh-mobb/rosa-cluster-config.git
     adGroup: PFAUTHAD
     # gitPathFile will be constructed dynamically as: {{metadata.labels.environment}}/{{name}}/applications-ns.yaml
     gitPathFile: applications-ns.yaml
     repositories:
-    - https://github.com/rosa-hcp-dedicated-vpc/cluster-config.git
-    - https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
+    - https://github.com/rh-mobb/rosa-cluster-config.git
+    - https://rh-mobb.github.io/validated-pattern-helm-charts/

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

@@ -11,4 +11,4 @@ dependencies:
   version: 1.4.0
 description: Chart to kick off gitops installation and bootstrapping of blue print
 name: cluster-bootstrap-acm-spoke
-version: 0.6.6
+version: 0.6.7

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

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

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

@@ -36,7 +36,7 @@ argocd:
   plugin:
     version: "1.18.1"
     AVP_TYPE: awssecretsmanager
-  initialRepositories:
+  initialRepositories: |
     - name: cluster-config
       type: git
       project: default
@@ -58,4 +58,4 @@ application-gitops:
   # So ACM must set: application-gitops.domain via helmValues
   domain: ""
   argocd:
-    initialRepositories:
+    initialRepositories: []