From 92e394c0c8e3c1c1a16f432c7fdf92393b77e480 Mon Sep 17 00:00:00 2001
From: Matt Abrams <37156449+zuchka@users.noreply.github.com>
Date: Tue, 13 Apr 2021 04:03:15 -1000
Subject: [PATCH] Docs: fix "How To Deploy Grafana to K8s" documentation yaml
 file (#32918)

* removes storageClassName from PVC config

* adds securityContext to `spec.template.spec`
solves permissions errors for /var/lib/grafana mountPath

* bumps grafana image to v7.5.2

* adds livenessProbe to spec.template.spec.containers

* tweaks container resources and volume name

Co-authored-by: achatterjee-grafana <aparajita.chatterjee@grafana.com>
---
 docs/sources/installation/kubernetes.md | 31 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/docs/sources/installation/kubernetes.md b/docs/sources/installation/kubernetes.md
index c99ec78046f..298c0ce83b3 100644
--- a/docs/sources/installation/kubernetes.md
+++ b/docs/sources/installation/kubernetes.md
@@ -19,14 +19,13 @@ If you are interested in Grafana Enterprise (not Grafana OS), jump to [Deploy Gr
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: grafana
+  name: grafana-pvc
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 1Gi
-  storageClassName: local-path
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -43,10 +42,14 @@ spec:
       labels:
         app: grafana
     spec:
+      securityContext:
+        fsGroup: 472
+        supplementalGroups:
+        - 0    
       containers:
-        - image: grafana/grafana:latest
+        - name: grafana
+          image: grafana/grafana:7.5.2
           imagePullPolicy: IfNotPresent
-          name: grafana
           ports:
             - containerPort: 3000
               name: http-grafana
@@ -61,19 +64,25 @@ spec:
             periodSeconds: 30
             successThreshold: 1
             timeoutSeconds: 2
+          livenessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            tcpSocket:
+              port: 3000
+            timeoutSeconds: 1            
           resources:
-            limits:
-              memory: 4Gi
             requests:
-              cpu: 100m
-              memory: 2Gi
+              cpu: 250m
+              memory: 750Mi
           volumeMounts:
             - mountPath: /var/lib/grafana
-              name: grafana
+              name: grafana-pv
       volumes:
-        - name: grafana
+        - name: grafana-pv
           persistentVolumeClaim:
-            claimName: grafana
+            claimName: grafana-pvc
 ---
 apiVersion: v1
 kind: Service