diff --git a/archive/servicemesh-operator/values.yaml b/archive/servicemesh-operator/values.yaml deleted file mode 100644 index e9e50ee..0000000 --- a/archive/servicemesh-operator/values.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Service Mesh Operator Configuration -appTeam: servicemesh-operator - -# Sync wave for ArgoCD deployment -syncwave: 1 - -# Helper operator dependency -helper-operator: - operators: - servicemeshoperator: - enabled: true - syncwave: '0' - namespace: - name: openshift-operators - create: false - subscription: - channel: stable - approval: Manual - operatorName: servicemeshoperator - source: redhat-operators - sourceNamespace: openshift-marketplace - operatorgroup: - create: false - -# Helper status checker dependency -helper-status-checker: - enabled: true - approver: true - checks: - - operatorName: servicemeshoperator - subscriptionName: servicemeshoperator - namespace: - name: openshift-operators - serviceAccount: - name: "servicemesh-install-check" - diff --git a/archive/servicemesh-operator/.gitignore b/charts/servicemesh-operator-ambient/.gitignore similarity index 100% rename from archive/servicemesh-operator/.gitignore rename to charts/servicemesh-operator-ambient/.gitignore diff --git a/archive/servicemesh-operator/Chart.yaml b/charts/servicemesh-operator-ambient/Chart.yaml similarity index 59% rename from archive/servicemesh-operator/Chart.yaml rename to charts/servicemesh-operator-ambient/Chart.yaml index e19a429..d3902ee 100644 --- a/archive/servicemesh-operator/Chart.yaml +++ b/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 + \ No newline at end of file diff --git a/archive/servicemesh-operator/README.md b/charts/servicemesh-operator-ambient/README.md similarity index 100% rename from archive/servicemesh-operator/README.md rename to charts/servicemesh-operator-ambient/README.md diff --git a/charts/servicemesh-operator-ambient/templates/istio.yaml b/charts/servicemesh-operator-ambient/templates/istio.yaml new file mode 100644 index 0000000..7e1dd9a --- /dev/null +++ b/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 }} diff --git a/charts/servicemesh-operator-ambient/templates/istiocni.yaml b/charts/servicemesh-operator-ambient/templates/istiocni.yaml new file mode 100644 index 0000000..b7c0f7f --- /dev/null +++ b/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 }} diff --git a/charts/servicemesh-operator-ambient/templates/namespaces.yaml b/charts/servicemesh-operator-ambient/templates/namespaces.yaml new file mode 100644 index 0000000..e98baa0 --- /dev/null +++ b/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 }} diff --git a/charts/servicemesh-operator-ambient/templates/operatorgroup.yaml b/charts/servicemesh-operator-ambient/templates/operatorgroup.yaml new file mode 100644 index 0000000..92ac703 --- /dev/null +++ b/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 }} diff --git a/charts/servicemesh-operator-ambient/templates/subscription.yaml b/charts/servicemesh-operator-ambient/templates/subscription.yaml new file mode 100644 index 0000000..d0b9e49 --- /dev/null +++ b/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 }} diff --git a/charts/servicemesh-operator-ambient/templates/ztunnel.yaml b/charts/servicemesh-operator-ambient/templates/ztunnel.yaml new file mode 100644 index 0000000..01faf1b --- /dev/null +++ b/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 }} diff --git a/charts/servicemesh-operator-ambient/values.yaml b/charts/servicemesh-operator-ambient/values.yaml new file mode 100644 index 0000000..6aa61fd --- /dev/null +++ b/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"