Run tf-ocloud in the etersoft cluster

Close the obsolete xray port on traefik
Add basic auth to loki
2024-11-17 21:57:08 +01:00 · 2024-11-17 21:56:31 +01:00 · 2024-11-17 21:56:07 +01:00 · 2024-11-17 21:55:35 +01:00 · 2024-11-17 21:55:12 +01:00 · 2024-11-17 21:54:54 +01:00
28 changed files with 467 additions and 37 deletions
--- a/common/environments.yaml
+++ b/common/environments.yaml
@ -2,6 +2,8 @@ environments:
  badhouseplants:
    kubeContext: badhouseplants
    values:
+      - base:
+          enabled: true
      - velero:
          enabled: true
      - workload:
@ -23,6 +25,8 @@ environments:
  etersoft:
    kubeContext: etersoft
    values:
+      - base:
+          enabled: true
      - velero:
          enabled: false
      - workload:
@ -41,3 +45,49 @@ environments:
          enabled: true
      - istio:
          enabled: false
+  xray-1:
+    kubeContext: xray-1
+    values:
+      - base:
+          enabled: false
+      - velero:
+          enabled: false
+      - workload:
+          enabled: false
+      - backups:
+          enabled: false
+      - openebs:
+          enabled: false
+      - localpath:
+          enabled: false
+      - postgres17:
+          enabled: false
+      - redis:
+          enabled: false
+      - postgres16:
+          enabled: false
+      - istio:
+          enabled: false
+  xray-2:
+    kubeContext: xray-2
+    values:
+      - base:
+          enabled: false
+      - velero:
+          enabled: false
+      - workload:
+          enabled: false
+      - backups:
+          enabled: false
+      - openebs:
+          enabled: false
+      - localpath:
+          enabled: false
+      - postgres17:
+          enabled: false
+      - redis:
+          enabled: false
+      - postgres16:
+          enabled: false
+      - istio:
+          enabled: false
--- a/common/extensions/self-signed-cert.yaml
+++ b/common/extensions/self-signed-cert.yaml
@ -0,0 +1,13 @@
+ext-self-signed-cert:
+  templates:
+    - |
+      ---
+      apiVersion: v1
+      kind: Secret
+      metadata:
+        name: {{ .Values.name }}
+      data:
+        {{- $ca := genCA .Values.domain 365 -}}
+        {{- $cert := genSignedCert .Values.domain nil (list .Values.domain ) 365 $ca }}
+        tls.crt: {{ $cert.Cert | b64enc }}
+        tls.key: {{ $cert.Key | b64enc }}
--- a/common/templates.yaml
+++ b/common/templates.yaml
@ -125,3 +125,10 @@ templates:
        alias: ext-cilium
    values:
      - '{{ requiredEnv "PWD" }}/values/common/values.ext-cilium.yaml'
+  ext-self-signed-cert:
+    dependencies:
+      - chart: bedag/raw
+        version: 2.0.0
+        alias: ext-self-signed-cert
+    values:
+      - '{{ requiredEnv "PWD" }}/common/extensions/self-signed-cert.yaml'
--- a/installations/applications/helmfile-badhouseplants.yaml
+++ b/installations/applications/helmfile-badhouseplants.yaml
@ -43,15 +43,6 @@ releases:
      - template: default-env-secrets
      - template: ext-database
      - template: ext-tcp-routes
-  - name: nrodionov
-    chart: bitnami/wordpress
-    version: 23.1.28
-    namespace: applications
-    installed: false
-    inherit:
-      - template: default-env-values
-      - template: default-env-secrets
-      - template: ext-database
  - name: openvpn
    chart: allangers-charts/openvpn
    version: 0.0.2
@ -82,15 +73,6 @@ releases:
    inherit:
      - template: default-env-values
      - template: ext-traefik-middleware
-  - name: server-xray
-    chart: allangers-charts/server-xray
-    installed: false
-    namespace: applications
-    version: 0.3.0
-    inherit:
-      - template: default-env-secrets
-      - template: default-env-values
-      - template: ext-tcp-routes
  - name: server-xray-public
    chart: allangers-charts/server-xray
    namespace: public-xray
@ -100,13 +82,12 @@ releases:
      - template: default-env-values
      - template: ext-tcp-routes
      - template: ext-cilium
-      - template: ext-istio-gateway
      - template: ext-certificate
-      - template: ext-istio-resource
  - name: server-xray-public-edge
    chart: allangers-charts/server-xray
+    installed: false
    namespace: public-xray
