Update grafana to version 5.0.7

stable/grafana/grafana.yaml

@@ -2,17 +2,58 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
+  name: grafana-test
+  namespace: default
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
+  name: grafana-test
+  namespace: default
+rules:
+- apiGroups:
+  - policy
+  resourceNames:
+  - grafana-test
+  resources:
+  - podsecuritypolicies
+  verbs:
+  - use
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 rules:
 - apiGroups:
   - extensions
@@ -27,18 +68,45 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana-clusterrole
 rules: []
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
+  name: grafana-test
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: grafana-test
+subjects:
+- kind: ServiceAccount
+  name: grafana-test
+  namespace: default
+---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -52,8 +120,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -70,15 +141,19 @@ data:
     @test "Test Health" {
       url="http://grafana/api/health"
 
-      code=$(curl -s -o /dev/null -I -w "%{http_code}" $url)
+      code=$(wget --server-response --spider --timeout 10 --tries 1 ${url} 2>&1 | awk '/^  HTTP/{print $2}')
       [ "$code" == "200" ]
     }
 kind: ConfigMap
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana-test
+  namespace: default
 ---
 apiVersion: v1
 data:
@@ -97,61 +172,82 @@ data:
 kind: ConfigMap
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 ---
 apiVersion: v1
 data:
-  admin-password: dU1tSXhBMjA5aWVENURBcW1Na1VGMGUzQ3hic3hQUUhObGcxd2F0bQ==
+  admin-password: MThmWHFGUVBaUWNrOGROd1k0bXlzQ3h0dm1SbXBvWFdyb2NTcXhGZw==
   admin-user: YWRtaW4=
   ldap-toml: ""
 kind: Secret
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 type: Opaque
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 spec:
   ports:
   - name: service
     port: 80
     protocol: TCP
     targetPort: 3000
   selector:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/name: grafana
   type: ClusterIP
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
-      app: grafana
-      release: grafana
+      app.kubernetes.io/instance: grafana
+      app.kubernetes.io/name: grafana
   strategy:
     type: RollingUpdate
   template:
     metadata:
+      annotations:
+        checksum/config: 25c0d6d4ddf8bf7184ff8846a1cf0e665fd4e89b550a57f9dea892ea4a58cd47
+        checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+        checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+        checksum/secret: 04473fb8e27cfb4d99977b54ee9775b217b47f5e97e50b1271360d56a2e9f53b
       labels:
-        app: grafana
-        release: grafana
+        app.kubernetes.io/instance: grafana
+        app.kubernetes.io/name: grafana
     spec:
       containers:
       - env:
@@ -165,7 +261,7 @@ spec:
             secretKeyRef:
               key: admin-password
               name: grafana
-        image: grafana/grafana:6.1.4
+        image: grafana/grafana:6.6.2
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -191,9 +287,6 @@ spec:
         - mountPath: /etc/grafana/grafana.ini
           name: config
           subPath: grafana.ini
-        - mountPath: /etc/grafana/ldap.toml
-          name: ldap
-          subPath: ldap.toml
         - mountPath: /var/lib/grafana
           name: storage
       securityContext:
@@ -204,16 +297,42 @@ spec:
       - configMap:
           name: grafana
         name: config
-      - name: ldap
-        secret:
-          items:
-          - key: ldap-toml
-            path: ldap.toml
-          secretName: grafana
       - emptyDir: {}
         name: storage
 ---
-apiVersion: extensions/v1beta1
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  labels:
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
+  name: grafana-test
+  namespace: default
+spec:
+  allowPrivilegeEscalation: true
+  fsGroup:
+    rule: RunAsAny
+  hostIPC: false
+  hostNetwork: false
+  hostPID: false
+  privileged: false
+  runAsUser:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+  - configMap
+  - downwardAPI
+  - emptyDir
+  - projected
+  - secret
+---
+apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   annotations:
@@ -222,9 +341,13 @@ metadata:
     seccomp.security.alpha.kubernetes.io/allowedProfileNames: docker/default
     seccomp.security.alpha.kubernetes.io/defaultProfileName: docker/default
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana
+  namespace: default
 spec:
   allowPrivilegeEscalation: false
   fsGroup:
@@ -267,40 +390,28 @@ metadata:
   annotations:
     helm.sh/hook: test-success
   labels:
-    app: grafana
-    release: grafana
+    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/version: 6.6.2
+    helm.sh/chart: grafana-5.0.7
   name: grafana-test
+  namespace: default
 spec:
   containers:
   - command:
-    - /tools/bats/bats
+    - /opt/bats/bin/bats
     - -t
     - /tests/run.sh
-    image: dduportal/bats:0.4.0
+    image: bats/bats:v1.1.0
     name: grafana-test
     volumeMounts:
     - mountPath: /tests
       name: tests
       readOnly: true
-    - mountPath: /tools
-      name: tools
-  initContainers:
-  - command:
-    - bash
-    - -c
-    - |
-      set -ex
-      # copy bats to tools dir
-      cp -R /usr/local/libexec/ /tools/bats/
-    image: dduportal/bats:0.4.0
-    name: test-framework
-    volumeMounts:
-    - mountPath: /tools
-      name: tools
   restartPolicy: Never
+  serviceAccountName: grafana-test
   volumes:
   - configMap:
       name: grafana-test
     name: tests
-  - emptyDir: {}
-    name: tools