cluster

commit 37c50b1b1475a7179ced639df9169cd78d5e3d9b
parent 47c8109cd5b706100f37d9e6029468d0bd74664a
Author: MTRNord <mtrnord1@gmail.com>
Date:   Thu, 26 Sep 2024 20:33:36 +0200

Fix apisix

Diffstat:
D
apps/base/apisix/dashboard.yaml
 | 
54
------------------------------------------------------
M
apps/base/apisix/kustomization.yaml
 | 
1
-
M
apps/base/apisix/release.yaml
 | 
43
++++++++++++++++++++++++++++++++++++++++++-
M
apps/base/victoria-metrics-k8s-stack/release.yaml
 | 
3
++-

4 files changed, 44 insertions(+), 57 deletions(-)
diff --git a/apps/base/apisix/dashboard.yaml b/apps/base/apisix/dashboard.yaml
@@ -1,54 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-    name: apisix-dashboard
-    namespace: apisix
-spec:
-    releaseName: apisix
-    interval: 60m
-    chart:
-        spec:
-            chart: apisix-dashboard
-            sourceRef:
-                kind: HelmRepository
-                name: apisix
-    values:
-        ingress:
-            enabled: true
-            annotations:
-                cert-manager.io/cluster-issuer: letsencrypt-dns
-                external-dns.alpha.kubernetes.io/hostname: midnightthoughts.space
-                traefik.ingress.kubernetes.io/router.pathmatcher: PathRegexp
-            hosts:
-                - host: apisix.midnightthoughts.space
-                  paths:
-                    - /*
-            tls:
-                - secretName: midnightthoughts-space-tls
-                  hosts:
-                    - apisix.midnightthoughts.space
-        config:
-            authentication:
-                users:
-                    - username: MTRNord
-                      password: ENC[AES256_GCM,data:pWI4IyKZws+0,iv:5X7hgte6ntiy8Pf2c+rUtwusd+IDiayXT0tc6eiUiJU=,tag:ZX+3hW6Ew/L3Nily5tDGZQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOMHFuTHZTb1VlZGFGM3Zt
-            VC8vUzhoWFovOWhYK0NnS1NzWnc5VXJhWXpvCmJ0Z0ZwdUVqUzloNFlRQldHZ3pW
-            U1RkVE13NGhKM0NUYkg2Z0c1YTgzbTgKLS0tIG02Y1hsU25qeU00ZUo3cmhrNWdh
-            elZ4S2hVZFBaRTgvc3c5ZXlkalJPYkEKKVAsseEunSwpqDzHhYpmXmku/bOjG6lq
-            HLq6AsCWuPevxg2nvBhUKGYt3TyikVXsLhLrUqrqmA89fqUhO6NpSg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-26T16:48:06Z"
-    mac: ENC[AES256_GCM,data:ix543arJRyqGXrrfFcH4ODV3LOF1RcU94Rwu5hcSITVpyhKO7y+IAwu1M4N0itIYRWyjmUVGPhKDmCblVEtiSpds7nM3s3JencUC/asKDngXtemEndsAUrvLNYPGnq+BINY53gYKlPcBW4MFZbsaMb6gc8ZMy7TKEvaRm0F9nj4=,iv:57OzuxrIWxFtdB2ABpzVLp4PWKmhxL2tyF7/L/1WgJo=,tag:+YEBnNDOzv3VuTVmD6gTHw==,type:str]
-    pgp: []
-    encrypted_regex: ^(admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token)$
-    version: 3.8.1
diff --git a/apps/base/apisix/kustomization.yaml b/apps/base/apisix/kustomization.yaml
@@ -4,4 +4,3 @@ namespace: apisix
 resources:
     - repository.yaml
     - release.yaml
-    - dashboard.yaml
diff --git a/apps/base/apisix/release.yaml b/apps/base/apisix/release.yaml
@@ -13,7 +13,7 @@ spec:
                 kind: HelmRepository
                 name: apisix
     values:
-        timezone: "Europe/Berlin"
+        timezone: Europe/Berlin
         service:
             type: ClusterIP
             externalTrafficPolicy: ""
@@ -25,3 +25,44 @@ spec:
         etcd:
             enabled: true
             replicaCount: 1
+        dashboard:
+            enabled: true
+            ingress:
+                enabled: true
+                annotations:
+                    cert-manager.io/cluster-issuer: letsencrypt-dns
+                    external-dns.alpha.kubernetes.io/hostname: midnightthoughts.space
+                    traefik.ingress.kubernetes.io/router.pathmatcher: PathRegexp
+                hosts:
+                    - host: apisix.midnightthoughts.space
+                      paths:
+                        - /*
+                tls:
+                    - secretName: midnightthoughts-space-tls
+                      hosts:
+                        - apisix.midnightthoughts.space
+            config:
+                authentication:
+                    users:
+                        - username: MTRNord
+                          password: ENC[AES256_GCM,data:edfqGNWxdIUi,iv:zCcstjCVAbpULKDEPzZp0tdcV88nY98JCdTvD1zoodc=,tag:g5V/ueDWMGLFFGU/oqhhTw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTSTRqQXJndEl2a2hxS2ZB
+            bFVBS3BISzZqZkRwVW1VcThTa2EwZEpKNWhvClB1MFdnU1dmbDBOY05Qc0ZCSVdW
+            UUcwbmU4MW1Kc2Z2TWFTK29TSldERzQKLS0tIGxyaXBmQWpER3dNQ0d4YWh1WnF1
+            MHQ2R2VoVENSdTliZ1hYSEUzMTUvNk0K9NZSlt1v3mPAhq/8GX2TiyFTps0eQYFV
+            3k28au3WCfI+hAvEprem1nzoQsQkJT9bEQr4CQd0pxwcfWDPBYaPUw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-09-26T18:33:17Z"
+    mac: ENC[AES256_GCM,data:PD83MfJZfgvoADqEsgid8+oNTTWrpmlIEuIr6Z+UujVyxNvhnvxpwRErr5a5ZI1TE2+TA8i4Jc/7i8Yg5RebLyFEkUzYhT/RFP1DC1H0ThrUU7f8FM1cWXUiZ64PnVrMouLk4ZQVeNGTySGU+vxTfLIuZSrBdqbJCa+tJmB68kA=,iv:RCUXmDp5O4+ayKOXXKlIzIDvEVAqmfzMD98VTLHL3BQ=,tag:G72Rs2wLc0i645eZFiIQOA==,type:str]
+    pgp: []
+    encrypted_regex: ^(admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token|integrationKey|rootPassword)$
+    version: 3.8.1
diff --git a/apps/base/victoria-metrics-k8s-stack/release.yaml b/apps/base/victoria-metrics-k8s-stack/release.yaml
@@ -837,7 +837,8 @@ spec:
                     auth_url: https://auth.midnightthoughts.space/application/o/authorize/
                     token_url: https://auth.midnightthoughts.space/application/o/token/
                     api_url: https://auth.midnightthoughts.space/application/o/userinfo/
-                    role_attribute_path: contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'
+                    role_attribute_path: contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors')
+                        && 'Editor' || 'Viewer'
             imageRenderer:
                 enabled: true
         kubeProxy: