From bb45328532dfeaf980025e57ba9c8589b34c7118 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Sun, 30 Mar 2025 16:10:40 +0200
Subject: [PATCH] Trying to migrate istio

---
 helmfiles/system.yaml                         | 19 +++++++++++++++++++
 installations/system/helmfile.yaml            | 18 ------------------
 .../kube-system/namespaces/values.yaml        |  3 ++-
 values/badhouseplants/values.istiod.yaml      | 13 -------------
 .../istio-system/istio-base/values.yaml       |  3 +++
 .../common/istio-system/istiod/values.gotmpl  | 19 +++++++++++++++++++
 .../kube-system/namespaces/values.yaml        |  2 ++
 7 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 values/common/istio-system/istio-base/values.yaml
 create mode 100644 values/common/istio-system/istiod/values.gotmpl

diff --git a/helmfiles/system.yaml b/helmfiles/system.yaml
index 9dd9aa2..7f93f09 100644
--- a/helmfiles/system.yaml
+++ b/helmfiles/system.yaml
@@ -21,6 +21,9 @@ repositories:
     url: https://vmware-tanzu.github.io/helm-charts/
   - name: openebs
     url: https://openebs.github.io/openebs
+  - name: istio
+    url: https://istio-release.storage.googleapis.com/charts
+
 releases:
   - name: coredns
     chart: coredns/coredns
@@ -157,3 +160,19 @@ releases:
       - template: common-values-tpl
       - template: env-values
       - template: env-secrets
+
+  - name: istio-base
+    chart: istio/base
+    condition: istio.enabled
+    namespace: istio-system
+    inherit:
+      - template: common-values
+
+  - name: istiod
+    chart: istio/istiod
+    condition: istio.enabled
+    namespace: istio-system
+    inherit:
+      - template: common-values-tpl
+    needs:
+      - istio-system/istio-base
diff --git a/installations/system/helmfile.yaml b/installations/system/helmfile.yaml
index 43b852a..8572e88 100644
--- a/installations/system/helmfile.yaml
+++ b/installations/system/helmfile.yaml
@@ -25,24 +25,6 @@ repositories:
     url: https://zotregistry.dev/helm-charts/
 
 releases:
-  - name: velero
-    chart: vmware-tanzu/velero
-    namespace: velero
-    version: 8.5.0
-    condition: velero.enabled
-    inherit:
-      - template: default-env-values
-      - template: default-env-secrets
-      - template: crd-management-hook
-
-  - name: openebs
-    chart: openebs/openebs
-    condition: openebs.enabled
-    namespace: kube-system
-    version: 4.2.0
-    inherit:
-      - template: default-env-values
-
   - name: istio-base
     chart: istio/base
     condition: istio.enabled
diff --git a/values/badhouseplants/kube-system/namespaces/values.yaml b/values/badhouseplants/kube-system/namespaces/values.yaml
index 5616e22..489d0a8 100644
--- a/values/badhouseplants/kube-system/namespaces/values.yaml
+++ b/values/badhouseplants/kube-system/namespaces/values.yaml
@@ -9,9 +9,10 @@ namespaces:
   - name: observability
   - name: databases
   - name: istio-system
+    defaultRegcred: true
   - name: applications
     labels:
-      istio-injection: disabled
+      istio-injection: enabled
   - name: platform
     defaultRegcred: true
   - name: games
diff --git a/values/badhouseplants/values.istiod.yaml b/values/badhouseplants/values.istiod.yaml
index def0105..e69de29 100644
--- a/values/badhouseplants/values.istiod.yaml
+++ b/values/badhouseplants/values.istiod.yaml
@@ -1,13 +0,0 @@
-pilot:
-  resources:
-    requests:
-      cpu: 50m
-      memory: 2048Mi
-global:
-  proxy:
-    resources:
-      requests:
-        cpu: 20m
-        memory: 128Mi
-      limits:
-        memory: 128Mi
diff --git a/values/common/istio-system/istio-base/values.yaml b/values/common/istio-system/istio-base/values.yaml
new file mode 100644
index 0000000..b729dfb
--- /dev/null
+++ b/values/common/istio-system/istio-base/values.yaml
@@ -0,0 +1,3 @@
+global:
+  imagePullSecrets:
+    - regcred
diff --git a/values/common/istio-system/istiod/values.gotmpl b/values/common/istio-system/istiod/values.gotmpl
new file mode 100644
index 0000000..7a52625
--- /dev/null
+++ b/values/common/istio-system/istiod/values.gotmpl
@@ -0,0 +1,19 @@
+hub: null
+global:
+ hub: my-company-private/istio
+ hub: {{ .Values.registry }}
+ imagePullSecrets:
+   - regcred
+pilot:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 2048Mi
+global:
+  proxy:
+    resources:
+      requests:
+        cpu: 20m
+        memory: 128Mi
+      limits:
+        memory: 128Mi
diff --git a/values/etersoft/kube-system/namespaces/values.yaml b/values/etersoft/kube-system/namespaces/values.yaml
index 2a3175d..9eb9ce3 100644
--- a/values/etersoft/kube-system/namespaces/values.yaml
+++ b/values/etersoft/kube-system/namespaces/values.yaml
@@ -7,3 +7,5 @@ namespaces:
     defaultRegcred: true
   - name: kyverno
     defaultRegcred: true
+  - name: istio-system
+    defaultRegcred: true