From 3114e566ed3056446d05abd15b587e04721f77d1 Mon Sep 17 00:00:00 2001
From: paul foster <pafoster@redhat.com>
Date: Mon, 16 Mar 2026 15:02:38 +1100
Subject: [PATCH 1/5] added acm spoke hub clusters

---
 archive/servicemesh-operator/values.yaml      | 36 ----------------
 .../servicemesh-operator-ambient}/.gitignore  |  0
 .../servicemesh-operator-ambient}/Chart.yaml  |  9 ++--
 .../servicemesh-operator-ambient}/README.md   |  0
 .../templates/istio.yaml                      | 18 ++++++++
 .../templates/istiocni.yaml                   | 19 +++++++++
 .../templates/namespaces.yaml                 | 22 ++++++++++
 .../templates/operatorgroup.yaml              | 18 ++++++++
 .../templates/subscription.yaml               | 17 ++++++++
 .../templates/ztunnel.yaml                    | 15 +++++++
 .../servicemesh-operator-ambient/values.yaml  | 41 +++++++++++++++++++
 11 files changed, 153 insertions(+), 42 deletions(-)
 delete mode 100644 archive/servicemesh-operator/values.yaml
 rename {archive/servicemesh-operator => charts/servicemesh-operator-ambient}/.gitignore (100%)
 rename {archive/servicemesh-operator => charts/servicemesh-operator-ambient}/Chart.yaml (64%)
 rename {archive/servicemesh-operator => charts/servicemesh-operator-ambient}/README.md (100%)
 create mode 100644 charts/servicemesh-operator-ambient/templates/istio.yaml
 create mode 100644 charts/servicemesh-operator-ambient/templates/istiocni.yaml
 create mode 100644 charts/servicemesh-operator-ambient/templates/namespaces.yaml
 create mode 100644 charts/servicemesh-operator-ambient/templates/operatorgroup.yaml
 create mode 100644 charts/servicemesh-operator-ambient/templates/subscription.yaml
 create mode 100644 charts/servicemesh-operator-ambient/templates/ztunnel.yaml
 create mode 100644 charts/servicemesh-operator-ambient/values.yaml

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 64%
rename from archive/servicemesh-operator/Chart.yaml
rename to charts/servicemesh-operator-ambient/Chart.yaml
index e19a429..764f970 100644
--- a/archive/servicemesh-operator/Chart.yaml
+++ b/charts/servicemesh-operator-ambient/Chart.yaml
@@ -1,13 +1,10 @@
 apiVersion: v2
 name: servicemesh-operator
-description: Helm chart for deploying Red Hat OpenShift Service Mesh Operator
+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/
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..cd4b9a7
--- /dev/null
+++ b/charts/servicemesh-operator-ambient/values.yaml
@@ -0,0 +1,41 @@
+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"
+
+
+

From 84158325655e91115d5d35ba0d1dec83752fa93a Mon Sep 17 00:00:00 2001
From: paul foster <pafoster@redhat.com>
Date: Mon, 16 Mar 2026 15:03:52 +1100
Subject: [PATCH 2/5] added acm spoke hub clusters

---
 charts/servicemesh-operator-ambient/values.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/charts/servicemesh-operator-ambient/values.yaml b/charts/servicemesh-operator-ambient/values.yaml
index cd4b9a7..6aa61fd 100644
--- a/charts/servicemesh-operator-ambient/values.yaml
+++ b/charts/servicemesh-operator-ambient/values.yaml
@@ -36,6 +36,3 @@ helper-status-checker:
         name: openshift-operators
       serviceAccount:
         name: "servicemesh-install-check"
-
-
-

From 602954b9bdd6ac0beeacd85d27b79b1488b0eac0 Mon Sep 17 00:00:00 2001
From: paul foster <pafoster@redhat.com>
Date: Mon, 16 Mar 2026 15:16:59 +1100
Subject: [PATCH 3/5] added acm spoke hub clusters

---
 charts/servicemesh-operator-ambient/Chart.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/charts/servicemesh-operator-ambient/Chart.yaml b/charts/servicemesh-operator-ambient/Chart.yaml
index 764f970..9407689 100644
--- a/charts/servicemesh-operator-ambient/Chart.yaml
+++ b/charts/servicemesh-operator-ambient/Chart.yaml
@@ -1,9 +1,12 @@
 apiVersion: v2
-name: servicemesh-operator
+name: servicemesh-operator-ambient
 description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
 type: application
 version: 1.0.0
 appVersion: "3.0"
+maintainers:
+  - name: validated-pattern
+    url: https://github.com/rh-mobb
 dependencies:
   - name: helper-status-checker
     version: 4.4.3

From 48dd554f430ed7e74dde04d4b3e2fa661b476c8c Mon Sep 17 00:00:00 2001
From: paul foster <pafoster@redhat.com>
Date: Mon, 16 Mar 2026 15:19:04 +1100
Subject: [PATCH 4/5] added acm spoke hub clusters

---
 charts/servicemesh-operator-ambient/Chart.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/charts/servicemesh-operator-ambient/Chart.yaml b/charts/servicemesh-operator-ambient/Chart.yaml
index 9407689..5d6a5ae 100644
--- a/charts/servicemesh-operator-ambient/Chart.yaml
+++ b/charts/servicemesh-operator-ambient/Chart.yaml
@@ -4,11 +4,10 @@ description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
 type: application
 version: 1.0.0
 appVersion: "3.0"
-maintainers:
-  - name: validated-pattern
-    url: https://github.com/rh-mobb
 dependencies:
   - 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

From b7f9e7348a7ce7160ada49605480c48abaa14fa1 Mon Sep 17 00:00:00 2001
From: paul foster <pafoster@redhat.com>
Date: Mon, 16 Mar 2026 16:02:23 +1100
Subject: [PATCH 5/5] added acm spoke hub clusters

---
 charts/servicemesh-operator-ambient/Chart.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/servicemesh-operator-ambient/Chart.yaml b/charts/servicemesh-operator-ambient/Chart.yaml
index 5d6a5ae..d3902ee 100644
--- a/charts/servicemesh-operator-ambient/Chart.yaml
+++ b/charts/servicemesh-operator-ambient/Chart.yaml
@@ -10,4 +10,5 @@ dependencies:
     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
+  - name: rh-mobb
+  
\ No newline at end of file