Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(minecraft): indent #4490

Merged
merged 2 commits into from
Feb 5, 2025
Merged

fix(minecraft): indent #4490

merged 2 commits into from
Feb 5, 2025

Conversation

tyriis
Copy link
Owner

@tyriis tyriis commented Feb 5, 2025

No description provided.

@tyriis-automation
Copy link
Contributor

tyriis-automation bot commented Feb 5, 2025

🦙 MegaLinter status: ✅ SUCCESS

Descriptor Linter Files Fixed Errors Elapsed time
✅ EDITORCONFIG editorconfig-checker 2 0 0.03s
✅ REPOSITORY gitleaks yes no 3.06s
✅ YAML prettier 2 0 0.48s
✅ YAML yamllint 2 0 0.39s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@tyriis-automation
Copy link
Contributor

tyriis-automation bot commented Feb 5, 2025

--- kubernetes/talos-flux/apps/gaming/minecraft-java/creative-world Kustomization: flux-system/minecraft-creative-world HelmRelease: gaming/minecraft-creative-world

+++ kubernetes/talos-flux/apps/gaming/minecraft-java/creative-world Kustomization: flux-system/minecraft-creative-world HelmRelease: gaming/minecraft-creative-world

@@ -41,13 +41,12 @@

             env:
               CFG_PROXY_SECRET:
                 valueFrom:
                   secretKeyRef:
                     key: forwarding.secret
                     name: minecraft-proxy-forwarding
-              LOG_TIMESTAMP: 'true'
               MEMORY: 1024M
               MODS_FILE: /config/plugins.txt
               REPLACE_ENV_DURING_SYNC: 'true'
               TYPE: PAPER
               TZ: Europe/Vienna
               VERSION: 1.21.4
--- kubernetes/talos-flux/apps/gaming/minecraft-java/survival-world Kustomization: flux-system/minecraft-survival-world HelmRelease: gaming/minecraft-survival-world

+++ kubernetes/talos-flux/apps/gaming/minecraft-java/survival-world Kustomization: flux-system/minecraft-survival-world HelmRelease: gaming/minecraft-survival-world

@@ -14,155 +14,155 @@

       chart: app-template
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
         namespace: flux-system
       version: 3.6.1
-  containers:
-    app:
-      env:
-        CFG_PROXY_SECRET:
-          valueFrom:
-            secretKeyRef:
-              key: forwarding.secret
-              name: minecraft-proxy-forwarding
-        MEMORY: 4096M
-        MODS_FILE: /config/plugins.txt
-        REPLACE_ENV_DURING_SYNC: 'true'
-        TYPE: PAPER
-        TZ: Europe/Vienna
-        VERSION: 1.21.4
-      envFrom:
-      - secretRef:
-          name: minecraft-rcon
-      - secretRef:
-          name: curseforge-api-key
-      - configMapRef:
-          name: minecraft-survival-world-env
-      image:
-        repository: ghcr.io/itzg/minecraft-server
-        tag: java21@sha256:9fcc91f052c47c5da7ae280b7cd1603ee7d657867c19fe4d6b5260edfd72db30
-      ports:
-      - containerPort: 25565
-        name: java
-      - containerPort: 25575
-        name: rcon
-      - containerPort: 9100
-        name: metrics
-      probes:
-        liveness:
-          custom: true
-          enabled: true
-          spec:
-            exec:
-              command:
-              - mc-health
-            failureThreshold: 20
-            initialDelaySeconds: 30
-            periodSeconds: 5
-        readiness:
-          custom: true
-          enabled: true
-          spec:
-            exec:
-              command:
-              - mc-health
-            failureThreshold: 20
-            initialDelaySeconds: 30
-            periodSeconds: 5
-        startup:
-          custom: true
-          enabled: true
-          spec:
-            exec:
-              command:
-              - mc-health
-            failureThreshold: 300
-            initialDelaySeconds: 30
-            periodSeconds: 1
-      resources:
-        requests:
-          cpu: 500m
-          memory: 4Gi
-      securityContext:
-        allowPrivilegeEscalation: false
-        capabilities:
-          drop:
-          - ALL
-        readOnlyRootFilesystem: false
-  controllers:
-    minecraft:
-      annotations:
-        reloader.stakater.com/auto: 'true'
-  defaultPodOptions:
-    automountServiceAccountToken: false
-    securityContext:
-      fsGroup: 2000
-      fsGroupChangePolicy: OnRootMismatch
-      runAsGroup: 2000
-      runAsNonRoot: true
-      runAsUser: 1000
-      seccompProfile:
-        type: RuntimeDefault
   dependsOn:
   - name: external-secret-minecraft-proxy-forwarding
   - name: external-secret-minecraft-rcon
   - name: external-secret-minecraft-curseforge-api-key
   driftDetection:
     mode: enabled
   install:
     createNamespace: true
     remediation:
       retries: 3
   interval: 30m
