merge templates

docker-compose.yaml

@@ -3,4 +3,4 @@ version: '3'
 services:
   minecraft:
     build: .
-    image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3
+    image: hub.ducoterra.net/ducoterra/minecraft:1.16.4

helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: charts
+name: helm
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.

helm/templates/configmap.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}
+data:
+  eula.txt: |
+    eula=true
+  server.properties: {{ toYaml .Values.server_props | indent 2 }}

helm/templates/deploy.yaml

@@ -29,15 +29,15 @@ spec:
         stdin: true
         env:
         - name: MAX_RAM
-          value: "4"
+          value: {{ .Values.max_ram | quote }}
         - name: MIN_RAM
-          value: "1"
+          value: {{ .Values.min_ram | quote }}
         resources:
           requests:
-            memory: "2Gi"
+            memory: {{ .Values.min_ram }}Gi
             cpu: 250m
           limits:
-            memory: "8Gi"
+            memory: {{ .Values.max_ram }}Gi
             cpu: "4"
       volumes:
       - name: data

helm/templates/pvc.yaml

@@ -5,7 +5,6 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: nvme
   accessModes:
     - ReadWriteOnce
   resources:

helm/values.yaml

@@ -0,0 +1,79 @@
+# Default values for helm.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

minecraft/Chart.yaml

@@ -1,23 +0,0 @@
-apiVersion: v2
-name: minecraft
-description: Personal Minecraft Server
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.16
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16

minecraft/templates/configmap.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}
-data:
-  eula.txt: |
-    eula=true
-  server.properties: |
-    max-tick-time=60000
-    generator-settings=
-    force-gamemode=false
-    allow-nether=true
-    gamemode=0
-    broadcast-console-to-ops=true
-    enable-query=false
-    player-idle-timeout=0
-    difficulty=3
-    spawn-monsters=true
-    op-permission-level=4
-    pvp=true
-    snooper-enabled=true
-    level-type=default
-    hardcore=false
-    enable-command-block=false
-    max-players=20
-    network-compression-threshold=256
-    resource-pack-sha1=
-    max-world-size=29999984
-    server-port=25565
-    server-ip=
-    spawn-npcs=true
-    allow-flight=true
-    level-name=world
-    view-distance=32
-    resource-pack=
-    spawn-animals=true
-    white-list=true
-    generate-structures=true
-    online-mode=true
-    max-build-height=256
-    level-seed=
-    prevent-proxy-connections=false
-    use-native-transport=true
-    motd=This is gonna be interesting
-    enable-rcon=false

minecraft/templates/deploy.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}
-    spec:
-      containers:
-      - name: {{ .Release.Name }}
-        image: {{ .Values.image }}:{{ .Values.tag }}
-        ports:
-        - containerPort: 25565
-        volumeMounts:
-        - mountPath: /mc_data
-          name: data
-        - name: properties
-          mountPath: /mc_data/server.properties
-          subPath: server.properties
-        - name: properties
-          mountPath: /mc_data/eula.txt
-          subPath: eula.txt
-        tty: true
-        stdin: true
-        env:
-        - name: MAX_RAM
-          value: "4"
-        - name: MIN_RAM
-          value: "1"
-        - name: THREADS
-          value: "4"
-        resources:
-          requests:
-            memory: "2Gi"
-            cpu: 250m
-          limits:
-            memory: "8Gi"
-            cpu: "4"
-      volumes:
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}
-      - name: properties
-        configMap:
-          name: {{ .Release.Name }}

minecraft/templates/pvc.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Release.Name }}
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  storageClassName: nvme
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 32Gi

minecraft/values.yaml

@@ -1,3 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft
-tag: 1.16.1_2
-port: 25565

pubcraft/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

pubcraft/templates/configmap.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}
-data:
-  eula.txt: |
-    eula=true
-  server.properties: |
-    max-tick-time=60000
-    generator-settings=
-    force-gamemode=false
-    allow-nether=true
-    gamemode=0
-    broadcast-console-to-ops=true
-    enable-query=false
-    player-idle-timeout=0
-    difficulty=3
-    spawn-monsters=true
-    op-permission-level=4
-    pvp=true
-    snooper-enabled=true
-    level-type=default
-    hardcore=false
-    enable-command-block=false
-    max-players=20
-    network-compression-threshold=256
-    resource-pack-sha1=
-    max-world-size=29999984
-    server-port=25565
-    server-ip=
-    spawn-npcs=true
-    allow-flight=true
-    level-name=world
-    view-distance=32
-    resource-pack=
-    spawn-animals=true
-    white-list=true
-    generate-structures=true
-    online-mode=true
-    max-build-height=256
-    level-seed=
-    prevent-proxy-connections=false
-    use-native-transport=true
-    motd=This is gonna be interesting
-    enable-rcon=false

