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

added acm spoke hub clusters

Author: foster-rh

charts/servicemesh-operator-ambient/Chart.yaml

@@ -3,7 +3,7 @@ name: servicemesh-operator-ambient
 description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
 icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg
 type: application
-version: 1.2.0
+version: 1.3.0
 appVersion: "3.0"
 dependencies:
   - name: helper-status-checker

charts/servicemesh-operator-ambient/templates/kiali-subscription.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.kiali.enabled }}
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: kiali-ossm
+  namespace: {{ .Values.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+spec:
+  channel: stable
+  installPlanApproval: Manual
+  name: kiali-ossm
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+  {{- if .Values.kiali.startingCSV }}
+  startingCSV: {{ .Values.kiali.startingCSV }}
+  {{- end }}
+{{- end }}

charts/servicemesh-operator-ambient/values.yaml

@@ -11,6 +11,10 @@ subscription:
 operatorGroup:
   create: false
 
+kiali:
+  enabled: false
+  startingCSV: ""
+
 ambient:
   enabled: true
   version: v1.27-latest
@@ -37,3 +41,9 @@ helper-status-checker:
         name: openshift-operators
       serviceAccount:
         name: "servicemesh-install-check"
+    - operatorName: kiali-operator
+      subscriptionName: kiali-ossm
+      namespace:
+        name: openshift-operators
+      serviceAccount:
+        name: "kiali-install-check"