WIP: Chenge openvpn port

.drone.yml

@@ -93,10 +93,9 @@ type: docker
 name: Check helmfiles
 trigger:
   event:
-    #    - cron
+    - cron
-    - push
+  cron:
-      #  cron:
+    - daily
-      #    - daily
 
 steps:
   - name: Check badhouseplants
@@ -106,18 +105,4 @@ steps:
       SOPS_AGE_KEY:
         from_secret: SOPS_AGE_KEY
     commands:
-      - helmfile -e badhouseplants fetch
+      - cdh --kind helmfile -p $DRONE_WORKSPACE/helmfile.yaml --helmfile-environment badhouseplants -o
-      - helmfile -e badhouseplants list
-      - echo "Hey, bud, some helm releases are outdated:" > message_file.tpl
-      - cdh --kind helmfile -p $DRONE_WORKSPACE/helmfile.yaml --helmfile-environment badhouseplants -o >> message_file.tpl
-
-  - name: Send telegram notification
-    when:
-      status:
-        - failure
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: TELEGRAM_TOKEN
-      to: 131601077
-      message_file: message_file.tpl

badhouseplants/helmfile.yaml

@@ -6,12 +6,7 @@ releases:
     installed: true
     namespace: drone-service
     createNamespace: false
-
+  
-  - <<: *drone-runner-docker
-    installed: true
-    namespace: drone-service
-    createNamespace: false
-
   - <<: *longhorn
     installed: true
     namespace: longhorn-system
@@ -92,3 +87,5 @@ bases:
   - ../environments.yaml
   - ../repositories.yaml
 
+    #helmfiles:
+    #  - namespaces.yaml

badhouseplants/values/secrets.minecraft.yaml