pubcraft/templates/deploy.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}
-    spec:
-      containers:
-      - name: {{ .Release.Name }}
-        image: {{ .Values.image }}
-        ports:
-        - containerPort: 25565
-        volumeMounts:
-        - mountPath: /mc_data
-          name: data
-        - name: properties
-          mountPath: /mc_data/server.properties
-          subPath: server.properties
-        - name: properties
-          mountPath: /mc_data/eula.txt
-          subPath: eula.txt
-        tty: true
-        stdin: true
-        env:
-        - name: MAX_RAM
-          value: "4"
-        - name: MIN_RAM
-          value: "1"
-        - name: THREADS
-          value: "4"
-        resources:
-          requests:
-            memory: "2Gi"
-            cpu: 250m
-          limits:
-            memory: "8Gi"
-            cpu: "4"
-      volumes:
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}
-      - name: properties
-        configMap:
-          name: {{ .Release.Name }}

pubcraft/templates/service.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    app: {{ .Release.Name }}
-  ports:
-  - port: {{ .Values.port }}
-    targetPort: 25565
-    name: {{ .Release.Name }}
-  type: LoadBalancer

pubcraft/values.yaml

@@ -1,2 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_2
-port: 20100

testcraft/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

testcraft/Chart.yaml

@@ -1,23 +0,0 @@
-apiVersion: v2
-name: charts
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0

testcraft/templates/configmap.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}
-data:
-  eula.txt: |
-    eula=true
-  server.properties: |
-    max-tick-time=60000
-    generator-settings=
-    force-gamemode=false
-    allow-nether=true
-    gamemode=0
-    broadcast-console-to-ops=true
-    enable-query=false
-    player-idle-timeout=0
-    difficulty=3
-    spawn-monsters=true
-    op-permission-level=4
-    pvp=true
-    snooper-enabled=true
-    level-type=amplified
-    hardcore=false
-    enable-command-block=false
-    max-players=20
-    network-compression-threshold=256
-    resource-pack-sha1=
-    max-world-size=29999984
-    server-port=25565
-    server-ip=
-    spawn-npcs=true
-    allow-flight=true
-    level-name=world
-    view-distance=32
-    resource-pack=
-    spawn-animals=true
-    white-list=true
-    generate-structures=true
-    online-mode=true
-    max-build-height=512
-    level-seed=
-    prevent-proxy-connections=false
-    use-native-transport=true
-    motd=This is gonna be interesting
-    enable-rcon=false

testcraft/templates/pvc.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Release.Name }}
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  storageClassName: nvme
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 32Gi

testcraft/templates/service.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    app: {{ .Release.Name }}
-  ports:
-  - port: {{ .Values.port }}
-    targetPort: 25565
-    name: {{ .Release.Name }}
-  type: LoadBalancer

testcraft/values.yaml

@@ -1,2 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3
-port: 25566

values-minecraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 25565
+max_ram: 8
+min_ram: 1
+server_props: |
+  max-tick-time=60000
+  generator-settings=
+  force-gamemode=false
+  allow-nether=true
+  gamemode=0
+  broadcast-console-to-ops=true
+  enable-query=false
+  player-idle-timeout=0
+  difficulty=3
+  spawn-monsters=true
+  op-permission-level=4
+  pvp=true
+  snooper-enabled=true
+  level-type=default
+  hardcore=false
+  enable-command-block=false
+  max-players=20
+  network-compression-threshold=256
+  resource-pack-sha1=
+  max-world-size=29999984
+  server-port=25565
+  server-ip=
+  spawn-npcs=true
+  allow-flight=true
+  level-name=world
+  view-distance=32
+  resource-pack=
+  spawn-animals=true
+  white-list=true
+  generate-structures=true
+  online-mode=true
+  max-build-height=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false

values-pubcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 20100
+max_ram: 8
+min_ram: 1
+server_props: |
+  max-tick-time=60000
+  generator-settings=
+  force-gamemode=false
+  allow-nether=true
+  gamemode=0
+  broadcast-console-to-ops=true
+  enable-query=false
+  player-idle-timeout=0
+  difficulty=3
+  spawn-monsters=true
+  op-permission-level=4
+  pvp=true
+  snooper-enabled=true
+  level-type=default
+  hardcore=false
+  enable-command-block=false
+  max-players=20
+  network-compression-threshold=256
+  resource-pack-sha1=
+  max-world-size=29999984
+  server-port=25565
+  server-ip=
+  spawn-npcs=true
+  allow-flight=true
+  level-name=world
+  view-distance=32
+  resource-pack=
+  spawn-animals=true
+  white-list=true
+  generate-structures=true
+  online-mode=true
+  max-build-height=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false

values-testcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 25566
+max_ram: 8
+min_ram: 1
+server_props: |
+  max-tick-time=60000
+  generator-settings=
+  force-gamemode=false
+  allow-nether=true
+  gamemode=0
+  broadcast-console-to-ops=true
+  enable-query=false
+  player-idle-timeout=0
+  difficulty=3
+  spawn-monsters=true
+  op-permission-level=4
+  pvp=true
+  snooper-enabled=true
+  level-type=amplified
+  hardcore=false
+  enable-command-block=false
+  max-players=20
+  network-compression-threshold=256
+  resource-pack-sha1=
+  max-world-size=29999984
+  server-port=25565
+  server-ip=
+  spawn-npcs=true
+  allow-flight=true
+  level-name=world
+  view-distance=32
+  resource-pack=
+  spawn-animals=true
+  white-list=true
+  generate-structures=true
+  online-mode=true
+  max-build-height=512
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false