-    version: 0.3.0
+    version: 0.4.0
    inherit:
      - template: default-env-secrets
      - template: default-env-values
--- a/installations/applications/helmfile-etersoft.yaml
+++ b/installations/applications/helmfile-etersoft.yaml
@ -35,5 +35,15 @@ releases:
  - name: tf-ocloud
    chart: ../../charts/tf-ocloud
    namespace: pipelines
+    installed: false
    inherit:
      - template: default-env-secrets
+
+  - name: nrodionov
+    chart: bitnami/wordpress
+    version: 23.1.28
+    namespace: applications
+    installed: true
+    inherit:
+      - template: default-env-values
+      - template: default-env-secrets
--- a/installations/applications/helmfile-xray-1.yaml
+++ b/installations/applications/helmfile-xray-1.yaml
@ -0,0 +1,23 @@
+bases:
+  - ../../common/environments.yaml
+  - ../../common/templates.yaml
+repositories:
+  - name: allangers-charts
+    url: ghcr.io/allanger/allangers-charts
+    oci: true
+releases:
+  - name: server-xray-public
+    chart: allangers-charts/server-xray
+    namespace: public-xray
+    version: 0.4.0
+    inherit:
+      - template: default-env-secrets
+      - template: default-env-values
+      - template: ext-self-signed-cert
+  - name: promtail
+    chart: grafana/promtail
+    namespace: promtail
+    version: 6.16.6
+    inherit:
+      - template: default-env-values
+      - template: default-env-secrets
--- a/installations/applications/helmfile-xray-2.yaml
+++ b/installations/applications/helmfile-xray-2.yaml
@ -0,0 +1,16 @@
+bases:
+  - ../../common/environments.yaml
+  - ../../common/templates.yaml
+repositories:
+  - name: allangers-charts
+    url: ghcr.io/allanger/allangers-charts
+    oci: true
+releases:
+  - name: server-xray-public
+    chart: allangers-charts/server-xray
+    namespace: public-xray
+    version: 0.4.0
+    inherit:
+      - template: default-env-secrets
+      - template: default-env-values
+      - template: ext-self-signed-cert
--- a/installations/monitoring/helmfile.yaml
+++ b/installations/monitoring/helmfile.yaml
@ -31,6 +31,8 @@ releases:
    version: 6.18.0
    inherit:
      - template: default-env-values
+      - template: ext-secret
+      - template: ext-traefik-middleware
  - name: promtail
    chart: grafana/promtail
    namespace: observability
--- a/installations/system/helmfile.yaml
+++ b/installations/system/helmfile.yaml
@ -66,6 +66,7 @@ releases:
  - name: cilium
    chart: cilium/cilium
    version: 1.16.3
+    condition: base.enabled
    namespace: kube-system
    needs:
      - kube-system/coredns
@ -76,18 +77,24 @@ releases:
    chart: jetstack/cert-manager
    version: v1.16.1
    namespace: kube-system
+    condition: base.enabled
+    missingFileHandler: Warn
    needs:
      - kube-system/cilium
    inherit:
      - template: default-common-values
+      - template: default-env-values

  - name: issuer
    chart: '{{ requiredEnv "PWD" }}/charts/issuer'
    namespace: kube-public
+    missingFileHandler: Warn
+    condition: base.enabled
    needs:
      - kube-system/cert-manager
    inherit:
      - template: default-common-values
+      - template: default-env-values

  - name: metrics-server
    chart: metrics-server/metrics-server
@ -101,6 +108,7 @@ releases:
  - name: metallb
    chart: metallb/metallb
    namespace: kube-system
+    condition: base.enabled
    version: 0.14.8
    needs:
      - kube-system/cilium
@ -110,6 +118,7 @@ releases:
  - name: metallb-resources
    chart: bedag/raw
    version: 2.0.0
+    condition: base.enabled
    namespace: kube-system
    needs:
      - kube-system/metallb
@ -120,6 +129,7 @@ releases:
  - name: traefik
    chart: traefik/traefik
    version: 33.0.0
+    condition: base.enabled
    namespace: kube-system
    needs:
      - kube-system/cilium
--- a/values/badhouseplants/secrets.server-xray-public-edge.yaml
+++ b/values/badhouseplants/secrets.server-xray-public-edge.yaml
@ -1,11 +1,11 @@
 files:
    config:
