added acm spoke hub clusters

archive/servicemesh-operator/Chart.yaml → charts/servicemesh-operator-ambient/Chart.yaml

@@ -1,14 +1,14 @@
 apiVersion: v2
-name: servicemesh-operator
-description: Helm chart for deploying Red Hat OpenShift Service Mesh Operator
+name: servicemesh-operator-ambient
+description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
 type: application
-version: 0.5.2
-appVersion: "2.5"
+version: 1.0.0
+appVersion: "3.0"
 dependencies:
-  - name: helper-operator
-    version: ~1.1.0
-    repository: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
   - name: helper-status-checker
     version: 4.4.3
     repository: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
     condition: helper-status-checker.enabled
+maintainers:
+  - name: rh-mobb
+

charts/servicemesh-operator-ambient/templates/istio.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.ambient.enabled }}
+apiVersion: sailoperator.io/v1
+kind: Istio
+metadata:
+  name: {{ .Values.ambient.istio.name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  namespace: {{ .Values.ambient.istio.namespace }}
+  profile: ambient
+  {{- if .Values.ambient.istio.version }}
+  version: {{ .Values.ambient.istio.version }}
+  {{- end }}
+  values:
+    pilot:
+      trustedZtunnelNamespace: {{ .Values.ambient.ztunnel.namespace }}
+{{- end }}

charts/servicemesh-operator-ambient/templates/istiocni.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.ambient.enabled }}
+apiVersion: sailoperator.io/v1
+kind: IstioCNI
+metadata:
+  name: {{ .Values.ambient.cni.name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  namespace: {{ .Values.ambient.cni.namespace }}
+  profile: ambient
+  {{- if .Values.ambient.cni.version }}
+  version: {{ .Values.ambient.cni.version }}
+  {{- end }}
+  values:
+    cni:
+      ambient:
+        reconcileIptablesOnStartup: true
+{{- end }}

charts/servicemesh-operator-ambient/templates/namespaces.yaml

@@ -0,0 +1,22 @@
+{{- if .Values.ambient.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.ambient.istio.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.ambient.cni.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.ambient.ztunnel.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+{{- end }}

charts/servicemesh-operator-ambient/templates/operatorgroup.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.operatorGroup.create }}
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: {{ .Values.operatorGroup.name | default .Values.subscription.name }}
+  namespace: {{ .Values.namespace }}
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-weight: "-1"
+spec:
+  {{- if .Values.operatorGroup.targetNamespaces }}
+  targetNamespaces:
+  {{- range .Values.operatorGroup.targetNamespaces }}
+  - {{ . }}
+  {{- end }}
+  {{- end }}
+  upgradeStrategy: Default
+{{- end }}

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

@@ -0,0 +1,17 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: {{ .Values.subscription.name }}
+  namespace: {{ .Values.namespace }}
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-weight: "0"
+spec:
+  channel: {{ .Values.subscription.channel }}
+  installPlanApproval: {{ .Values.subscription.installPlanApproval }}
+  name: {{ .Values.subscription.name }}
+  source: {{ .Values.subscription.source }}
+  sourceNamespace: {{ .Values.subscription.sourceNamespace }}
+  {{- if .Values.subscription.startingCSV }}
+  startingCSV: {{ .Values.subscription.startingCSV }}
+  {{- end }}

charts/servicemesh-operator-ambient/templates/ztunnel.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.ambient.enabled }}
+apiVersion: sailoperator.io/v1alpha1
+kind: ZTunnel
+metadata:
+  name: {{ .Values.ambient.ztunnel.name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  namespace: {{ .Values.ambient.ztunnel.namespace }}
+  profile: ambient
+  {{- if .Values.ambient.ztunnel.version }}
+  version: {{ .Values.ambient.ztunnel.version }}
+  {{- end }}
+{{- end }}

charts/servicemesh-operator-ambient/values.yaml

@@ -0,0 +1,38 @@
+namespace: openshift-operators
+
+subscription:
+  name: servicemeshoperator3
+  channel: stable
+  installPlanApproval: Manual
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+  startingCSV: ""
+
+operatorGroup:
+  create: false
+
+ambient:
+  enabled: true
+  istio:
+    name: default
+    namespace: istio-system
+    version: ""
+  cni:
+    name: default
+    namespace: istio-cni
+    version: ""
+  ztunnel:
+    name: default
+    namespace: ztunnel
+    version: ""
+
+helper-status-checker:
+  enabled: true
+  approver: true
+  checks:
+    - operatorName: servicemeshoperator3
+      subscriptionName: servicemeshoperator3
+      namespace:
+        name: openshift-operators
+      serviceAccount:
+        name: "servicemesh-install-check"