From 7e5f2f8685ccf9defee8acfabe0e9191e6309fad Mon Sep 17 00:00:00 2001
From: Jon Owings <owings@purestorage.com>
Date: Thu, 23 Aug 2018 10:34:22 -0400
Subject: [PATCH] Add securityContext to stable/minecraft (#5678)

* Fix Minecraft SecurityContext

* Fix Minecraft SecurityContext

* fixed spacing for linter

* fixed spacing for linter

* spaces fix

* spaces fix

* fixed typo and syntax

* added ci test

* changed to securityContext

* changes per @unguiculus

* Update Chart.yaml

* fix test-values.yaml

* circleci fixes

* rebased and recommit
---
 stable/minecraft/Chart.yaml                | 4 ++--
 stable/minecraft/ci/test-values.yaml       | 3 +++
 stable/minecraft/templates/deployment.yaml | 3 +++
 stable/minecraft/values.yaml               | 7 +++++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 stable/minecraft/ci/test-values.yaml

diff --git a/stable/minecraft/Chart.yaml b/stable/minecraft/Chart.yaml
index 25755ccc17..ec170628a6 100755
--- a/stable/minecraft/Chart.yaml
+++ b/stable/minecraft/Chart.yaml
@@ -1,5 +1,5 @@
 name: minecraft
-version: 0.2.1
+version: 0.2.2
 appVersion: 1.12.2
 home: https://minecraft.net/
 description: Minecraft server
@@ -10,5 +10,5 @@ sources:
 - https://hub.docker.com/r/itzg/minecraft-server/~/dockerfile/
 - https://github.com/itzg/dockerfiles
 maintainers:
-- name: Greg Taylor
+- name: gtaylor
   email: gtaylor@gc-taylor.com
diff --git a/stable/minecraft/ci/test-values.yaml b/stable/minecraft/ci/test-values.yaml
new file mode 100644
index 0000000000..440b8e070b
--- /dev/null
+++ b/stable/minecraft/ci/test-values.yaml
@@ -0,0 +1,3 @@
+# This must be overridden, since we can't accept this for the user.
+  minecraftServer.eula: "TRUE"
+#fix in place and rebased
diff --git a/stable/minecraft/templates/deployment.yaml b/stable/minecraft/templates/deployment.yaml
index cc0b7014fe..00cb24af37 100644
--- a/stable/minecraft/templates/deployment.yaml
+++ b/stable/minecraft/templates/deployment.yaml
@@ -14,6 +14,9 @@ spec:
       labels:
         app: {{ template "minecraft.fullname" . }}
     spec:
+      securityContext:
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+        fsGroup: {{ .Values.securityContext.fsGroup }}
       containers:
       - name: {{ template "minecraft.fullname" . }}
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
diff --git a/stable/minecraft/values.yaml b/stable/minecraft/values.yaml
index 4523782c68..d6c5e79d11 100644
--- a/stable/minecraft/values.yaml
+++ b/stable/minecraft/values.yaml
@@ -10,13 +10,17 @@ resources:
     memory: 512Mi
     cpu: 500m
 
+securityContext:
+  # Security context settings
+  runAsUser: 1000
+  fsGroup: 2000
 # Most of these map to environment variables. See Minecraft for details:
 # https://hub.docker.com/r/itzg/minecraft-server/
 minecraftServer:
   # This must be overridden, since we can't accept this for the user.
   eula: "FALSE"
   # One of: LATEST, SNAPSHOT, or a specific version (ie: "1.7.9").
-  version: "LATEST"
+  version: "1.12.2"
   # One of: peaceful, easy, normal, and hard
   difficulty: easy
   # A comma-separated list of player names to whitelist.
@@ -72,7 +76,6 @@ minecraftServer:
   # If you adjust this, you may need to adjust resources.requests above to match.
   jvmOpts: "-Xmx512M -Xms512M"
   serviceType: LoadBalancer
-
   rcon:
     # If you enable this, make SURE to change your password below.
     enabled: false