-  persistence:
-    config:
-      globalMounts:
-      - path: /config/spigot.yml
-        readOnly: true
-        subPath: spigot.yml
-      - path: /config/paper-global.yml
-        readOnly: true
-        subPath: paper-global.yml
-      - path: /config/plugins.txt
-        readOnly: true
-        subPath: plugins.txt
-      name: minecraft-survival-world-config
-      type: configMap
-    data:
-      advancedMounts:
-        minecraft:
-          app:
-          - path: /data
-      existingClaim: minecraft-survival-world-data-2025
-  service:
-    minecraft:
-      controller: minecraft
-      ports:
-        java:
-          port: 25565
-          protocol: TCP
-        metrics:
-          port: 9100
-          protocol: TCP
-      type: ClusterIP
-    rcon:
-      controller: minecraft
-      ports:
-        rcon:
-          port: 25575
-          protocol: TCP
-      type: ClusterIP
-  serviceMonitor:
-    metrics:
-      enabled: true
-      endpoints:
-      - interval: 1m
-        path: /
-        port: metrics
-        scheme: http
-      serviceName: minecraft-survival-world-minecraft
   upgrade:
     remediation:
       retries: 3
-  values: null
+  values:
+    controllers:
+      minecraft:
+        annotations:
+          reloader.stakater.com/auto: 'true'
+        containers:
+          app:
+            env:
+              CFG_PROXY_SECRET:
+                valueFrom:
+                  secretKeyRef:
+                    key: forwarding.secret
+                    name: minecraft-proxy-forwarding
+              MEMORY: 4096M
+              MODS_FILE: /config/plugins.txt
+              REPLACE_ENV_DURING_SYNC: 'true'
+              TYPE: PAPER
+              TZ: Europe/Vienna
+              VERSION: 1.21.4
+            envFrom:
+            - secretRef:
+                name: minecraft-rcon
+            - secretRef:
+                name: curseforge-api-key
+            - configMapRef:
+                name: minecraft-survival-world-env
+            image:
+              repository: ghcr.io/itzg/minecraft-server
+              tag: java21@sha256:9fcc91f052c47c5da7ae280b7cd1603ee7d657867c19fe4d6b5260edfd72db30
+            ports:
+            - containerPort: 25565
+              name: java
+            - containerPort: 25575
+              name: rcon
+            - containerPort: 9100
+              name: metrics
+            probes:
+              liveness:
+                custom: true
+                enabled: true
+                spec:
+                  exec:
+                    command:
+                    - mc-health
+                  failureThreshold: 20
+                  initialDelaySeconds: 30
+                  periodSeconds: 5
+              readiness:
+                custom: true
+                enabled: true
+                spec:
+                  exec:
+                    command:
+                    - mc-health
+                  failureThreshold: 20
+                  initialDelaySeconds: 30
+                  periodSeconds: 5
+              startup:
+                custom: true
+                enabled: true
+                spec:
+                  exec:
+                    command:
+                    - mc-health
+                  failureThreshold: 300
+                  initialDelaySeconds: 30
+                  periodSeconds: 1
+            resources:
+              requests:
+                cpu: 500m
+                memory: 4Gi
+            securityContext:
+              allowPrivilegeEscalation: false
+              capabilities:
+                drop:
+                - ALL
+              readOnlyRootFilesystem: false
+    defaultPodOptions:
+      automountServiceAccountToken: false
+      securityContext:
+        fsGroup: 2000
+        fsGroupChangePolicy: OnRootMismatch
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 1000
+        seccompProfile:
+          type: RuntimeDefault
+    persistence:
+      config:
+        globalMounts:
+        - path: /config/spigot.yml
+          readOnly: true
+          subPath: spigot.yml
+        - path: /config/paper-global.yml
+          readOnly: true
+          subPath: paper-global.yml
+        - path: /config/plugins.txt
+          readOnly: true
+          subPath: plugins.txt
+        name: minecraft-survival-world-config
+        type: configMap
+      data:
+        advancedMounts:
+          minecraft:
+            app:
+            - path: /data
+        existingClaim: minecraft-survival-world-data-2025
+    service:
+      minecraft:
+        controller: minecraft
+        ports:
+          java:
+            port: 25565
+            protocol: TCP
+          metrics:
+            port: 9100
+            protocol: TCP
+        type: ClusterIP
+      rcon:
+        controller: minecraft
+        ports:
+          rcon:
+            port: 25575
+            protocol: TCP
+        type: ClusterIP
+    serviceMonitor:
+      metrics:
+        enabled: true
+        endpoints:
+        - interval: 1m
+          path: /
+          port: metrics
+          scheme: http
+        serviceName: minecraft-survival-world-minecraft