@@ -1,28 +0,0 @@
-minecraftServer:
-    rcon:
-        password: ENC[AES256_GCM,data:7kQAt4R+uN/28Uvn3KnJnOvOcCOf6FEaow==,iv:G20SygTZZ1O2DyPr+/f3XSC3bB4L5p/9CxZkPS5qibY=,tag:O2Ab+AC+Eho6MRm0vC9hHQ==,type:str]
-mcbackup:
-    resticEnvs:
-        RESTIC_PASSWORD: ENC[AES256_GCM,data:mjrSV6d6a4ZvesYjobhHCVTngw5EQqesAKecSPVY,iv:WSk5V61opvccp/1bhbcO6S+8GcEYVlxk8l6nl++nxc4=,tag:wENZyx6IxJgswetDi8alZA==,type:str]
-        AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:+4HuGGHaZgPXLX3Sm6U=,iv:qMVfe2BzdJtvHYX7T/6WPt8kCNRdn02Ynew/q9QH1KA=,tag:7JwAloF6HPdBXTGC3kto4w==,type:str]
-        AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:yfS/LrX0,iv:HzZmzUOmI0vJ+vPkI2xn2F/w43/BKOGil+SLRwhcG0I=,tag:c+d8nyR5w5mU9F/H0zl/1A==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxTWUxY2hYT0dId2hsR0x1
-            MXFtRjlSelgwdUcyVnBUdlJ6Nng1UkNJaHg4Ckc5NXBORjBCZHQyc0lDTiswazNF
-            cGhKVFFNdlZnRWlxS05OTklOUDJDQjQKLS0tIDNWNDVVWXcxUW8yUHgrOTNkRkQ1
-            MGNDV2cvUUF3dWZHSlZNeVFDNXhzalkKubKuiiZuqoZTvRMr2FiUxnFUu+Pvj3Wf
-            pZTfZg9rnUukmV+kmwqQKcfoPNfeShhoAsszWwPM628cV9pq87I2/A==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-15T15:32:19Z"
-    mac: ENC[AES256_GCM,data:ghfbBqsdFzQaRehefvpnnFLxp6tYE1K36gXLyN7gdxlvZ20JRn+FMfeUm8IjNKl3fCH2aVdM18v+T4xBs4QSXAWH5R79+HPn6hl7kYXzGJKTdmddj6EFZFXajisIJa2eZpEKPk7uOT6YczcNxNKByKxgHxTXe7SYlIkE6CgLT9w=,iv:inXW7OxvQXPGO4mkJkd/SMVsTBWA+utso26VXb5yNdM=,tag:f/GBzkgI0zgInSdDbHICag==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.7.3

badhouseplants/values/values.funkwhale.yaml

@@ -53,4 +53,3 @@ redis:
   host: redis-master.database-service.svc.cluster.local
   auth:
     enabled: true
-  database: 3

badhouseplants/values/values.istio-ingressgateway.yaml

@@ -22,10 +22,10 @@ service:
       port: 1194
       protocol: TCP
       targetPort: 1194
-    - name: tcp
+    - name: ovpn2
-      port: 25
+      port: 1195
       protocol: TCP
-      targetPort: 25
+      targetPort: 1195
     # -----------
     # -- Email
     # -----------

badhouseplants/values/values.minecraft.yaml

@@ -30,11 +30,10 @@ istio:
 image:
   tag: java17-graalvm-ce
   pullPolicy: Always
-
 resources:
   requests:
-    memory: 3Gi
+    memory: 512Mi
-    cpu: 256m
+    cpu: 50m
   limits:
     memory: 3Gi
 
@@ -43,7 +42,6 @@ lifecycle:
     - bash
     - -c
     - for i in {1..100}; do mc-health && break || sleep 20; done && mc-send-to-console setpassword 11223345
-
 readinessProbe:
   command:
     - mc-health
@@ -52,9 +50,7 @@ readinessProbe:
   timeoutSeconds: 10
 livenessProbe:
   timeoutSeconds: 10
-
 minecraftServer:
-  overrideServerProperties: true
   eula: "TRUE"
   onlineMode: false
   difficulty: hard
@@ -62,14 +58,10 @@ minecraftServer:
   version: 1.20.1
   maxWorldSize: 90000
   type: "PAPER"
-  paperDownloadUrl: https://api.papermc.io/v2/projects/paper/versions/1.20.1/builds/170/downloads/paper-1.20.1-170.jar
+  paperDownloadUrl: https://api.papermc.io/v2/projects/paper/versions/1.20.1/builds/100/downloads/paper-1.20.1-100.jar
   gameMode: survival
   pvp: true
-  rcon:
+  memory: 2512M
-    enabled: true
-    withGeneratedPassword: false
-    port: 25575
-    serviceType: ClusterIP
   extraPorts:
     - name: metrics
       containerPort: 9225
@@ -87,28 +79,6 @@ persistence:
   dataDir:
     enabled: true
     Size: 15Gi
-mcbackup:
-  enabled: false
-  backupInterval: 2h
-  pauseIfNoPlayers: "false"
-  pruneBackupsDays: 2
-  rconRetries: 5
-  rconRetryInterval: 10s
-  excludes: "*.jar,cache,logs"
-  backupMethod: restic
-  resticRepository: s3:https://s3.e.badhouseplants.net:443/restic/minecraft
-  resticAdditionalTags: "mc_backups"
-  pruneResticRetention: "--keep-last 12 --keep-daily 1 --keep-weekly 2 --keep-monthly 2 --keep-yearly 2"
-  resources:
-    requests:
-      memory: 512Mi
-      cpu: 100m
-  persistence:
-    backupDir:
-      enabled: false
-# ---------------------------------------------
-# -- Install Plugins
-# ---------------------------------------------
 initContainers:
   - name: install-prometheus-exporter
     image: alpine/curl
@@ -134,18 +104,6 @@ initContainers:
       - name: plugins
         mountPath: /data/plugins
         readOnly: false
-  - name: install-gravity-control-plugin
-    image: alpine/curl
-    command:
-      - curl
-      - -L
-      - https://github.com/e-im/GravityControl/releases/download/v1.3.0/GravityControl-1.3.0.jar
-      - -o
-      - /data/plugins/GravityControl-1.3.0.jar
-    volumeMounts:
-      - name: plugins
-        mountPath: /data/plugins
-        readOnly: false
 extraVolumes:
   - volumeMounts:
       - name: plugins

badhouseplants/values/values.mysql.yaml

@@ -4,3 +4,4 @@ primary:
 
 auth:
   createDatabase: false
+  

badhouseplants/values/values.openvpn.yaml

@@ -9,35 +9,14 @@ istio:
     - name: openvpn-tcp
       gateway: badhouseplants-vpn
       kind: tcp
-      port_match: 1194
+      port_match: 1195
       hostname: "*"
       service: openvpn
       port: 1194
-    - name: openvpn-tcp-fake-port
-      gateway: badhouseplants-vpn
-      kind: tcp
-      port_match: 25
-      hostname: "*"
-      service: openvpn
-      port: 1194
-# ------------------------------------------
-image:
-  tag: v2.6.5-xor-4.0.0beta08
-storage:
-  class: longhorn
-  size: 512Mi
 
+storageClassName: longhorn
 openvpn:
-  proto: tcp
+  server: "tcp://195.201.250.50:1195"
-  host: 195.201.250.50
-easyrsa:
-  cn: Bad Houseplants
-  country: Germany
-  province: NRW
-  city: Duesseldorf
-  org: Bad Houseplants
-  email: allanger@zohomail.com
-
 service:
   type: ClusterIP
   port: 1194

docs/restic.md

@@ -1,7 +0,0 @@
-# Restic
-
-We are using restic for backing up the Minecraft server
-
-## How to restore
-
-TODO: Describe the restoration process

etersoft/helmfile.yaml

@@ -1,5 +0,0 @@
----
-
-bases:
-  - ../environments.yaml
-  - ../repositories.yaml

etersoft/values/secrets.drone-runner-docker.yaml

@@ -0,0 +1,22 @@
+env:
+    DRONE_RPC_SECRET: ENC[AES256_GCM,data:RAZbnTrv9PxiCLLqjKWBtFWd+Nzqma8Zw+NuKRLO,iv:IiFcTQGUmYa6UCBzx1yTDd0zwB6D1Cv0raXZxLXm1qA=,tag:83bnBW+MhkKehZfso3g+/g==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVk0yaTlySHpuOWFFT3J5
+            Z210NzJPTmV0akdFQ1REM1JzK0pwTC9XWjJJCm54QmQ3ODJwakZuamMzYTBIeEJi
+            aUxKNmQ3dU52V2N2cjl5VTJpTTAwWGsKLS0tIDFyR2o2VnQ4QWFCWWRzZGNMZnNQ
+            em1VMlhBNGRrVFhXVUVRdU16Q1Q4bUEKvZ6UbZsfdvfCk37FlEN4vg0RTnPO2nwh
+            DY4klzcan+9DBRT2qdIIy6pj94GuSoXKXEYc9X0AvYab/HoLithMWA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-05-21T09:27:21Z"
+    mac: ENC[AES256_GCM,data:U2JETtW0lbb2znJBupGMPsab13y5M1v1N0wkFxEBs+YVNFhnkvIqSZiY5mq9KTYiY4tRzw1kV+jqP0jNsODekCI1++4NBuQsGSZFUoTERHgTRlnz1aAS+nf39lvYnWyQxsQmw9vY/GQ/yluBJkOEV/EoIF3wHjxZe1HCBIViPyk=,iv:WMj7aSgW8LdNQbOgC4FcyOtR/3gjckiHO8vlZGdiTeY=,tag:Xty2QVLJ/D2dlzQY13od5w==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3

etersoft/values/values.drone-runner-docker.yaml

@@ -0,0 +1,16 @@
+---
+env:
+  DRONE_RPC_HOST: drone.badhouseplants.net
+  DRONE_RPC_PROTO: https
+  DRONE_NAMESPACE_DEFAULT: drone-service
+rbac:
+  buildNamespaces:
+    - drone-service
+dind:
+  resources:
+    limits:
+      cpu: 2000m
+      memory: 2024Mi
+    requests:
+      cpu: 100m
+      memory: 512Mi

etersoft/values/values.minio.yaml

@@ -71,8 +71,6 @@ policies:
     - resources:
         - 'arn:aws:s3:::longhorn/*'
         - 'arn:aws:s3:::longhorn'
-        - 'arn:aws:s3:::restic/*'
-        - 'arn:aws:s3:::restic'
       actions:
         - "s3:DeleteObject"
         - "s3:GetObject"
@@ -83,10 +81,6 @@ buckets:
     policy: none
     purge: false
     versioning: false
-  - name: restic
-    policy: none
-    purge: false
-    versioning: false
 metrics:
   serviceMonitor:
     enabled: false

etersoft/values/values.openvpn.yaml

@@ -14,9 +14,7 @@ istio:
       service: openvpn
       port: 1194
 
-storage:
+storageClassName: microk8s-hostpath
-  class: microk8s-hostpath
-  size: 5Gi
 openvpn:
   server: "tcp://91.232.225.63:1194"
 service:

helmfile.yaml

@@ -46,5 +46,11 @@ releases:
     namespace: metallb-system
     createNamespace: true
 
+  - <<: *drone-runner-docker
+    installed: true
+    namespace: drone-service
+    createNamespace: false
+
+
 helmfiles:
   - path: {{.Environment.Name }}/helmfile.yaml

releases.yaml

@@ -94,12 +94,12 @@ templates:
   metallb: &metallb
     name: metallb
     chart: metallb/metallb
-    version: 0.13.11
+    version: 0.13.10
 
   cert-manager: &cert-manager
     name: cert-manager
     chart: jetstack/cert-manager
-    version: 1.13.0
+    version: 1.12.3
     set:
       - name: installCRDs
         value: true
@@ -113,7 +113,7 @@ templates:
   argocd: &argocd
     name: argocd
     chart: argo/argo-cd
-    version: 5.46.7
+    version: 5.42.2
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -126,7 +126,7 @@ templates:
   prometheus: &prometheus
     name: prometheus
     chart: prometheus-community/kube-prometheus-stack
-    version: 51.2.0
+    version: 48.3.1
     inherit:
       - template: monitoring-common
       - template: default-env-values
@@ -137,7 +137,7 @@ templates:
   loki: &loki
     name: loki
     chart: grafana/loki
-    version: 5.23.0
+    version: 5.10.0
     inherit:
       - template: monitoring-common
       - template: default-env-values
@@ -145,7 +145,7 @@ templates:
   promtail: &promtail
     name: promtail
     chart: grafana/promtail
-    version: 6.15.2
+    version: 6.14.1
     inherit:
       - template: monitoring-common
       - template: default-env-values
@@ -155,7 +155,7 @@ templates:
   istio-common:
     labels:
       bundle: istio
-    version: 1.19.0
+    version: 1.18.2
 
   istio-base: &istio-base
     name: istio-base
@@ -183,8 +183,8 @@ templates:
   # ----------------------------
   openvpn: &openvpn
     name: openvpn
-    chart: allanger-gitea/openvpn
+    chart: allanger-charts/openvpn
-    version: 1.0.6
+    version: 1.0.3
     inherit:
       - template: default-env-values
       - template: ext-istio-resource
@@ -197,7 +197,7 @@ templates:
   drone: &drone
     name: drone
     chart: drone/drone
-    version: 0.6.5
+    version: 0.6.4
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -216,7 +216,7 @@ templates:
   nrodionov: &nrodionov
     name: nrodionov
     chart: bitnami/wordpress
-    version: 17.1.11
+    version: 17.0.4
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -235,16 +235,15 @@ templates:
   minecraft: &minecraft
     name: minecraft
     chart: minecraft-server-charts/minecraft
-    version: 4.10.0
+    version: 4.9.3
     inherit:
       - template: default-env-values
-      - template: default-env-secrets
       - template: ext-istio-resource
 
   gitea: &gitea
     name: gitea
     chart: gitea/gitea
-    version: 9.4.0
+    version: 9.1.0
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -254,7 +253,7 @@ templates:
   funkwhale: &funkwhale
     name: funkwhale
     chart: ananace-charts/funkwhale
-    version: 2.0.3
+    version: 2.0.1
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -283,7 +282,7 @@ templates:
   redis: &redis
     name: redis
     chart: bitnami/redis
-    version: 18.1.0
+    version: 17.14.6
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -291,7 +290,7 @@ templates:
   postgres: &postgres
     name: postgres
     chart: bitnami/postgresql
-    version: 12.12.7
+    version: 12.8.0
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -299,7 +298,7 @@ templates:
   db-operator: &db-operator
     name: db-operator
     chart: db-operator/db-operator
-    version: 1.11.0
+    version: 1.9.1
 
   db-instances: &db-instances
     name: db-instances
@@ -312,7 +311,7 @@ templates:
   mysql: &mysql
     name: mysql
     chart: bitnami/mysql
-    version: 9.12.3
+    version: 9.10.10
     inherit:
       - template: default-env-values
       - template: default-env-secrets

repositories.yaml

@@ -2,6 +2,8 @@
 repositories:
   - name: metrics-server
     url: https://kubernetes-sigs.github.io/metrics-server/
+  - name: allanger-charts
+    url: https://allanger.github.io/allanger-charts
   - name: jetstack
     url: https://charts.jetstack.io
   - name: istio