From 21ec47187f3ac30387750e74919288cafe0aa921 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Thu, 12 Sep 2024 13:42:42 +1000
Subject: [PATCH 1/2] add auth creds for ec-config-server

---
 .../templates/ec-config-server-auth.yaml           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml

diff --git a/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml b/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml
new file mode 100644
index 0000000..416122b
--- /dev/null
+++ b/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: Prune=false
+    sealedsecrets.bitnami.com/cluster-wide: "true"
+    sealedsecrets.bitnami.com/managed: "true"
+  creationTimestamp: null
+  name: ec-config-server-auth-secrets
+  namespace: ecproj
+type: Opaque
+stringData:
+  CONFIG_SERVER_USERNAME: "ec-config"
+  CONFIG_SERVER_PASSWORD: "d9Ur8@Zf2^l4Gb^@E^"
\ No newline at end of file

From a5126d36362ad731ee1b3b7067eeacfbd2b640c2 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Thu, 12 Sep 2024 13:43:50 +1000
Subject: [PATCH 2/2] config auth creds for ec-config-server

---
 .../env/k3s-cluster/kustomization.yaml        |  2 +-
 .../env/k3s-cluster/values.yaml               |  3 +++
 .../templates/ec-config-server-auth.yaml      | 27 ++++++++++++-------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/apps/ec-config-server/env/k3s-cluster/kustomization.yaml b/apps/ec-config-server/env/k3s-cluster/kustomization.yaml
index 40134de..acf1ef1 100644
--- a/apps/ec-config-server/env/k3s-cluster/kustomization.yaml
+++ b/apps/ec-config-server/env/k3s-cluster/kustomization.yaml
@@ -3,6 +3,6 @@ kind: Kustomization
 helmCharts:
   - name: ec-config-server
     repo: https://chartmuseum.cluster.edward.sydney:8899/
-    version: 1.0.11
+    version: 1.0.12
     releaseName: ec-config-server
     valuesFile: values.yaml
\ No newline at end of file
diff --git a/apps/ec-config-server/env/k3s-cluster/values.yaml b/apps/ec-config-server/env/k3s-cluster/values.yaml
index 00f7178..d28496f 100644
--- a/apps/ec-config-server/env/k3s-cluster/values.yaml
+++ b/apps/ec-config-server/env/k3s-cluster/values.yaml
@@ -1,3 +1,6 @@
+environment:
+  configServerAuth:
+    existingSecret: ec-config-server-auth-secrets
 service:
   type: LoadBalancer
 spring:
diff --git a/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml b/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml
index 416122b..96a0ff1 100644
--- a/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml
+++ b/resources/app-secrets/env/k3s-cluster/templates/ec-config-server-auth.yaml
@@ -1,14 +1,23 @@
-apiVersion: v1
-kind: Secret
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
 metadata:
   annotations:
-    argocd.argoproj.io/sync-options: Prune=false
     sealedsecrets.bitnami.com/cluster-wide: "true"
-    sealedsecrets.bitnami.com/managed: "true"
   creationTimestamp: null
   name: ec-config-server-auth-secrets
-  namespace: ecproj
-type: Opaque
-stringData:
-  CONFIG_SERVER_USERNAME: "ec-config"
-  CONFIG_SERVER_PASSWORD: "d9Ur8@Zf2^l4Gb^@E^"
\ No newline at end of file
+  namespace: ec-proj
+spec:
+  encryptedData:
+    CONFIG_SERVER_PASSWORD: AgB1u8eC5+Nvzs4rSEWLZgnPQqvdT0pSvsC6maiwUMhqbYwG5MZVTdjxG6NqCQ42kRdHOpXB68BNClF6mxCevz4xBvIjyIVNdAdxSGpTVtRjqT9oxCdmSXvfWwPDOBQEdq71hpqj1gN+FahwrQ2tRzeRzOca7r+XzU0HR5JC0IJlE5f1BE9S8v+ONI+6VKL7hXGgLqR9S4Cx4TajdmcSuzwkgiLXao8qHjkZpC7Uw9m659AL+iC7FDj2cJuD9CWHzz3Knvx0HmyTLGz1V2GKtQ7lSzdVFsaik0WjT3N8z0pBnIvSpLgR+VPdGXcOXGvP3JzCH7a1MfMRCHVtu+GRDbultKUxc351zZf7/c0SsRoZ/T0PZURIMQA0QUe8BxOg4X9APJWNSBD+kMSvuizsOnIV/T1AIVOtdRc6BidrrgB2UM5/dQ75K1cNHyM5tAQYT3ELCZ7HLTY+F65szVCQJHOycLwGqPOA2funqVh+KLDYURugbZcHTP6xoBpjSpWcIZg8NvweZG1ptF3q8effZJA6hF7MUizAnv3CZq+GttPJEsMjukkCxQ5tIpo6FU4hsf19Su5UQnyXghN+bYHvM/QQ3+2bF79THVuMTG6jgoOUI3V+UH6ZRkFjdXV6EgrBF6vBmtLbMG+gWkBC2x6uwKZWky0msbB2gzX/LVr8DHXxK3BJaHeflSf/3c4SDE9Kaz5e+yLk/GG3/Is5D9xvaDI5NSI=
+    CONFIG_SERVER_USERNAME: AgBti2F6j4qYE3WbK+GSfFtrwXHB2BIJRwFh4apXRGjdkGtmM/jsEJqFk1ptzOnJTVFYQ3FYZX6n3wpzEAkwQfnH/quzbIAY5CjwWPps1KiuMMe7uf1HqgrdCggCsuOxnrzdLF1gS6kzoERGyRsNLGA5rrTAxeNU7Hcunwh5VAdadAbyjk11UJWU64osOWNE3Dw2pv01YwdCNi0cILlsLSVyfgUE3+YK0ntRoiaZkb0dF3E8jl6OkwDAAdMTKfyjKblMaD6+v3dAlZSpdeKoWjX87XGX1BpCqqAk+JbqPOhZX0YKJjuGLIpnaSceRQyr33vW9babumXNMiy5quUGE4aVb4MWTAJVihnHnDPzAMRC/SqoCnGzVEO/ckg52UNttklbSS5dT0yApIrvCrRrrVe5U2PAPrp0tGrtjPZIfT5Y1CvnEcNtoU+sE6haeDNuI4JArEtcZCHGfWesg/73Sh4BpJ/dgNYtxwkEDGlzdSn6FiWbae1VBkH6R0/NvMp6K7hZyYlpR1c8IKVag/huOEKFqRtaG3q5cHShstRfwoYnK69ixAEKchpmq3SDy+gH8TRkbs9+fU6KEueGOvBVx1pplUJPNptSiRIgfrGSeMRLPV5qK7e3LlOFMNQBke+2a3MmVfMdfrOTviXmUnHlIAjuXpBDne74jI2qOtRVwHEqsW/Fz68CyvRTvR/GjY8gO0+OrqAdJzRac5I=
+  template:
+    metadata:
+      annotations:
+        argocd.argoproj.io/sync-options: Prune=false
+        sealedsecrets.bitnami.com/cluster-wide: "true"
+        sealedsecrets.bitnami.com/managed: "true"
+      creationTimestamp: null
+      name: ec-config-server-auth-secrets
+      namespace: ec-proj
+    type: Opaque