Copy link

sonarqubecloud bot commented Feb 5, 2025

@tyriis-automation
Copy link
Contributor

--- HelmRelease: gaming/minecraft-survival-world Service: gaming/minecraft-survival-world-minecraft

+++ HelmRelease: gaming/minecraft-survival-world Service: gaming/minecraft-survival-world-minecraft

@@ -0,0 +1,26 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: minecraft-survival-world-minecraft
+  labels:
+    app.kubernetes.io/instance: minecraft-survival-world
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: minecraft-survival-world
+    app.kubernetes.io/service: minecraft-survival-world-minecraft
+spec:
+  type: ClusterIP
+  ports:
+  - port: 25565
+    targetPort: 25565
+    protocol: TCP
+    name: java
+  - port: 9100
+    targetPort: 9100
+    protocol: TCP
+    name: metrics
+  selector:
+    app.kubernetes.io/component: minecraft
+    app.kubernetes.io/instance: minecraft-survival-world
+    app.kubernetes.io/name: minecraft-survival-world
+
--- HelmRelease: gaming/minecraft-survival-world Service: gaming/minecraft-survival-world-rcon

+++ HelmRelease: gaming/minecraft-survival-world Service: gaming/minecraft-survival-world-rcon

@@ -0,0 +1,22 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: minecraft-survival-world-rcon
+  labels:
+    app.kubernetes.io/instance: minecraft-survival-world
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: minecraft-survival-world
+    app.kubernetes.io/service: minecraft-survival-world-rcon
+spec:
+  type: ClusterIP
+  ports:
+  - port: 25575
+    targetPort: 25575
+    protocol: TCP
+    name: rcon
+  selector:
+    app.kubernetes.io/component: minecraft
+    app.kubernetes.io/instance: minecraft-survival-world
+    app.kubernetes.io/name: minecraft-survival-world
+
--- HelmRelease: gaming/minecraft-survival-world Deployment: gaming/minecraft-survival-world

+++ HelmRelease: gaming/minecraft-survival-world Deployment: gaming/minecraft-survival-world

@@ -0,0 +1,133 @@

