diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index fd0641c..30d3395 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -30,11 +30,6 @@ releases: namespace: nrodionov-application createNamespace: false - - <<: *minecraft - installed: true - namespace: minecraft-application - createNamespace: false - - <<: *gitea installed: true namespace: gitea-service diff --git a/badhouseplants/values/secrets.minecraft.yaml b/badhouseplants/values/secrets.minecraft.yaml deleted file mode 100644 index 6a54d19..0000000 --- a/badhouseplants/values/secrets.minecraft.yaml +++ /dev/null @@ -1,28 +0,0 @@ -minecraftServer: - rcon: - password: ENC[AES256_GCM,data:woijK03SjpwXBK4v6VQQcDU9+Vtxu1K8aw==,iv:z42FfsX/uyqHKV1uUnXxbVSEMmI549nOvR0PTMhBqXA=,tag:GX3h+j00PfR/3kxcmk/RRg==,type:str] -mcbackup: - resticEnvs: - RESTIC_PASSWORD: ENC[AES256_GCM,data:stg6lZdHeI1IDCqcEObPi2HcLc0WtsxN4mwOqajD,iv:cd9k4zC6qLLfDesHc2eHYgOYw0tLoXRROOiWWg2ZWqo=,tag:tY+Vj2Uv1MonbgGSBZF/aA==,type:str] - AWS_SECRET_ACCESS_KEY: ENC[AES256_GCM,data:J5+56NluagLrqNOoML4=,iv:jV4hZwcxg3K4hI3YiZlUTc+z26p+TJlHJ0iCnCD8XN4=,tag:yolnLc3raai15UMGzhY7Tg==,type:str] - AWS_ACCESS_KEY_ID: ENC[AES256_GCM,data:D/nUeA9W,iv:sWH469oSthTZLlmdfNBs9iz8Rkmh+FgoN7cNwuhhm44=,tag:EeG6Dlz7XNKFxlyY2NWheA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvb29BdXcwNmJKVHg0ZE1o - dHJQMmdQcjBrbmo4cmpZZFdUNkQzbXZnc1FnCkZZdHBodXRpVG43dHRtaXVOdis3 - azRqSFQ4QU9Bc0YyaldUMFQ2S3NBOVUKLS0tIC9TbHkwVGYxY2xIT2thRHpQdDFK - QU55VnhyREJld1QzQUlvdGlJQzR1dEkKjPTR48VdNKqmZmNJb3eB44nXyqRtPxfk - lFh1pQLPRSiFtCQYRsRTUNZt131Y/wSIJ33Ri77rZAzF7MoOXZj+FQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-02-20T23:30:03Z" - mac: ENC[AES256_GCM,data:uZ0a7xDvJEQXxnoiTjclZ/rsuR5Iz+oY/5eQjeDdWnMd+itHZyHk4my8q1Ug0Dl6Md2qiVSiLAvfJsvLDiBqYWoCTWqnvBF8qXLq+pdjXuvAoLTVct8G/BDtgxYZcLQIUnox9RifUb6RCKtZADcG3VMsTWSrrZD4y0S3feQ47Mw=,iv:WYbtRGus5SR4J5rmmUuqgbhgJg/3NCZw04z67CvdYvM=,tag:OF79vVtfnC98ydWPOB4QnQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/badhouseplants/values/values.minecraft.yaml b/badhouseplants/values/values.minecraft.yaml deleted file mode 100644 index e5df96a..0000000 --- a/badhouseplants/values/values.minecraft.yaml +++ /dev/null @@ -1,180 +0,0 @@ ---- -# -------------------------------------------------- -# -- Extensions values -# -------------------------------------------------- -service-account: - enabled: true - resources: - - name: minecraft-exporter - label: - app: minecraft-minecraft-metrics - endpoints: - port: metrics -# ------------------------------------------ -# -- Istio extenstion. Just because I'm -# -- not using ingress nginx -# ------------------------------------------ -istio: - enabled: true - istio: - - name: minecraft-tcp - gateway: istio-system/badhouseplants-minecraft - kind: tcp - port_match: 25565 - hostname: "*" - service: minecraft-minecraft - port: 25565 -# -------------------------------------------------- -# -- Main values -# -------------------------------------------------- -image: - tag: java17-graalvm-ce - pullPolicy: Always - -resources: - requests: - memory: 3Gi - cpu: 256m - limits: - memory: 3Gi - -lifecycle: - postStart: - - bash - - -c - - for i in {1..100}; do mc-health && break || sleep 20; done && mc-send-to-console setpassword 11223345 - -readinessProbe: - command: - - mc-health - periodSeconds: 20 - failureThreshold: 50 - timeoutSeconds: 10 -livenessProbe: - timeoutSeconds: 10 - -minecraftServer: - overrideServerProperties: true - eula: "TRUE" - onlineMode: false - difficulty: hard - hardcore: true - 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 - gameMode: survival - pvp: true - rcon: - enabled: true - withGeneratedPassword: false - port: 25575 - serviceType: ClusterIP - extraPorts: - - name: metrics - containerPort: 9225 - protocol: TCP - service: - enabled: true - embedded: false - labels: - exporter: minecraft - type: ClusterIP - port: 9925 - ingress: - enabled: false -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: 0-install-prometheus-exporter - image: alpine/curl - command: - - curl - - -L - - "https://github.com/sladkoff/minecraft-prometheus-exporter/releases/download/v2.5.0/minecraft-prometheus-exporter-2.5.0.jar" - - -o - - /data/plugins/prometheus-exporter.jar - volumeMounts: - - name: plugins - mountPath: /data/plugins - readOnly: false - - name: 0-install-password-plugin - image: alpine/curl - command: - - curl - - -L - - "https://github.com/timbru31/PasswordProtect/releases/download/PasswordProtect-3.1.0/PasswordProtect.jar" - - -o - - /data/plugins/PasswordProtect.jar - volumeMounts: - - name: plugins - mountPath: /data/plugins - readOnly: false - - name: 0-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 - - name: 0-install-fast-minecart-plugin - image: alpine/curl - command: - - curl - - -L - - https://github.com/certainly1182/FastMinecarts/releases/download/v1.0.1/FastMinecarts.jar - - -o - - /data/plugins/FastMinecarts.jar - volumeMounts: - - name: plugins - mountPath: /data/plugins - - name: 1-add-plugins-to-minecraft - image: alpine/curl - command: - - sh - - -c - - cp -r /in /out/plugins - volumeMounts: - - name: plugins - mountPath: /in - readOnly: false - - name: datadir - mountPath: /out -extraVolumes: - - volumeMounts: - - name: plugins - mountPath: /data/plugins - readOnly: false - volumes: - - name: plugins - emptyDir: - sizeLimit: 500Mi diff --git a/badhouseplants/values/values.namespaces.yaml b/badhouseplants/values/values.namespaces.yaml index d752942..c0232d1 100644 --- a/badhouseplants/values/values.namespaces.yaml +++ b/badhouseplants/values/values.namespaces.yaml @@ -8,6 +8,11 @@ namespaces: - name: argo-system - name: nrodionov-application - name: minecraft-application + annotations: + badohouseplants.net/git-repo: | + https://git.badhouseplants.net/badhouseplants/minecraft-helmfile + badhouseplants.net/ci: | + https://ci.badhouseplants.net/repos/15 - name: gitea-service - name: funkwhale-application - name: monitoring-system diff --git a/releases.yaml b/releases.yaml index 7fb40d3..8e126d7 100644 --- a/releases.yaml +++ b/releases.yaml @@ -296,15 +296,6 @@ templates: - template: default-env-secrets - template: ext-istio-resource - minecraft: &minecraft - name: minecraft - chart: minecraft-server-charts/minecraft - version: 4.15.0 - inherit: - - template: default-env-values - - template: default-env-secrets - - template: ext-istio-resource - gitea: &gitea name: gitea chart: gitea/gitea diff --git a/repositories.yaml b/repositories.yaml index 9e7eced..0a82ac7 100644 --- a/repositories.yaml +++ b/repositories.yaml @@ -11,8 +11,6 @@ repositories: url: https://charts.bitnami.com/bitnami - name: minio url: https://charts.min.io/ - - name: minecraft-server-charts - url: https://itzg.github.io/minecraft-server-charts/ - name: longhorn url: https://charts.longhorn.io - name: gitea