-        enabled: ENC[AES256_GCM,data:KFvSrQ==,iv:PzI4x8KrwBBNr9ZQaU3CXzTQM2K248eLMBYBFmwYZgA=,tag:SyfGmYGB/ir413slfyOAfw==,type:bool]
-        sensitive: ENC[AES256_GCM,data:ylBUZtg=,iv:k2TEreAA+8zxlDxCBDB780ZzT/zHz2nsH2AUO7oOmgs=,tag:26AiIQ4iv3x3W+wUACwkMA==,type:bool]
+        enabled: ENC[AES256_GCM,data:yvmllg==,iv:dbr6u7a+CBU2Gu7hlDPZunej3aAvdP5ag0g8tltDw0E=,tag:6QDvRJSFQRx7XyffvvP50A==,type:bool]
+        sensitive: ENC[AES256_GCM,data:Jmcxu0g=,iv:mUcNzvy1JPyYbmnnEFbZ5qF3TTb7KarTHxg1lNAJzc8=,tag:MgwjG2UH7ed7wZ5lAWnmMg==,type:bool]
        remove: []
        entries:
            config.json:
-                data: ENC[AES256_GCM,data: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,iv:J7rPPMkSL3U5N8fRTcEQ8VRo+j8wnd9K/5XNLzHrU1A=,tag:dYvBZ2aNGt1Pk6wK6pcKjA==,type:str]
+                data: ENC[AES256_GCM,data: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,iv:wbMvx3ZJ1Ewv+G6mZZg1d9i+v6TZ7Pn5uXQOWmzB8FE=,tag:q1ISnMyr0PydeeksmRGiVw==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -15,14 +15,23 @@ sops:
        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZFhCcUVLbkJaeFpZS01h
-            M3BDalBwWUxOVm5IVkZtU0ZhSnlTSkdpV1N3CkFnWS9HdjNnQi9WcytNaXA4WjF1
-            aTFsUmpKbERaVDRERlNQRmNVZENTSjQKLS0tIDB1Uk5iY1Z1Y2s5Sm16Y2JGSWI3
-            Zm1Hb2l1cU1uQXd1cW8xZHlhTzkrZ2sKukSMKHaiGlZyKtF7tvZNviuD8aqe2Bc6
-            uHcJUdEz+8ZLu20D9n/vk7y3Kyzqilv+V61lU6dFreMsX6N5F1aO1w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwek5tcDJVdlFIZUllU2Ro
+            VXcxN29xQVkweGVUVnVkNml2enB1SzM1K1hjCnFoSzFZdVZ0ZGJxaDRWbkJxVUIx
+            OGc1bzhJYjBoZ0xqVFFlaWFyNEpIUTAKLS0tIDRaeUZkMG1vSEdPcmhoUFB6eWV0
+            Qys5TEZ4QUgvSjVPMzF2bE1jSTRhbHMK2wsgIFPw3Sd2JZnHr1zlZd8gSztIKhcC
+            s084/p78AnUluGef7L74d7XYC2sy1DA61GQsbtSOGSxCC1T2HGGBrQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-10-30T12:14:23Z"
-    mac: ENC[AES256_GCM,data:t2v/A2Rj6pBZEtF1lXSk9cFKcpDyCmttbMqthlo7as6PGAylh1dq3Yylh5z3PgOogGlSOLtaI2iwD0HpkV8cgABxx4RwJ93pX6rWZd5UNL5zC/na6gZJufwqt/LZUBQ+ZeN6QYiBDB5P7pOiQdaA+YEg8HabSgHXidpJasMVynA=,iv:+8NzhxP/D9yomND5ZJAYvxjfCNoqAH2Y2HOTcDw4Wcc=,tag:XcXRterzuZWWSjx8am5jOw==,type:str]
+        - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGaUNZcE1EU1MwMEZLQk1Q
+            S0w1aTVDRmhvOHh0UDkxVlZxZW5BcmZRTlRvClpsOE8zUGFuQUVJbWRZK00wS1Bn
+            ZTMraHRsRzJQRExiMVNiSzlCcHEwWFEKLS0tIFFUZlZjeTd6VFhMYVVka05VN2t0
+            ZGJidzZYWGQ4TlR6dExCaE5pbzdVWFkKFejs1mMHYv6TUTpvbnixc8FZr+n38bkT
+            gl/hd+CHUI9zHfQnuXbSDmZ1Yi4yH2kfuG0r593l9bD2W1rHnm1/Jw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-13T13:33:31Z"
+    mac: ENC[AES256_GCM,data:vaUEvsa+etVXquz5vAHtjnkm5K8VsbixVFNJ0+qVRouHwUQfrcHJA6oNEH3OqZWZKGqwNA/4eK6fQVMb2xQN/IsE3J9iHX9cWsVSrgO1dcZcfHfdPeOtnpGyMj+vCD5EBOaJ9KL7VC8AbKR1Jg9jg1vonoyOxF7i767vj2slOpk=,iv:hsWLRV0qAATS8U5A81BKa5UiKoycmHDFEOp1aSB749w=,tag:BziJDRdzrL/3TbhQuX6hIQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.9.1
--- a/values/badhouseplants/values.loki.yaml
+++ b/values/badhouseplants/values.loki.yaml
@ -1,3 +1,17 @@
+ext-secret:
+  enabled: true
+  name: loki-basic-auth
+  data:
+    users: |
+      loki:$apr1$YmrcEKi7$9SdBV36OV1ZT0NdppklWf/
+middleware:
+  enabled: true
+  middlewares:
+    - name: lokiauth
+      spec:
+        basicAuth:
+          secret: loki-basic-auth
+
 global:
  dnsService: "coredns"
 deploymentMode: SingleBinary
@ -55,3 +69,20 @@ bloomCompactor:
  replicas: 0
 bloomGateway:
  replicas: 0
+ingress:
+  enabled: true
+  ingressClassName: traefik
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.global-static-ip-name: ""
+    cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
+    traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
+    external-dns.alpha.kubernetes.io/ingress-hostname-source: defined-hosts-only
+    traefik.ingress.kubernetes.io/router.middlewares: observability-lokiauth@kubernetescrd
+  hosts:
+    - loki.badhouseplants.net
+  tls:
+    - secretName: loki.badhouseplants.net
+      hosts:
+        - loki.badhouseplants.net
--- a/values/badhouseplants/values.traefik.yaml
+++ b/values/badhouseplants/values.traefik.yaml
@ -29,12 +29,6 @@ ports:
      default: true
    exposedPort: 1194
    protocol: TCP
-  xray:
-    port: 1195
-    expose:
-      default: true
-    exposedPort: 1195
-    protocol: TCP
  xray-public:
    port: 27015
    expose:
--- a/values/etersoft/secrets.nrodionov.yaml
+++ b/values/etersoft/secrets.nrodionov.yaml
@ -0,0 +1,26 @@
+wordpressPassword: ENC[AES256_GCM,data:gcJ3cydOr0yTA/LbD6ecBn5cPzqceyGxvvQH/W4K,iv:rBoZO+SfjZlL0I0J3s9vWeg4LZd5M8O8INtODtFGHYM=,tag:xqpU75vR+U93UsFc4Qpuyg==,type:str]
+wordpressEmail: ENC[AES256_GCM,data:dO1PeBajNORU6K3JeRvg/EQufCtbviYVhhZR,iv:nyvjhPcikx9EBRfofw525PIK9Kgp2tFWiHS711YtAT4=,tag:9hajAZ6VPJvg8VX+kv+P/A==,type:str]
+mariadb:
+    auth:
+        rootPassword: ENC[AES256_GCM,data:eb9XO3OtvYsD8kgirYMhLQZIVOc1N9stv0P84Z7e,iv:6gymI9CWLmNOfpB0e9ZyjV5mXenwYdhHqV2MrHEGr3Q=,tag:3MSws+HfC1inlYk4rKOdGA==,type:str]
+        password: ENC[AES256_GCM,data:KLwfn3vmMcysP4xA2KYSHXnw3Rq7ptqmrA7TRCCN,iv:gjFaO3TJwGhIh3tKH0WbZHaT4FKDMbU8rNF2hLg2If8=,tag:dMNOks45rnK3x+pwYnCn6A==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZcmVNaGF1eWtQWEZ4QnE1
+            eWN1aTBZamR4NHRjMlBjQi9DSnF6YTVaT2c0CkxMRGVNbGI0K1crMitUTkxHeGlz
+            K282Rk9wendTZGYrZTVqWDl2d0F0TVEKLS0tIDhYMFZGaWFkQ255M2d1OHNuNGJ3
+            anVBYy9lc2ZFQURTeHdIdS9Gd3gvblEKevHz9jiGV2gEMdR5qaFQqDaufIY1Ue5j
+            ihj+iVufhdX28NoHGn7dNa8ffqsHC0eNWmkTfICrjMjJyZdpkthZsw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-16T19:02:14Z"
+    mac: ENC[AES256_GCM,data:AIzxbuL/cmtwyAOKMZ6WaNtNW9tTFZ5TgqqNQat+4aahbhybFvGawKpchKqHaW5aqnwnKj+9wRo+STHGeDp58F/Y+aMvTQAloRt1X3nFtWJpmJmBI61hDl4EnU3r+vBTC7j/+9einH3WaRwntHLnF7NfeF7G8BFqvfYoHN0UFtM=,iv:LChRlRifjAW8ZPCtsgERmklZIh1hBYTwghv6JRi2l/o=,tag:+znn7DO+JaXe1+FXN637Kw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/badhouseplants/secrets.tf-ocloud.yaml
+++ b/values/badhouseplants/secrets.tf-ocloud.yaml
--- a/values/etersoft/values.external-dns.yaml
+++ b/values/etersoft/values.external-dns.yaml
@ -2,3 +2,4 @@ provider:
  name: cloudflare
 domainFilter:
  - badhouseplants.net
+  - nrodionov.info
--- a/values/etersoft/values.nrodionov.yaml
+++ b/values/etersoft/values.nrodionov.yaml
@ -0,0 +1,55 @@
+ingress:
+  enabled: true
+  pathType: ImplementationSpecific
+  hostname: nrodionov.info
+  path: /
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    kubernetes.io/tls-acme: "true"
+    kubernetes.io/ingress.allow-http: "false"
+    kubernetes.io/ingress.global-static-ip-name: ""
+    cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
+  tls: true
+  tlsWwwPrefix: false
+  selfSigned: false
+wordpressBlogName: Николай Николаевич Родионов
+wordpressUsername: admin
+wordpressFirstName: Nikolai
+wordpressLastName: Rodionov
+wordpressTablePrefix: wp_
+wordpressScheme: http
+existingWordPressConfigurationSecret: ""
+resources:
+  requests:
+    memory: 300Mi
+    cpu: 10m
+service:
+  type: ClusterIP
+  ports:
+    http: 8080
+    https: 8443
+
+persistence:
+  enabled: true
+  annotations:
+    volume.kubernetes.io/selected-node: yekaterinburg
+  accessModes:
+    - ReadWriteOnce
+  accessMode: ReadWriteOnce
+  size: 512Mi
+  dataSource: {}
+  existingClaim: ""
+  selector: {}
+
+mariadb:
+  enabled: true
+  primary:
+    persistence:
+      annotations:
+        volume.kubernetes.io/selected-node: yekaterinburg
+      enabled: true
+      storageClass: ""
+      accessModes:
+        - ReadWriteOnce
+      size: 3Gi
+
--- a/values/xray-1/secrets.promtail.yaml
+++ b/values/xray-1/secrets.promtail.yaml
@ -0,0 +1,27 @@
+config:
+    clients:
+        - url: ENC[AES256_GCM,data:CFq8x1jLDO8aLitEOlCOXeG1yp8RqKHdeqf8x7o9YESOmTAKFTuLpcBUDeESNTv9,iv:68uLarfOiS4oTcvEQu4uHMQUzRhXhqAZb5c4ik4U2E4=,tag:GhkkzriBYhWmTxt0KNwMkg==,type:str]
+          tenant_id: ENC[AES256_GCM,data:Iad0xh30fhwNiDh8SRU=,iv:A9o5brTa/2YbdYCIg5D4RHY2LXkMauIZBfygGsyV8gM=,tag:vNbcRImDSRCkM34B03MiMQ==,type:str]
+          basic_auth:
+            username: ENC[AES256_GCM,data:kUgLwA==,iv:5rAxU463ynXXZQfmGykocKmWm+VKahatT2KokSux16E=,tag:vYe9g0mePeYAapJlHAOWVw==,type:str]
+            password: ENC[AES256_GCM,data:2Zb4d8Aj5M27V7YNvcdFIkHHAl5dvNIlB46sP2sJ,iv:wW31BhjGvN2ii60p+/hSs2IqaIhLbDgl70KFfGiTbXM=,tag:50DB7GxuuAl+8GJ7K2ePvA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBdjR0eFRDS2dCVTNENUFr
+            V0k4T2Q2cmxua05QeDlzdnB2WWJLQ2hQbUdZCndjT0cxcytPUW0zOWtxVy9sazlr
+            Z3RKSkFVeGx2UkdtWmhLQXhNUnpKeUEKLS0tIGV3L1pRNXlZMG92K1N6aGlvSVBz
+            ZVV1d3R6KzJtT0drOVNHSThDdjAxekkK1RXCHM6QhNXto5D6yFTlvANN3E4iYfOC
+            Bf8s76p0ynI3tqfH6IgA9NFRPxYPzMGC/1zsQ95n5N6fMXh/KouRqg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-17T16:09:55Z"
+    mac: ENC[AES256_GCM,data:EM9kmYq/6en0XwMtmDcx5yO6VflugTbqDgPvvIBl7m6EvFi9EkMx/Aa9jkVYS+VFvS+pJ9pVe8+F/TL5+o/K0O9rkgZ8+ciAYXoRDBb1o9qUMoy2+ZjbjI7FMXDp8c8UED0MK+SZYNZ2C+44C9kohX5cPwOQCHd+0HxJKOTzH8U=,iv:The91sevo/IqJIXBt8BAta5RYDtv1oFaGQRyqzrm+tM=,tag:fKduoewHPG/N1qGr76r/8A==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/xray-1/secrets.server-xray-public.yaml
+++ b/values/xray-1/secrets.server-xray-public.yaml
@ -0,0 +1,37 @@
+files:
+    config:
+        enabled: ENC[AES256_GCM,data:nAOcqA==,iv:IgjI1fKgYvF/9JaWtN4rCx8ES3dhZ+J/9Bx3oGhJwHM=,tag:HIr+sIPImT2HvbpDsSeU2A==,type:bool]
+        sensitive: ENC[AES256_GCM,data:T/22lCM=,iv:9/bWVhvaW/7JKKssxHPbc0U21mC+Npx2LQRwg22/Fyo=,tag:DMNf0id3/J7HII8ETuwrOA==,type:bool]
+        remove: []
+        entries:
+            config.json:
+                data: ENC[AES256_GCM,data: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,iv:AdhKIjW4VD1N0km2fzPROhbs3QFToYuYfjTgHfS1IVg=,tag:VduZZAavteFNwVxiNcTMyA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNUkh4bWtiUHdqMllyVkZt
+            c2pWMmNqeVB3cW5NRGxYdHZObGN0cTJoZlhRCitUUExtWXJsTHVWbTNDSVB3QnJp
+            ZTJBbko3Zjk3bFkvQjBDRjVYcWNJdVkKLS0tIHBuMFBGQndOZU5wQXczMisxYjV5
+            UGp6ZFNzZUloV2wwbUpyL1FDY0Q0RWsKxoWWeAWlLmIXOfwijC4Ql6bxeBbBDfPM
+            mH38M2veyGAT+wAET9t1Ja8V1WVg84Hr5isTbd/RdLtpSQvYZBjzoA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLN3pNV1YranJlMEdvSUZu
+            bnpselFadHZBQTMyQjQvUk9DS3o0K244bDNjCjNpcjloeXl4ZWM5WERqTVVzeW9F
+            YnM1OWE3WnRHQzJYVTYxRWR6RndIbnMKLS0tIHh2OTYrTlNHWUZPUXErMnhBdFdi
+            VXc2UUJldVFmblI1SU5oN3BiaGlwM1UKM1mITMB6N5QjKeoLHJmMpXdnjU9N45OA
+            QkL6YaxrVjRCkECYlHrq0y6MjkB8Z3aoGoZcSW6EtviWEm7Lr4IaeQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-17T16:08:28Z"
+    mac: ENC[AES256_GCM,data:fOPKKaDtczjvBtDGpnQLWJ6ialNF3P8/JbFfr4w+KKWaN0+WdMa+nYmPLwrhAfSvdZ3mcGfnCDlYVM5ZZpk2LdcKyNnv49cc9sLCDwrEFR7s6+Lv2jMiT0TEK3zgvxIUvR8dvxwcYbuRsd0i1uH4WgwEgwQS/HVul2skRY9q/88=,iv:O/AhcimYqVDor4S1K3rS9u6NPG9lpsL+ZEJ+6g3lnZ8=,tag:RtLzoaH0Lscfw9NwGBjXlA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/xray-1/values.namespaces.yaml
+++ b/values/xray-1/values.namespaces.yaml
@ -0,0 +1,3 @@
+namespaces:
+  - name: public-xray
+  - name: promtail
--- a/values/xray-1/values.promtail.yaml
+++ b/values/xray-1/values.promtail.yaml
@ -0,0 +1,7 @@
+config:
+  snippets:
+    pipelineStages:
+      - match:
+          pipeline_name: "drop-all"
+          selector: '{namespace!~"public-xray"}'
+          action: drop
--- a/values/xray-1/values.roles.yaml
+++ b/values/xray-1/values.roles.yaml
@ -0,0 +1 @@
+roles: []
--- a/values/xray-1/values.server-xray-public.yaml
+++ b/values/xray-1/values.server-xray-public.yaml
@ -0,0 +1,26 @@
+ext-self-signed-cert:
+  enabled: true
+  name: xray.badhouseplants.net
+  domain: xray.badhouseplants.net
+ingress:
+  main:
+    enabled: false
+service:
+  xray-https:
+    enabled: true
+    type: NodePort
+    ports:
+      https:
+        port: 443
+        targetPort: 443
+        nodePort: 30015
+        protocol: TCP
+  xray-http:
+    enabled: true
+    type: NodePort
+    ports:
+      http:
+        port: 80
+        targetPort: 80
+        protocol: TCP
+        nodePort: 30014
--- a/values/xray-2/secrets.promtail.yaml
+++ b/values/xray-2/secrets.promtail.yaml
@ -0,0 +1,27 @@
+config:
+    clients:
+        - url: ENC[AES256_GCM,data:CFq8x1jLDO8aLitEOlCOXeG1yp8RqKHdeqf8x7o9YESOmTAKFTuLpcBUDeESNTv9,iv:68uLarfOiS4oTcvEQu4uHMQUzRhXhqAZb5c4ik4U2E4=,tag:GhkkzriBYhWmTxt0KNwMkg==,type:str]
+          tenant_id: ENC[AES256_GCM,data:Iad0xh30fhwNiDh8SRU=,iv:A9o5brTa/2YbdYCIg5D4RHY2LXkMauIZBfygGsyV8gM=,tag:vNbcRImDSRCkM34B03MiMQ==,type:str]
+          basic_auth:
+            username: ENC[AES256_GCM,data:kUgLwA==,iv:5rAxU463ynXXZQfmGykocKmWm+VKahatT2KokSux16E=,tag:vYe9g0mePeYAapJlHAOWVw==,type:str]
+            password: ENC[AES256_GCM,data:2Zb4d8Aj5M27V7YNvcdFIkHHAl5dvNIlB46sP2sJ,iv:wW31BhjGvN2ii60p+/hSs2IqaIhLbDgl70KFfGiTbXM=,tag:50DB7GxuuAl+8GJ7K2ePvA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBdjR0eFRDS2dCVTNENUFr
+            V0k4T2Q2cmxua05QeDlzdnB2WWJLQ2hQbUdZCndjT0cxcytPUW0zOWtxVy9sazlr
+            Z3RKSkFVeGx2UkdtWmhLQXhNUnpKeUEKLS0tIGV3L1pRNXlZMG92K1N6aGlvSVBz
+            ZVV1d3R6KzJtT0drOVNHSThDdjAxekkK1RXCHM6QhNXto5D6yFTlvANN3E4iYfOC
+            Bf8s76p0ynI3tqfH6IgA9NFRPxYPzMGC/1zsQ95n5N6fMXh/KouRqg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-17T16:09:55Z"
+    mac: ENC[AES256_GCM,data:EM9kmYq/6en0XwMtmDcx5yO6VflugTbqDgPvvIBl7m6EvFi9EkMx/Aa9jkVYS+VFvS+pJ9pVe8+F/TL5+o/K0O9rkgZ8+ciAYXoRDBb1o9qUMoy2+ZjbjI7FMXDp8c8UED0MK+SZYNZ2C+44C9kohX5cPwOQCHd+0HxJKOTzH8U=,iv:The91sevo/IqJIXBt8BAta5RYDtv1oFaGQRyqzrm+tM=,tag:fKduoewHPG/N1qGr76r/8A==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/xray-2/secrets.server-xray-public.yaml
+++ b/values/xray-2/secrets.server-xray-public.yaml
@ -0,0 +1,37 @@
+files:
+    config:
+        enabled: ENC[AES256_GCM,data:nAOcqA==,iv:IgjI1fKgYvF/9JaWtN4rCx8ES3dhZ+J/9Bx3oGhJwHM=,tag:HIr+sIPImT2HvbpDsSeU2A==,type:bool]
+        sensitive: ENC[AES256_GCM,data:T/22lCM=,iv:9/bWVhvaW/7JKKssxHPbc0U21mC+Npx2LQRwg22/Fyo=,tag:DMNf0id3/J7HII8ETuwrOA==,type:bool]
+        remove: []
+        entries:
+            config.json:
+                data: ENC[AES256_GCM,data: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,iv:AdhKIjW4VD1N0km2fzPROhbs3QFToYuYfjTgHfS1IVg=,tag:VduZZAavteFNwVxiNcTMyA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNUkh4bWtiUHdqMllyVkZt
+            c2pWMmNqeVB3cW5NRGxYdHZObGN0cTJoZlhRCitUUExtWXJsTHVWbTNDSVB3QnJp
+            ZTJBbko3Zjk3bFkvQjBDRjVYcWNJdVkKLS0tIHBuMFBGQndOZU5wQXczMisxYjV5
+            UGp6ZFNzZUloV2wwbUpyL1FDY0Q0RWsKxoWWeAWlLmIXOfwijC4Ql6bxeBbBDfPM
+            mH38M2veyGAT+wAET9t1Ja8V1WVg84Hr5isTbd/RdLtpSQvYZBjzoA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age17fyzv5mezck364lvyepp9pa3tnjn7jvsgcpykhhz2smnxyq6fdusvl7waf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLN3pNV1YranJlMEdvSUZu
+            bnpselFadHZBQTMyQjQvUk9DS3o0K244bDNjCjNpcjloeXl4ZWM5WERqTVVzeW9F
+            YnM1OWE3WnRHQzJYVTYxRWR6RndIbnMKLS0tIHh2OTYrTlNHWUZPUXErMnhBdFdi
+            VXc2UUJldVFmblI1SU5oN3BiaGlwM1UKM1mITMB6N5QjKeoLHJmMpXdnjU9N45OA
+            QkL6YaxrVjRCkECYlHrq0y6MjkB8Z3aoGoZcSW6EtviWEm7Lr4IaeQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-17T16:08:28Z"
+    mac: ENC[AES256_GCM,data:fOPKKaDtczjvBtDGpnQLWJ6ialNF3P8/JbFfr4w+KKWaN0+WdMa+nYmPLwrhAfSvdZ3mcGfnCDlYVM5ZZpk2LdcKyNnv49cc9sLCDwrEFR7s6+Lv2jMiT0TEK3zgvxIUvR8dvxwcYbuRsd0i1uH4WgwEgwQS/HVul2skRY9q/88=,iv:O/AhcimYqVDor4S1K3rS9u6NPG9lpsL+ZEJ+6g3lnZ8=,tag:RtLzoaH0Lscfw9NwGBjXlA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/values/xray-2/values.namespaces.yaml
+++ b/values/xray-2/values.namespaces.yaml
@ -0,0 +1,3 @@
+namespaces:
+  - name: public-xray
+  - name: promtail
--- a/values/xray-2/values.promtail.yaml
+++ b/values/xray-2/values.promtail.yaml
@ -0,0 +1,7 @@
+config:
+  snippets:
+    pipelineStages:
+      - match:
+          pipeline_name: "drop-all"
+          selector: '{namespace!~"public-xray"}'
+          action: drop
--- a/values/xray-2/values.roles.yaml
+++ b/values/xray-2/values.roles.yaml
@ -0,0 +1 @@
+roles: []
--- a/values/xray-2/values.server-xray-public.yaml
+++ b/values/xray-2/values.server-xray-public.yaml
@ -0,0 +1,26 @@
+ext-self-signed-cert:
+  enabled: true
+  name: xray.badhouseplants.net
+  domain: xray.badhouseplants.net
+ingress:
+  main:
+    enabled: false
+service:
+  xray-https:
+    enabled: true
+    type: NodePort
+    ports:
+      https:
+        port: 443
+        targetPort: 443
+        nodePort: 30015
+        protocol: TCP
+  xray-http:
+    enabled: true
+    type: NodePort
+    ports:
+      http:
+        port: 80
+        targetPort: 80
+        protocol: TCP
+        nodePort: 30014
Author	SHA1	Message	Date
Nikolai Rodionov	40403ab0da	Run tf-ocloud in the etersoft cluster	2024-11-17 21:57:08 +01:00
Nikolai Rodionov	dea25f9788	Close the obsolete xray port on traefik	2024-11-17 21:56:31 +01:00
Nikolai Rodionov	51883ea16c	Add basic auth to loki	2024-11-17 21:56:07 +01:00
Nikolai Rodionov	881882ca99	Break the edge xray setup	2024-11-17 21:55:35 +01:00
Nikolai Rodionov	5a1e9c8386	Add basic auth to loki	2024-11-17 21:55:12 +01:00
Nikolai Rodionov	3aedbbb853	Cleanup the badhouseplants cluster	2024-11-17 21:54:54 +01:00
Nikolai Rodionov	55822e5c1b	Install wordpress to the etersoft cluster	2024-11-17 21:54:26 +01:00
Nikolai Rodionov	f3bb549deb	Add two xray clusters	2024-11-17 21:52:41 +01:00