+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: minecraft-survival-world
+  labels:
+    app.kubernetes.io/component: minecraft
+    app.kubernetes.io/instance: minecraft-survival-world
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: minecraft-survival-world
+  annotations:
+    reloader.stakater.com/auto: 'true'
+spec:
+  revisionHistoryLimit: 3
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: minecraft
+      app.kubernetes.io/name: minecraft-survival-world
+      app.kubernetes.io/instance: minecraft-survival-world
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: minecraft
+        app.kubernetes.io/instance: minecraft-survival-world
+        app.kubernetes.io/name: minecraft-survival-world
+    spec:
+      enableServiceLinks: false
+      serviceAccountName: default
+      automountServiceAccountToken: false
+      securityContext:
+        fsGroup: 2000
+        fsGroupChangePolicy: OnRootMismatch
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 1000
+        seccompProfile:
+          type: RuntimeDefault
+      hostIPC: false
+      hostNetwork: false
+      hostPID: false
+      dnsPolicy: ClusterFirst
+      containers:
+      - env:
+        - name: CFG_PROXY_SECRET
+          valueFrom:
+            secretKeyRef:
+              key: forwarding.secret
+              name: minecraft-proxy-forwarding
+        - name: MEMORY
+          value: 4096M
+        - name: MODS_FILE
+          value: /config/plugins.txt
+        - name: REPLACE_ENV_DURING_SYNC
+          value: 'true'
+        - name: TYPE
+          value: PAPER
+        - name: TZ
+          value: Europe/Vienna
+        - name: VERSION
+          value: 1.21.4
+        envFrom:
+        - secretRef:
+            name: minecraft-rcon
+        - secretRef:
+            name: curseforge-api-key
+        - configMapRef:
+            name: minecraft-survival-world-env
+        image: ghcr.io/itzg/minecraft-server:java21@sha256:9fcc91f052c47c5da7ae280b7cd1603ee7d657867c19fe4d6b5260edfd72db30
+        livenessProbe:
+          exec:
+            command:
+            - mc-health
+          failureThreshold: 20
+          initialDelaySeconds: 30
+          periodSeconds: 5
+        name: app
+        ports:
+        - containerPort: 25565
+          name: java
+        - containerPort: 25575
+          name: rcon
+        - containerPort: 9100
+          name: metrics
+        readinessProbe:
+          exec:
+            command:
+            - mc-health
+          failureThreshold: 20
+          initialDelaySeconds: 30
+          periodSeconds: 5
+        resources:
+          requests:
+            cpu: 500m
+            memory: 4Gi
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: false
+        startupProbe:
+          exec:
+            command:
+            - mc-health
+          failureThreshold: 300
+          initialDelaySeconds: 30
+          periodSeconds: 1
+        volumeMounts:
+        - mountPath: /config/spigot.yml
+          name: config
+          readOnly: true
+          subPath: spigot.yml
+        - mountPath: /config/paper-global.yml
+          name: config
+          readOnly: true
+          subPath: paper-global.yml
+        - mountPath: /config/plugins.txt
+          name: config
+          readOnly: true
+          subPath: plugins.txt
+        - mountPath: /data
+          name: data
+      volumes:
+      - configMap:
+          name: minecraft-survival-world-config
+        name: config
+      - name: data
+        persistentVolumeClaim:
+          claimName: minecraft-survival-world-data-2025
+
--- HelmRelease: gaming/minecraft-survival-world ServiceMonitor: gaming/minecraft-survival-world

+++ HelmRelease: gaming/minecraft-survival-world ServiceMonitor: gaming/minecraft-survival-world

@@ -0,0 +1,25 @@

+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: minecraft-survival-world
+  labels:
+    app.kubernetes.io/instance: minecraft-survival-world
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: minecraft-survival-world
+spec:
+  jobLabel: minecraft-survival-world
+  namespaceSelector:
+    matchNames:
+    - gaming
+  selector:
+    matchLabels:
+      app.kubernetes.io/service: minecraft-survival-world-minecraft
+      app.kubernetes.io/name: minecraft-survival-world
+      app.kubernetes.io/instance: minecraft-survival-world
+  endpoints:
+  - interval: 1m
+    path: /
+    port: metrics
+    scheme: http
+
--- HelmRelease: gaming/minecraft-creative-world Deployment: gaming/minecraft-creative-world

+++ HelmRelease: gaming/minecraft-creative-world Deployment: gaming/minecraft-creative-world

@@ -46,14 +46,12 @@

       - env:
         - name: CFG_PROXY_SECRET
           valueFrom:
             secretKeyRef:
               key: forwarding.secret
               name: minecraft-proxy-forwarding
-        - name: LOG_TIMESTAMP
-          value: 'true'
         - name: MEMORY
           value: 1024M
         - name: MODS_FILE
           value: /config/plugins.txt
         - name: REPLACE_ENV_DURING_SYNC
           value: 'true'

@tyriis tyriis merged commit c6838c2 into main Feb 5, 2025
16 checks passed
@tyriis tyriis deleted the feature/minecraft-migrate-paper branch February 5, 2025 13:53
@tyriis tyriis restored the feature/minecraft-migrate-paper branch February 5, 2025 14:14
@tyriis tyriis deleted the feature/minecraft-migrate-paper branch February 5, 2025 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant