Compare commits
31 Commits
upgrading-
...
fix-check-
Author | SHA1 | Date | |
---|---|---|---|
9d43635ef6 | |||
240400097f | |||
4843cdbedb | |||
357dba4476 | |||
4739b983bc | |||
a941f7df16 | |||
63968337e2 | |||
8cfd4bf88d | |||
1d5e6f6d93 | |||
af236d75a1 | |||
b149d953f3 | |||
2cae97fccb | |||
a68bf4502a | |||
39893c3390 | |||
1c50200fa2 | |||
0d4f0c1053 | |||
2d8bb5ff39 | |||
6aaeb5db0d | |||
162b2dd602 | |||
8183029ebd | |||
bb6617b58c | |||
39160f7e66 | |||
e3760ca400 | |||
15bbc19939 | |||
5ac35a5a60 | |||
12c1a0ca31 | |||
b755239823 | |||
ced4bcd4c5 | |||
e3848a49cc | |||
3643ea788b | |||
77429c2c36 |
23
.drone.yml
23
.drone.yml
@ -93,9 +93,10 @@ type: docker
|
||||
name: Check helmfiles
|
||||
trigger:
|
||||
event:
|
||||
- cron
|
||||
cron:
|
||||
- daily
|
||||
# - cron
|
||||
- push
|
||||
# cron:
|
||||
# - daily
|
||||
|
||||
steps:
|
||||
- name: Check badhouseplants
|
||||
@ -105,4 +106,18 @@ steps:
|
||||
SOPS_AGE_KEY:
|
||||
from_secret: SOPS_AGE_KEY
|
||||
commands:
|
||||
- cdh --kind helmfile -p $DRONE_WORKSPACE/helmfile.yaml --helmfile-environment badhouseplants -o
|
||||
- helmfile -e badhouseplants fetch
|
||||
- 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
|
||||
|
@ -6,7 +6,12 @@ releases:
|
||||
installed: true
|
||||
namespace: drone-service
|
||||
createNamespace: false
|
||||
|
||||
|
||||
- <<: *drone-runner-docker
|
||||
installed: true
|
||||
namespace: drone-service
|
||||
createNamespace: false
|
||||
|
||||
- <<: *longhorn
|
||||
installed: true
|
||||
namespace: longhorn-system
|
||||
@ -87,5 +92,3 @@ bases:
|
||||
- ../environments.yaml
|
||||
- ../repositories.yaml
|
||||
|
||||
#helmfiles:
|
||||
# - namespaces.yaml
|
||||
|
28
badhouseplants/values/secrets.minecraft.yaml
Normal file
28
badhouseplants/values/secrets.minecraft.yaml
Normal file
@ -0,0 +1,28 @@
|
||||
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
|
@ -53,3 +53,4 @@ redis:
|
||||
host: redis-master.database-service.svc.cluster.local
|
||||
auth:
|
||||
enabled: true
|
||||
database: 3
|
||||
|
@ -22,10 +22,10 @@ service:
|
||||
port: 1194
|
||||
protocol: TCP
|
||||
targetPort: 1194
|
||||
- name: ovpn2
|
||||
port: 1195
|
||||
- name: tcp
|
||||
port: 25
|
||||
protocol: TCP
|
||||
targetPort: 1195
|
||||
targetPort: 25
|
||||
# -----------
|
||||
# -- Email
|
||||
# -----------
|
||||
|
@ -30,10 +30,11 @@ istio:
|
||||
image:
|
||||
tag: java17-graalvm-ce
|
||||
pullPolicy: Always
|
||||
|
||||
resources:
|
||||
requests:
|
||||
memory: 512Mi
|
||||
cpu: 50m
|
||||
memory: 3Gi
|
||||
cpu: 256m
|
||||
limits:
|
||||
memory: 3Gi
|
||||
|
||||
@ -42,6 +43,7 @@ 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
|
||||
@ -50,7 +52,9 @@ readinessProbe:
|
||||
timeoutSeconds: 10
|
||||
livenessProbe:
|
||||
timeoutSeconds: 10
|
||||
|
||||
minecraftServer:
|
||||
overrideServerProperties: true
|
||||
eula: "TRUE"
|
||||
onlineMode: false
|
||||
difficulty: hard
|
||||
@ -58,10 +62,14 @@ minecraftServer:
|
||||
version: 1.20.1
|
||||
maxWorldSize: 90000
|
||||
type: "PAPER"
|
||||
paperDownloadUrl: https://api.papermc.io/v2/projects/paper/versions/1.20.1/builds/100/downloads/paper-1.20.1-100.jar
|
||||
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
|
||||
memory: 2512M
|
||||
rcon:
|
||||
enabled: true
|
||||
withGeneratedPassword: false
|
||||
port: 25575
|
||||
serviceType: ClusterIP
|
||||
extraPorts:
|
||||
- name: metrics
|
||||
containerPort: 9225
|
||||
@ -79,6 +87,28 @@ 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
|
||||
@ -104,6 +134,18 @@ 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
|
||||
|
@ -4,4 +4,3 @@ primary:
|
||||
|
||||
auth:
|
||||
createDatabase: false
|
||||
|
@ -9,14 +9,35 @@ istio:
|
||||
- name: openvpn-tcp
|
||||
gateway: badhouseplants-vpn
|
||||
kind: tcp
|
||||
port_match: 1195
|
||||
port_match: 1194
|
||||
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:
|
||||
server: "tcp://195.201.250.50:1195"
|
||||
proto: tcp
|
||||
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
|
||||
|
7
docs/restic.md
Normal file
7
docs/restic.md
Normal file
@ -0,0 +1,7 @@
|
||||
# Restic
|
||||
|
||||
We are using restic for backing up the Minecraft server
|
||||
|
||||
## How to restore
|
||||
|
||||
TODO: Describe the restoration process
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
|
||||
bases:
|
||||
- ../environments.yaml
|
||||
- ../repositories.yaml
|
||||
|
@ -1,22 +0,0 @@
|
||||
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
|
@ -1,16 +0,0 @@
|
||||
---
|
||||
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
|
@ -71,6 +71,8 @@ policies:
|
||||
- resources:
|
||||
- 'arn:aws:s3:::longhorn/*'
|
||||
- 'arn:aws:s3:::longhorn'
|
||||
- 'arn:aws:s3:::restic/*'
|
||||
- 'arn:aws:s3:::restic'
|
||||
actions:
|
||||
- "s3:DeleteObject"
|
||||
- "s3:GetObject"
|
||||
@ -81,6 +83,10 @@ buckets:
|
||||
policy: none
|
||||
purge: false
|
||||
versioning: false
|
||||
- name: restic
|
||||
policy: none
|
||||
purge: false
|
||||
versioning: false
|
||||
metrics:
|
||||
serviceMonitor:
|
||||
enabled: false
|
||||
|
@ -14,7 +14,9 @@ istio:
|
||||
service: openvpn
|
||||
port: 1194
|
||||
|
||||
storageClassName: microk8s-hostpath
|
||||
storage:
|
||||
class: microk8s-hostpath
|
||||
size: 5Gi
|
||||
openvpn:
|
||||
server: "tcp://91.232.225.63:1194"
|
||||
service:
|
||||
|
@ -46,11 +46,5 @@ releases:
|
||||
namespace: metallb-system
|
||||
createNamespace: true
|
||||
|
||||
- <<: *drone-runner-docker
|
||||
installed: true
|
||||
namespace: drone-service
|
||||
createNamespace: false
|
||||
|
||||
|
||||
helmfiles:
|
||||
- path: {{.Environment.Name }}/helmfile.yaml
|
||||
|
0
message_file.tpl
Normal file
0
message_file.tpl
Normal file
@ -94,12 +94,12 @@ templates:
|
||||
metallb: &metallb
|
||||
name: metallb
|
||||
chart: metallb/metallb
|
||||
version: 0.13.10
|
||||
version: 0.13.11
|
||||
|
||||
cert-manager: &cert-manager
|
||||
name: cert-manager
|
||||
chart: jetstack/cert-manager
|
||||
version: 1.12.3
|
||||
version: 1.13.0
|
||||
set:
|
||||
- name: installCRDs
|
||||
value: true
|
||||
@ -113,7 +113,7 @@ templates:
|
||||
argocd: &argocd
|
||||
name: argocd
|
||||
chart: argo/argo-cd
|
||||
version: 5.42.2
|
||||
version: 5.46.7
|
||||
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: 48.3.1
|
||||
version: 51.2.0
|
||||
inherit:
|
||||
- template: monitoring-common
|
||||
- template: default-env-values
|
||||
@ -137,7 +137,7 @@ templates:
|
||||
loki: &loki
|
||||
name: loki
|
||||
chart: grafana/loki
|
||||
version: 5.10.0
|
||||
version: 5.23.0
|
||||
inherit:
|
||||
- template: monitoring-common
|
||||
- template: default-env-values
|
||||
@ -145,7 +145,7 @@ templates:
|
||||
promtail: &promtail
|
||||
name: promtail
|
||||
chart: grafana/promtail
|
||||
version: 6.14.1
|
||||
version: 6.15.2
|
||||
inherit:
|
||||
- template: monitoring-common
|
||||
- template: default-env-values
|
||||
@ -155,7 +155,7 @@ templates:
|
||||
istio-common:
|
||||
labels:
|
||||
bundle: istio
|
||||
version: 1.18.2
|
||||
version: 1.19.0
|
||||
|
||||
istio-base: &istio-base
|
||||
name: istio-base
|
||||
@ -183,8 +183,8 @@ templates:
|
||||
# ----------------------------
|
||||
openvpn: &openvpn
|
||||
name: openvpn
|
||||
chart: allanger-charts/openvpn
|
||||
version: 1.0.3
|
||||
chart: allanger-gitea/openvpn
|
||||
version: 1.0.6
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: ext-istio-resource
|
||||
@ -197,7 +197,7 @@ templates:
|
||||
drone: &drone
|
||||
name: drone
|
||||
chart: drone/drone
|
||||
version: 0.6.4
|
||||
version: 0.6.5
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
@ -216,7 +216,7 @@ templates:
|
||||
nrodionov: &nrodionov
|
||||
name: nrodionov
|
||||
chart: bitnami/wordpress
|
||||
version: 17.0.4
|
||||
version: 17.1.11
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
@ -235,15 +235,16 @@ templates:
|
||||
minecraft: &minecraft
|
||||
name: minecraft
|
||||
chart: minecraft-server-charts/minecraft
|
||||
version: 4.9.3
|
||||
version: 4.10.0
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
- template: ext-istio-resource
|
||||
|
||||
gitea: &gitea
|
||||
name: gitea
|
||||
chart: gitea/gitea
|
||||
version: 9.1.0
|
||||
version: 9.4.0
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
@ -253,7 +254,7 @@ templates:
|
||||
funkwhale: &funkwhale
|
||||
name: funkwhale
|
||||
chart: ananace-charts/funkwhale
|
||||
version: 2.0.1
|
||||
version: 2.0.3
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
@ -282,7 +283,7 @@ templates:
|
||||
redis: &redis
|
||||
name: redis
|
||||
chart: bitnami/redis
|
||||
version: 17.14.6
|
||||
version: 18.1.0
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
@ -290,7 +291,7 @@ templates:
|
||||
postgres: &postgres
|
||||
name: postgres
|
||||
chart: bitnami/postgresql
|
||||
version: 12.8.0
|
||||
version: 12.12.7
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
@ -298,7 +299,7 @@ templates:
|
||||
db-operator: &db-operator
|
||||
name: db-operator
|
||||
chart: db-operator/db-operator
|
||||
version: 1.9.1
|
||||
version: 1.11.0
|
||||
|
||||
db-instances: &db-instances
|
||||
name: db-instances
|
||||
@ -311,7 +312,7 @@ templates:
|
||||
mysql: &mysql
|
||||
name: mysql
|
||||
chart: bitnami/mysql
|
||||
version: 9.10.10
|
||||
version: 9.12.3
|
||||
inherit:
|
||||
- template: default-env-values
|
||||
- template: default-env-secrets
|
||||
|
@ -2,8 +2,6 @@
|
||||
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
|
||||
|
Reference in New Issue
Block a user