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

added acm spoke hub clusters

Author: foster-rh

charts/acm-operator/Chart.yaml

@@ -1,4 +1,5 @@
 home: https://rh-mobb.github.io/validated-pattern-helm-charts/
+icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg
 maintainers:
   - name: rh-mobb
 dependencies:
@@ -9,6 +10,6 @@ dependencies:
     version: 1.1.0
     repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
 name: acm-operator
-version: 0.5.23
+version: 0.5.24
 apiVersion: v2
 description: Chart to deploy Red Hat Advanced Cluster Management (RHACM) with ArgoCD ApplicationSets for spoke cluster management

charts/acm-operator/values.yaml

@@ -55,7 +55,7 @@ argocd:
     helmRepoUrl: https://rh-mobb.github.io/validated-pattern-helm-charts/
     chart: app-of-apps-application
     project: application-ns-project
-    targetRevision: 1.5.7
+    targetRevision: 1.5.8
     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

charts/app-of-apps-application/Chart.yaml

@@ -1,4 +1,8 @@
+apiVersion: v2
 name: app-of-apps-application
 description: Chart to generate argocd apps for each team and gitops set up
-version: 1.5.7
-apiVersion: v2
+icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg
+version: 1.5.8
+home: https://rh-mobb.github.io/validated-pattern-helm-charts/
+maintainers:
+  - name: rh-mobb

charts/app-of-apps-application/templates/argocd-application.yaml

@@ -1,4 +1,5 @@
 {{ $defaults := .Values.defaults -}}
+{{- if ne ($.Values.acmMode | default "") "hub" }}
 ---
 {{ range $applications := .Values.applications -}}
 ---
@@ -37,3 +38,4 @@ spec:
     - ApplyOutOfSyncOnly=true
 ---
 {{- end }}
+{{- end }}

charts/app-of-apps-application/values.yaml

@@ -20,7 +20,7 @@
 #   AVP_TYPE: "awssecretsmanager"
 # #################################################################
 # # INFRASTRUCTURE Charts to be deployed.
-# ################################################################# 
+# #################################################################
 # applications:
 #   - name: payments
 #     appNumber: "1234"
@@ -42,4 +42,3 @@
 #       repos:
 #       - 'https://rh-mobb.github.io/validated-pattern-helm-charts'
 #       - 'https://github.com/rh-mobb/cluster-config.git'
-    

charts/cluster-bootstrap/Chart.yaml

@@ -1,13 +1,14 @@
 apiVersion: v2
 dependencies:
-- name: helper-installplan-approver
-  repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
-  version: ~0.1.0
-- name: application-gitops
-  repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
-  version: 1.6.1
+  - name: helper-installplan-approver
+    repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
+    version: ~0.1.0
+  - name: application-gitops
+    repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
+    version: 1.6.1
 description: Chart to kick off gitops installation and bootstrapping of blue print
+icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg
 name: cluster-bootstrap
-version: 0.5.13
+version: 0.5.14
 maintainers:
   - name: rh-mobb

charts/cluster-bootstrap/values.yaml

@@ -61,7 +61,7 @@ argocd:
     helmRepoUrl: https://rh-mobb.github.io/validated-pattern-helm-charts/
     chart: app-of-apps-application
     project: application-ns-project
-    targetRevision: 1.5.7
+    targetRevision: 1.5.8
     gitRepoUrl: https://github.com/rosa-hcp-dedicated-vpc/cluster-config.git
     adGroup: PFAUTHAD
     gitPathFile: /applications-ns.yaml

charts/network-observability-operator/Chart.yaml

@@ -1,8 +1,10 @@
 apiVersion: v2
 name: network-observability-operator
 description: Helm chart for deploying the Network Observability Operator with Loki-backed flow storage
+icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg
+home: https://rh-mobb.github.io/validated-pattern-helm-charts/
 type: application
-version: 2.1.2
+version: 2.1.3
 appVersion: "1.11"
 dependencies:
   - name: helper-status-checker