[stable/grafana] Add variable to disable creating test resources (#17757)

Signed-off-by: Andrew Drake <andrew@frontapp.com>

stable/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.8.19
+version: 3.9.0
 appVersion: 6.3.5
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

stable/grafana/README.md

@@ -129,6 +129,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `rbac.extraRoleRules`                     | Additional rules to add to the Role                                                                     | [] |
 | `rbac.extraClusterRoleRules`              | Additional rules to add to the ClusterRole                                                              | [] |
 | `command`                     | Define command to be executed by grafana container at startup  | `nil` |
+| `testFramework.enabled`                   | Whether to create test-related resources       | `true`                                                 |
 | `testFramework.image`                     | `test-framework` image repository.             | `dduportal/bats`                                       |
 | `testFramework.tag`                       | `test-framework` image tag.                    | `0.4.0`                                                |
 | `testFramework.securityContext`           | `test-framework` securityContext                | `{}`                                                   |

stable/grafana/templates/tests/test-configmap.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.testFramework.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -16,3 +17,4 @@ data:
       code=$(curl -s -o /dev/null -I -w "%{http_code}" $url)
       [ "$code" == "200" ]
     }
+{{- end }}

stable/grafana/templates/tests/test-podsecuritypolicy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.pspEnabled }}
+{{- if and .Values.testFramework.enabled .Values.rbac.pspEnabled }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:

stable/grafana/templates/tests/test-role.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.pspEnabled -}}
+{{- if and .Values.testFramework.enabled .Values.rbac.pspEnabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

stable/grafana/templates/tests/test-rolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.rbac.pspEnabled -}}
+{{- if and .Values.testFramework.enabled .Values.rbac.pspEnabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

stable/grafana/templates/tests/test-serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccount.create }}
+{{- if and .Values.testFramework.enabled .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

stable/grafana/templates/tests/test.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.testFramework.enabled }}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -63,3 +64,4 @@ spec:
   - name: tools
     emptyDir: {}
   restartPolicy: Never
+{{- end }}

stable/grafana/values.yaml

@@ -54,6 +54,7 @@ image:
   #   - myRegistrKeySecretName
 
 testFramework:
+  enabled: true
   image: "dduportal/bats"
   tag: "0.4.0"
   securityContext: {}