From d376b850e025d081d27241b215be1ef7c5a6b06d Mon Sep 17 00:00:00 2001
From: "J. Harte" <13206585+boonware@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:17:19 +0000
Subject: [PATCH 1/2] wip

---
 .../07-non-shared-cluster-addon.yaml          | 21 +++++++++++++++++++
 .../130-ibm-mas-suite/values.yaml             |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml

diff --git a/instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml b/instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml
new file mode 100644
index 000000000..5fafb3516
--- /dev/null
+++ b/instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml
@@ -0,0 +1,21 @@
+---
+{{- if (eq .Values.non_shared_cluster_addon_enabled "true") }}
+apiVersion: addons.mas.ibm.com/v1
+kind: GenericAddon
+metadata:
+  name: "{{ .Values.instance_id }}-addons-non-shared-cluster"
+  annotations:
+    argocd.argoproj.io/sync-wave: "134" # CRD is in ibm-mas operator
+  labels:
+    mas.ibm.com/configScope: system # correct ???
+    mas.ibm.com/instanceId: {{ .Values.instance_id }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  displayName: Non-Shared Cluster
+  addonType: non-shared-cluster
+  config:
+    instances:
+      - name: {{ MAS Application ID }} # TODO what goes here?
+{{- end }}
diff --git a/instance-applications/130-ibm-mas-suite/values.yaml b/instance-applications/130-ibm-mas-suite/values.yaml
index bd32ab880..39e195843 100644
--- a/instance-applications/130-ibm-mas-suite/values.yaml
+++ b/instance-applications/130-ibm-mas-suite/values.yaml
@@ -1,3 +1,4 @@
 ---
 instance_id: xxx
 ibm_entitlement_key: xxxx
+non_shared_cluster_addon_enabled: "false"

From bdf6da28d6cebef73dbde0ca369ba8d526e98bf5 Mon Sep 17 00:00:00 2001
From: "J. Harte" <13206585+boonware@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:30:19 +0000
Subject: [PATCH 2/2] add property

---
 .../ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml
index 1d654766c..608713bbf 100644
--- a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml
@@ -42,6 +42,7 @@ spec:
             region_id: "{{ .Values.region.id }}"
             cluster_id: "{{ .Values.cluster.id }}"
             instance_id: "{{ .Values.instance.id }}"
+            non_shared_cluster_addon_enabled: "{{ .Values.cluster.is_non_shared_cluster }}"
             sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}"
             sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}"
             sm_aws_region: "{{ .Values.region.id }}"