A lot of changes

2024-07-25 18:44:58 +02:00
parent 625450ca25
commit 6e08510b3d
25 changed files with 225 additions and 443 deletions
--- a/examples/merge-files/giops.config.yaml
+++ b/examples/merge-files/giops.config.yaml
@ -1,28 +0,0 @@
---
-import:
-  - ./repos-oci.yaml
-  - ./repos.yaml
-repos:
-  - name: jetstack
-    url: https://charts.jetstack.io
-  - name: bitnami-oci
-    url: oci://registry-1.docker.io/bitnamicharts
-
-releases:
-  - name: cert-manager
-    chart: jetstack
-    repo: jetstack
-    version: latest
-    namespace: cert-manager
-  - name: postgresql-server
-    chart: postgresql
-    repo: bitnami-oci
-    namespace: postgresql-server
-    version: latest
-
-clusters:
-  - name: cluster-1
-    git: git@git.badhouseplants.net:giant-swarm-task/cluster-1.git
-    releases:
-      - cert-manager
-      - postgresql-server
--- a/examples/merge-files/repos-oci.yaml
+++ b/examples/merge-files/repos-oci.yaml
@ -1,4 +0,0 @@
---
-repos:
-  - name: bitnami-oci
-    url: oci://registry-1.docker.io/bitnamicharts
--- a/examples/merge-files/repos.yaml
+++ b/examples/merge-files/repos.yaml
@ -1,4 +0,0 @@
---
-repos:
-  - name: jetstack
-    url: https://charts.jetstack.io
--- a/examples/one-config/.sops.yaml
+++ b/examples/one-config/.sops.yaml
@ -1,5 +0,0 @@
-creation_rules:
-  - path_regex: secrets/.*.yaml
-    key_groups:
-      - age:
-          - age16svfskd8x75g62f5uwpmgqzth52rr3wgv9m6rxchqv6v6kzmzf0qvhr2pk
--- a/examples/one-config/giops.config.yaml
+++ b/examples/one-config/giops.config.yaml
@ -1,38 +0,0 @@
---
-repositories:
-  - name: bitnami-oci
-    url: oci://registry-1.docker.io/bitnamicharts
-
-releases:
-  - name: postgresql-server-2
-    chart: postgresql
-    repository: bitnami-oci
-    namespace: postgresql-server
-    version: latest
-    values:
-      - ./values/postgresql.yaml
-    secrets: 
-      - ./secrets/postgresql.yaml
-  - name: postgresql-server
-    chart: postgresql
-    repository: bitnami-oci
-    namespace: postgresql-server
-    version: latest
-    values:
-      - ./values/postgresql.yaml
-    secrets: 
-      - ./secrets/postgresql.yaml
-
-clusters:
-  - name: cluster-shoebill-test
-    git: git@git.badhouseplants.net:allanger/shoebill-test.git
-    dotsops: |
-      creation_rules:
-        - path_regex: secrets/.*.yaml
-          key_groups:
-          - age:
-            - age16svfskd8x75g62f5uwpmgqzth52rr3wgv9m6rxchqv6v6kzmzf0qvhr2pk
-    provider: flux
-    releases:
-      - postgresql-server-2
-      - postgresql-server
--- a/examples/one-config/helmfile.yaml
+++ b/examples/one-config/helmfile.yaml
@ -1,140 +0,0 @@
---
-repositories:
-  - name: fluxcd-community
-    url: https://fluxcd-community.github.io/helm-charts
-
-
-releases:
-  # ---------------------------------
-  # -- FLUX
-  # ---------------------------------
-  - name: flux
-    namespace: flux-system
-    installed: true
-    createNamespace: true
-    chart: fluxcd-community/flux2
-
-  - <<: *metrics-server
-    installed: true
-    namespace: kube-system
-    createNamespace: false
-
-  - <<: *istio-base
-    installed: true
-    namespace: istio-system
-    createNamespace: false
-  
-  - <<: *istio-gateway
-    installed: true
-    namespace: istio-system
-    createNamespace: false
-
-  - <<: *istiod
-    installed: true
-    namespace: istio-system
-    createNamespace: false
-
-  - <<: *cert-manager
-    installed: true
-    namespace: cert-manager
-    createNamespace: false
-
-  - <<: *minio
-    installed: true
-    namespace: minio-service
-    createNamespace: false
-
-  - <<: *openvpn
-    installed: true
-    namespace: openvpn-service
-    createNamespace: false
-  
-  - <<: *metallb
-    installed: true
-    namespace: metallb-system
-    createNamespace: true
-
-  - <<: *drone
-    installed: true
-    namespace: drone-service
-    createNamespace: false
-
-  - <<: *drone-runner-docker
-    installed: true
-    namespace: drone-service
-    createNamespace: false
-
-  - <<: *longhorn
-    installed: true
-    namespace: longhorn-system
-    createNamespace: false
-
-  - <<: *argocd
-    installed: true
-    namespace: argo-system
-    createNamespace: false
-
-  - <<: *nrodionov
-    installed: true
-    namespace: nrodionov-application
-    createNamespace: false
-
-  - <<: *minecraft
-    installed: true
-    namespace: minecraft-application
-    createNamespace: false
-
-  - <<: *gitea
-    installed: true
-    namespace: gitea-service
-    createNamespace: false
-
-  - <<: *funkwhale
-    installed: true
-    namespace: funkwhale-application
-    createNamespace: false
-
-  - <<: *prometheus
-    installed: true
-    namespace: monitoring-system
-    createNamespace: true
-
-  - <<: *loki
-    installed: false
-    namespace: monitoring-system
-    createNamespace: false
-
-  - <<: *promtail
-    installed: false
-    namespace: monitoring-system
-    createNamespace: false
-
-  - <<: *bitwarden
-    installed: true
-    namespace: bitwarden-application
-    createNamespace: true
-
-  - <<: *redis
-    installed: true
-    namespace: database-service
-    createNamespace: true
-
-  - <<: *postgres16
-    installed: true
-    namespace: database-service
-    createNamespace: true
-
-  - <<: *db-operator
-    installed: true
-    namespace: database-service
-    createNamespace: true
-
-  - <<: *db-instances
-    installed: true
-    namespace: database-service
-    createNamespace: true
-
-  - <<: *mysql
-    installed: true
-    namespace: database-service
-    createNamespace: true
--- a/examples/one-config/keys.txt
+++ b/examples/one-config/keys.txt
@ -1,3 +0,0 @@
-# created: 2023-09-25T10:45:28+02:00
-# public key: age16svfskd8x75g62f5uwpmgqzth52rr3wgv9m6rxchqv6v6kzmzf0qvhr2pk
-AGE-SECRET-KEY-1Y3FGYSHKWSSZ3G8DJ3QD7WKE5J0TTYDWSSD95EXL4A308ZWW0L9SN99ASP
--- a/examples/one-config/secrets/postgresql.yaml
+++ b/examples/one-config/secrets/postgresql.yaml
@ -1,24 +0,0 @@
-global:
-    postgresql:
-        auth:
-            password: ENC[AES256_GCM,data:5QV6a1A=,iv:utR62wuLTzwihVwXXPw8DA2Ul7kfU1YgAKteRA+WKm0=,tag:EYuIa6TDmxaR0PSuaJBeBA==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age16svfskd8x75g62f5uwpmgqzth52rr3wgv9m6rxchqv6v6kzmzf0qvhr2pk
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2SUJpdUtYWjF3K1dzbGc3
-            Z2U0UDVpWmVkYXVvT1V3UWVDM2VTQ1hBU1RBCmFZMlI4ZWxWTTdCd05lVFVCN2hN
-            QkZKRmlFVStXT2kxSVlUNmU0VkZCUDQKLS0tIEQ2aXZ0ZDVXcGc4RE1WMmtOaTV3
-            TDloa0dHTFhyUWhid1V0aEFydmtQbU0Kwkw914se9cGEN4FKNphuJErdC1QlYqRQ
-            +CInCnoy8m0/MZNhehZ/JVReEys6KDNxJ7RhnoRfs7P7wfAgBg984A==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-10-11T11:13:13Z"
-    mac: ENC[AES256_GCM,data:olaWkaoqqoStswMNNUY6IljoriMgpWxhQ4f0AiRkiujat7ySjuUlS/gwBO1FQp+iB1XGnZKznOWDmZn8XEoFY6q+2dgrtA+h5fTI/EshPgX8xONsGH25Chhg2ER1FMKj8jOYEzxSJfW9s3oKyFGXAH/OgLMpZBkq2uc+eM83J2w=,iv:3fs4BEeFuWU2Nd8yC9iM89a6sz11izIfx3fLI5+1eJU=,tag:Y6ESSNnm2t9zGHG57qrQaQ==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.0
--- a/examples/one-config/values/postgresql.yaml
+++ b/examples/one-config/values/postgresql.yaml
@ -1,6 +0,0 @@
---
-global:
-  postgresql:
-    auth:
-      username: check
-      database: check
--- a/examples/secrets.postgres.yaml
+++ b/examples/secrets.postgres.yaml
@ -0,0 +1,24 @@
+global:
+    postgresql:
+        auth:
+            postgresPassword: ENC[AES256_GCM,data:PC+kyanM5L3/ztbA+LY=,iv:LEKwP9iImZdZ+TBfRrgkkwGefFFwSnWmxAWRoTgfzyE=,tag:YkxzpTwV6Dp4onPLmKBWdQ==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1htrz6hfc29ww5mypa3hy3ds6558ydgjletsrahj3h3mrgc2xgcwqpe2c7p
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWTzFhdHZ6dDNnN3pGRU1V
+            b0NjWFpwZkRnZUhNMjEra2dsbGZMV1M3NTBrCm9nTnZ6aUpJOXMwN3NDME9XdStL
+            Y2dJQ1E5TDl0T2JuZFhuSmxVUU9Sd2cKLS0tIEV3KzU1M20zdFVPOGFibTVHVDM5
+            YXUzdDl1WDlBeno3OHBDN0FqeVdFM0EKtEWO6z5zPK5kEoRqyNovxW67bdxc2evZ
+            9EzpmzIjwVoW91Ji7CPO4so12SPd0fqZ1C2sOr8KHf6v88oWknTmTQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-07-25T15:20:34Z"
+    mac: ENC[AES256_GCM,data:8qvcmX0WeROQEiQkkoFk+mY8Ze0sePKLmCKeDwBqvLge/c3oDXzWf07qMmiErDxWtCME9eQpzZkjC9dTvBgYYpfHz24cBfoH4swlXkhPbk26iKYXQIOK1+1SSf6rtsmFjkjylmM1u4yRXuwJZ8pGCu5av1h0edo5jMJLWBS78cA=,iv:OImdF6MvYSliA/OapIGtIX3pbvUFKgfvNCQYBQmwwVc=,tag:qos90QWOn2p5QOZLZMtoOw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0
--- a/examples/values-config/shoebill.config.yaml
+++ b/examples/values-config/shoebill.config.yaml
@ -1,20 +0,0 @@
---
-repositories:
-  - name: bitnami-oci
-    url: oci://registry-1.docker.io/bitnamicharts
-
-releases:
-  - name: postgresql-server
-    chart: postgresql
-    repository: bitnami-oci
-    namespace: postgresql-server
-    version: latest
-    values:
-      - ./values/postgresql.yaml
-
-clusters:
-  - name: cluster-shoebill-test
-    git: git@git.badhouseplants.net:allanger/shoebill-test.git
-    provider: flux
-    releases:
-      - postgresql-server
--- a/examples/values.postgres.yaml
+++ b/examples/values.postgres.yaml
@ -0,0 +1,12 @@
+
+architecture: standalone
+
+auth:
+  database: postgres
+
+primary:
+  persistence:
+    size: 1Gi
+
+metrics:
+  enabled: false