diff --git a/clusters/main/kubernetes/apps/kustomization.yaml b/clusters/main/kubernetes/apps/kustomization.yaml index 8c7a6004b1c..c8c1bee1641 100644 --- a/clusters/main/kubernetes/apps/kustomization.yaml +++ b/clusters/main/kubernetes/apps/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - renovate/ks.yaml - - minecraft/ks.yaml diff --git a/clusters/main/kubernetes/apps/minecraft/app/helm-release.yaml b/clusters/main/kubernetes/apps/minecraft/app/helm-release.yaml deleted file mode 100644 index 8d111cdeb18..00000000000 --- a/clusters/main/kubernetes/apps/minecraft/app/helm-release.yaml +++ /dev/null @@ -1,234 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: minecraft - namespace: minecraft -spec: - interval: 10m - chart: - spec: - chart: minecraft-java - version: 22.34.11 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 15m - timeout: 20m - maxHistory: 3 - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false - values: - global: - stopAll: true - credentials: - s3: - type: s3 - url: "${S3URL}" - bucket: "${S3PREFIX_TC}-minecraft" - accessKey: "${S3ID_TC}" - secretKey: "${S3KEY_TC}" - encrKey: "${S3KEY_TC}" - service: - main: - enabled: true - loadBalancerIP: ${MINECRAFT_IP} - type: LoadBalancer - externalTrafficPolicy: Local - ports: - main: - enabled: true - protocol: tcp - port: 25565 - query: - enabled: true - protocol: udp - port: 25565 - rcon: - enabled: true - # loadBalancerIP: ${MINECRAFT_IP} - # type: LoadBalancer - ports: - rcon: - enabled: true - port: 25575 - dynmap: - enabled: true - # SloadBalancerIP: ${MINECRAFT_IP} - # type: LoadBalancer - ports: - dynmap: - enabled: true - port: 8123 - - mcbackup: - enabled: true - podOptions: - terminationGracePeriodSeconds: 120 - workload: - main: - podSpec: - containers: - main: - imageSelector: j17alpineImage - env: - ENABLE_QUERY: "true" - OVERRIDE_SERVER_PROPERTIES: true - VERSION: "1.20.1" - TYPE: "AUTO_CURSEFORGE" - FORGEVERSION: "forge-47.3.7" - CF_SLUG: "sixcraft" - # CF_MODPACK_ZIP: "/customdata/SixCraft-4.1.0.zip" - DIFFICULTY: hard - MAX_PLAYERS: 20 - MAX_WORLD_SIZE: 1000000 - ALLOW_NETHER: true - ANNOUNCE_PLAYER_ACHIEVEMENTS: true - ENABLE_COMMAND_BLOCK: false - FORCE_GAMEMODE: true - STOP_SERVER_ANNOUNCE_DELAY: 60 - GENERATE_STRUCTURES: true - HARDCORE: false - MAX_BUILD_HEIGHT: 300 - MAX_TICK_TIME: 90000 - SPAWN_ANIMALS: true - SPAWN_MONSTERS: true - ALLOW_FLIGHT: true - SPAWN_NPCS: true - VIEW_DISTANCE: 25 - SYNC_CHUNK_WRITES: false - SPAWN_PROTECTION: 5 - MODE: survival - MOTD: "Welcome to Six-Shooter Minecraft" - PVP: false - LEVEL_TYPE: DEFAULT - LEVEL: world - ONLINE_MODE: true - MAX_MEMORY: 12228M - INIT_MEMORY: 8096M - JVM_XX_OPTS: "-XX:MaxRAMPercentage=75" - RCON_PASSWORD: ${MC_RCON_PASS} - BROADCAST_CONSOLE_TO_OPS: true - USE_AIKAR_FLAGS: true - OPS: "99093856-888c-49e5-b7ea-6849c4012469,6253eb28-5be7-4c94-8936-701b9e257f0c" - WHITELIST: "99093856-888c-49e5-b7ea-6849c4012469,6253eb28-5be7-4c94-8936-701b9e257f0c,06fd4434-f41d-45bb-84a7-16c1138b62a8,497d6257-d336-4922-b5e0-3ee0fbe2b3d3,635ebc02-f66e-40c9-9d83-e5fc32f70cf9" - EXISTING_OPS_FILE: "SYNCHRONIZE" - EXISTING_WHITELIST_FILE: "SYNCHRONIZE" - SIMULATION_DISTANCE: 4 - # PACKWIZ_URL: "" - # CUSTOM_SERVER: "" - # QUILT_LOADER_VERSION: "" - # QUILT_LAUNCHER: "" - # QUILT_LAUNCHER_URL: "" - # PUFFERFISH_BUILD: "lastSuccessfulBuild" - # FORGE_INSTALLER: "" - # FORGE_INSTALLER_URL: "" - # FABRIC_LOADER_VERSION: "" - # FABRIC_INSTALLER: "" - # FABRIC_INSTALLER_URL: "" - # SPIGOT_DOWNLOAD_URL: "" - # BUILD_FROM_SOURCE: false - # BUKKIT_DOWNLOAD_URL: "" - # PAPERBUILD: "" - # PAPER_DOWNLOAD_URL: "" - # AIRPLANE_BUILD: "lastSuccessfulBuild" - # MAGMA_CHANNEL: "stable" - # MOHIST_BUILD: "" - # CANYON_BUILD: "" - # SPONGEBRANCH: "STABLE" - # SPONGEVERSION: "" - # LIMBO_BUILD: "LATEST" - # LIMBO_SCHEMA_FILENAME: "default.schem" - # CRUCIBLE_RELEASE: "latest" - # FTB_MODPACK_ID: "" - # FTB_MODPACK_VERSION_ID: "" - # CF_SERVER_MOD: "" - # CF_BASE_DIR: "" - # USE_MODPACK_START_SCRIPT: true - # FTB_LEGACYJAVAFIXER: false - # WHITELIST: "" - # OPS: "" - # ICON: "" - SEED: "-1412583731547517931" - # GENERATOR_SETTINGS: "" - # WORLD: "" - # FORCE_REDOWNLOAD: false - # USE_FLARE_FLAGS: false - # USE_AIKAR_FLAGS: true - # USE_SIMD_FLAGS: false - # JVM_OPTS: "" - # JVM_XX_OPTS: "" - CF_API_KEY: "$2a$10$/${MINECRAFT_CF_API_KEY}" - # CF_PAGE_URL - # CF_SLUG - # CF_EXCLUDE_INCLUDE_FILE - # CF_EXCLUDE_MODS - # CF_FORCE_INCLUDE_MODS - # CF_FORCE_SYNCHRONIZE - # CF_OVERRIDES_SKIP_EXISTING - # CF_PARALLEL_DOWNLOADS - # CF_SET_LEVEL_FROM - mcbackup: - enabled: true - - persistence: - data: - enabled: true - type: nfs - server: 192.168.10.21 - path: /mnt/tank/apps/minecraft/data - targetSelector: - main: - main: - mountPath: /data - mcbackup: - mcbackup: - mountPath: /data - readOnly: true - dynmap: - enabled: true - targetSelector: - main: - main: - mountPath: /data/dynmap/web - type: nfs - server: 192.168.10.21 - path: /mnt/tank/apps/minecraft/dynmap - backups: - enabled: true - type: nfs - server: 192.168.10.21 - path: /mnt/tank/apps/minecraft/backups - resources: - limits: - cpu: 4000m - memory: 25Gi - requests: - cpu: 500m - memory: 2Gi - - ingress: - main: - enabled: true - ingressClassName: external - primary: true - targetSelector: - dynmap: dynmap - hosts: - - host: dynmap.${DOMAIN_1} - integrations: - certManager: - enabled: true - certificateIssuer: le-prod - traefik: - enabled: false diff --git a/clusters/main/kubernetes/apps/minecraft/app/kustomization.yaml b/clusters/main/kubernetes/apps/minecraft/app/kustomization.yaml deleted file mode 100644 index 1b2b2dc29f5..00000000000 --- a/clusters/main/kubernetes/apps/minecraft/app/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - namespace.yaml - - helm-release.yaml diff --git a/clusters/main/kubernetes/apps/minecraft/app/namespace.yaml b/clusters/main/kubernetes/apps/minecraft/app/namespace.yaml deleted file mode 100644 index 0b6e4de6447..00000000000 --- a/clusters/main/kubernetes/apps/minecraft/app/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: minecraft diff --git a/clusters/main/kubernetes/apps/minecraft/ks.yaml b/clusters/main/kubernetes/apps/minecraft/ks.yaml deleted file mode 100644 index 133691f135e..00000000000 --- a/clusters/main/kubernetes/apps/minecraft/ks.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: minecraft - namespace: flux-system -spec: - interval: 10m - path: clusters/main/kubernetes/apps/minecraft/app - prune: true - sourceRef: - kind: GitRepository - name: truecharts