From 2c0f498611e584a0466762a605729116ba99f749 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Sun, 30 Mar 2025 18:18:28 +0200
Subject: [PATCH] Update memos lib

---
 common/environments.yaml                      |  2 +-
 helmfiles/system.yaml                         |  2 ++
 .../applications/helmfile-badhouseplants.yaml |  2 +-
 .../kube-system/namespaces/values.yaml        |  1 +
 values/badhouseplants/values.memos.yaml       | 22 ++++++++++------
 .../common/istio-system/istiod/values.gotmpl  | 25 ++++++++-----------
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/common/environments.yaml b/common/environments.yaml
index c43d5a0..b7b036b 100644
--- a/common/environments.yaml
+++ b/common/environments.yaml
@@ -2,7 +2,7 @@ environments:
   badhouseplants:
     kubeContext: badhouseplants
     values:
-      - ./common/values/values.badhouseplants.yaml
+      #- ./common/values/values.badhouseplants.yaml
       - base:
           enabled: true
       - velero:
diff --git a/helmfiles/system.yaml b/helmfiles/system.yaml
index 7f93f09..5f34ccf 100644
--- a/helmfiles/system.yaml
+++ b/helmfiles/system.yaml
@@ -165,6 +165,7 @@ releases:
     chart: istio/base
     condition: istio.enabled
     namespace: istio-system
+    version: 1.25.1
     inherit:
       - template: common-values
 
@@ -172,6 +173,7 @@ releases:
     chart: istio/istiod
     condition: istio.enabled
     namespace: istio-system
+    version: 1.25.1
     inherit:
       - template: common-values-tpl
     needs:
diff --git a/installations/applications/helmfile-badhouseplants.yaml b/installations/applications/helmfile-badhouseplants.yaml
index f22be89..058297d 100644
--- a/installations/applications/helmfile-badhouseplants.yaml
+++ b/installations/applications/helmfile-badhouseplants.yaml
@@ -111,7 +111,7 @@ releases:
 
   - name: memos
     chart: allangers-charts/memos
-    version: 0.2.0
+    version: 0.3.0
     namespace: applications
     inherit:
       - template: default-env-values
diff --git a/values/badhouseplants/kube-system/namespaces/values.yaml b/values/badhouseplants/kube-system/namespaces/values.yaml
index 489d0a8..77e3837 100644
--- a/values/badhouseplants/kube-system/namespaces/values.yaml
+++ b/values/badhouseplants/kube-system/namespaces/values.yaml
@@ -11,6 +11,7 @@ namespaces:
   - name: istio-system
     defaultRegcred: true
   - name: applications
+    defaultRegcred: true
     labels:
       istio-injection: enabled
   - name: platform
diff --git a/values/badhouseplants/values.memos.yaml b/values/badhouseplants/values.memos.yaml
index 573e890..be0d106 100644
--- a/values/badhouseplants/values.memos.yaml
+++ b/values/badhouseplants/values.memos.yaml
@@ -7,14 +7,22 @@ ext-database:
   credentials:
     MEMOS_DRIVER: postgres
     MEMOS_DSN: "{{ .Protocol }}://{{ .Username }}:{{ .Password }}@{{ .Hostname }}:{{ .Port }}/{{ .Database }}?sslmode=disable"
+base:
+  workload:
+    containers:
+      memos:
+        envFrom:
+          main: {}
+          raw:
+            - secretRef:
+                name: memos-postgres16-creds
 
-workload:
-  containers:
-    memos:
-      envFrom:
-        - main
-        - secretRef:
-            name: memos-postgres16-creds
+storage:
+  data:
+    metadata:
+      annotations:
+        volume.kubernetes.io/selected-node: bordeaux
+    storageClassName: openebs-hostpath
 ingress:
   main:
     annotations:
diff --git a/values/common/istio-system/istiod/values.gotmpl b/values/common/istio-system/istiod/values.gotmpl
index 7a52625..8bc9e8f 100644
--- a/values/common/istio-system/istiod/values.gotmpl
+++ b/values/common/istio-system/istiod/values.gotmpl
@@ -1,19 +1,16 @@
-hub: null
-global:
- hub: my-company-private/istio
- hub: {{ .Values.registry }}
- imagePullSecrets:
-   - regcred
 pilot:
   resources:
     requests:
       cpu: 50m
-      memory: 2048Mi
+      memory: 256Mi
 global:
-  proxy:
-    resources:
-      requests:
-        cpu: 20m
-        memory: 128Mi
-      limits:
-        memory: 128Mi
+ hub: {{ .Values.registry }}/istio
+ imagePullSecrets:
+   - regcred
+ proxy:
+   resources:
+     requests:
+       cpu: 20m
+       memory: 54Mi
+     limits:
+       memory: 54Mi