grafana-operator version updated to 3.9.0

Added configurable readiness and liveness probes for grafana custom resource
Added plugins init image support for grafana custom resource
Added service name configuration for grafana custom resource
Added conditional serviceaccount creation for grafana custom resource

Author: LuciferInLove

Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: grafana-operator
-version: 0.1.0
-appVersion: 3.6.0
+version: 0.1.1
+appVersion: 3.9.0
 kubeVersion: "^1.8.0-0"
 description: A Kubernetes Operator based on the Operator SDK for creating and managing Grafana instances.
 home: https://github.com/integr8ly/grafana-operator

README.md

@@ -43,6 +43,7 @@ helm install grafana-operator ./ --namespace grafana
 | operator.monitoring.relabelings | list | `[]` | ServiceMonitor endpoint relabelings. |
 | grafana[0].name | string | `grafana` | Name of Grafana instance. |
 | grafana[0].baseImage | string | `""` | Custom grafana image for the grafana deployment. Warning! This overwrites the `--grafana-image` operator flag. |
+| grafana[0].initImage | string | `""` | Custom grafana plugins init image for the grafana deployment. Warning! This overwrites the `--grafana-plugins-init-container-image` operator flag. |
 | grafana[0].containers | list | `[]` | Additional containers to add to the grafana pod. |
 | grafana[0].secrets | list | `[]` | Secrets to be mounted as volume into the grafana deployment. |
 | grafana[0].configMaps | list | `[]` | ConfigMaps to be mounted as volume into the grafana deployment. |
@@ -67,12 +68,15 @@ helm install grafana-operator ./ --namespace grafana
 | grafana[0].ingress.tlsSecretName | string | `""` | Name of the ingress certificate secret. |
 | grafana[0].ingress.termination | string | `""` | Used in Openshift, dictates where the secure communication will stop. |
 | grafana[0].service.enabled | bool | `true` | Defines if grafana instance's service is enabled. |
+| grafana[0].service.name | string | `grafana-service` | Configurable name for the grafana's service. |
 | grafana[0].service.ports | list | `[{"name": "grafana", "port": 3000, "protocol": "TCP", "targetPort": "grafana-http"}]` | Grafana instance's service ports. |
 | grafana[0].service.annotations | object | `{}` | Grafana instance's service annotations. |
 | grafana[0].service.labels | object | `{}` | Grafana instance's service labels. |
 | grafana[0].service.type | string | `ClusterIP` | Grafana instance's service type. |
+| grafana[0].service.clusterIP | string | `""` | Specifies your own cluster IP address for the grafana's service. |
 | grafana[0].client | object | `{"preferService": true}` | Grafana client settings. |
 | grafana[0].compat | object | `{}` | Grafana's backwards compatibility switches. |
+| grafana[0].serviceAccount.skip | bool | `false` | Skips the grafana's ServiceAccount creation. |
 | grafana[0].serviceAccount.annotations | object | `{}` | Additional annotations for ServiceAccount. |
 | grafana[0].serviceAccount.labels | object | `{}` | Additional labels for ServiceAccount. |
 | grafana[0].serviceAccount.imagePullSecrets | array | `[]` | Additional image pull secrets for ServiceAccount. |
@@ -94,5 +98,7 @@ helm install grafana-operator ./ --namespace grafana
 | grafana[0].dataStorage.size | string | `""` | Grafana instance's persistent volume size. |
 | grafana[0].dataStorage.class | string | `""` | Grafana instance's persistent volume storage class. |
 | grafana[0].jsonnet | object | `{}` | Label selector for jsonnet libraries. |
+| grafana[0].livenessProbeSpec | object | `{}` | Liveness probe configuration for the grafana container. |
+| grafana[0].readinessProbeSpec | object | `{}` | Readiness probe configuration for the grafana container. |
 | grafanaDataSource | list | `[]` | List of GrafanaDataSource objects. See an example in values.yaml. |
 | grafanaDashboard | list | `[]` | List of GrafanaDashboard objects. See an example in values.yaml. |

crds/grafana.yaml

@@ -102,6 +102,9 @@ spec:
             service:
               type: object
               properties:
+                name:
+                  type: string
+                  description: Override default service name
                 ports:
                   type: array
                   description: Override default ports
@@ -150,6 +153,9 @@ spec:
             serviceAccount:
               type: object
               properties:
+                skip:
+                  type: boolean
+                  description: Disable ServiceAccount creation for grafana
                 annotations:
                   type: object
                   description: Additional annotations for the serviceaccount
@@ -199,3 +205,81 @@ spec:
             baseImage:
               type: string
               description: Override base image
+            initImage:
+              type: string
+              description: Override plugins init image
+            livenessProbeSpec:
+              type: object
+              properties:
+                initialDelaySeconds:
+                  description: >-
+                    Number of seconds after the container has
+                    started before liveness probes are initiated. More info:
+                    https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                  format: int32
+                  type: integer
+                timeoutSeconds:
+                  description: Number of seconds after which the probe times out. Defaults to 1 second.
+                    Minimum value is 1.
+                  format: int32
+                  type: integer
+                periodSeconds:
+                  description: >-
+                    How often (in seconds) to perform the probe.
+                    Default to 10 seconds. Minimum value is 1.
+                  format: int32
+                  type: integer
+                successThreshold:
+                  description: >-
+                    Minimum consecutive successes for the probe
+                    to be considered successful after having failed. Defaults
+                    to 1. Must be 1 for liveness and startup. Minimum value
+                    is 1.
+                  format: int32
+                  type: integer
+                failureThreshold:
+                  description: >-
+                    When a probe fails, Kubernetes will try failureThreshold times before giving up.
+                    Giving up in case of liveness probe means restarting the container.
+                    In case of readiness probe the Pod will be marked Unready.
+                    Defaults to 3. Minimum value is 1.
+                  format: int32
+                  type: integer
+            readinessProbeSpec:
+              type: object
+              properties:
+                initialDelaySeconds:
+                  description: >-
+                    Number of seconds after the container has
+                    started before liveness probes are initiated. More info
+                    https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                  format: int32
+                  type: integer
+                timeoutSeconds:
+                  description: >-
+                    Number of seconds after which the probe times out. Defaults to 1 second.
+                    Minimum value is 1.
+                  format: int32
+                  type: integer
+                periodSeconds:
+                  description: >-
+                    How often (in seconds) to perform the probe.
+                    Default to 10 seconds. Minimum value is 1.
+                  format: int32
+                  type: integer
+                successThreshold:
+                  description: >-
+                    Minimum consecutive successes for the probe
+                    to be considered successful after having failed. Defaults
+                    to 1. Must be 1 for liveness and startup. Minimum value
+                    is 1.
+                  format: int32
+                  type: integer
+                failureThreshold:
+                  description: >-
+                    When a probe fails, Kubernetes will try failureThreshold times before giving up.
+                    Giving up in case of liveness probe means restarting the container.
+                    In case of readiness probe the Pod will be marked Unready.
+                    Defaults to 3. Minimum value is 1.
+                  format: int32
+                  type: integer

crds/grafanaDashboard.yaml

@@ -23,8 +23,6 @@ spec:
         spec:
           type: object
           properties:
-            name:
-              type: string
             json:
               type: string
             jsonnet:

templates/grafana.yaml

@@ -13,6 +13,9 @@ items:
     {{- if .baseImage }}
     baseImage: {{ .baseImage }}
     {{- end }}
+    {{- if .initImage }}
+    initImage: {{ .initImage }}
+    {{- end }}
     {{- if .containers }}
     containers:
     {{- range .containers }}
@@ -88,19 +91,25 @@ items:
       {{- end }}
     {{- if .service.enabled }}
     service:
-    {{- with .service.ports }}
+      name: {{ .service.name }}
+      {{- with .service.ports }}
       ports:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .service.annotations }}
+      {{- end }}
+      {{- with .service.annotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .service.labels }}
+      {{- end }}
+      {{- with .service.labels }}
       labels:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
+      {{- end }}
       type: {{ .service.type }}
+      {{- if eq .service.type "ClusterIP" }}
+      {{- if .service.clusterIP }}
+      clusterIP: {{ .service.clusterIP }}
+      {{- end }}
+      {{- end }}
     {{- end }}
     {{- with .client }}
     client:
@@ -110,8 +119,8 @@ items:
     compat:
       {{- toYaml . | nindent 6 }}
     {{- end }}
-    {{- if or .serviceAccount.annotations .serviceAccount.labels }}
     serviceAccount:
+      skip: {{ .serviceAccount.skip }}
       {{- with .serviceAccount.annotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
@@ -124,7 +133,6 @@ items:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-    {{- end }}
     config:
     {{- if .configTemplated }}
       {{- tpl (toYaml .config) $ | nindent 6 }}
@@ -189,5 +197,13 @@ items:
     jsonnet:
       {{- toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .livenessProbeSpec }}
+    livenessProbeSpec:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .readinessProbeSpec }}
+    readinessProbeSpec:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
 {{- end }}
 {{- end }}

templates/grafanaDashboard.yaml

@@ -10,7 +10,6 @@ items:
     labels:
       {{- include "grafana-operator.labels" $ | nindent 6 }}
   spec:
-    name: {{ .name }}.json
     {{- if .json }}
     json:
     {{- if .jsonTemplated }}

values.yaml

@@ -9,7 +9,7 @@ operator:
   ##
   image:
     repository: quay.io/integreatly/grafana-operator
-    tag: v3.6.0
+    tag: v3.9.0
     pullPolicy: IfNotPresent
 
   ## Operator flags that can be passed in the args section of the container in the deployment
@@ -120,6 +120,11 @@ grafana:
   ##
   baseImage: ""
 
+  ## Custom grafana plugins init image for the grafana deployment
+  ## Warning! This overwrites the --grafana-plugins-init-container-image operator flag in .Values.operator.args.
+  ##
+  initImage: ""
+
   ## Additional containers to add to the grafana pod
   ##
   containers: []
@@ -176,6 +181,7 @@ grafana:
   ##
   service:
     enabled: true
+    name: grafana-service
     ports:
     - name: grafana
       port: 3000
@@ -184,6 +190,7 @@ grafana:
     annotations: {}
     labels: {}
     type: ClusterIP
+    clusterIP: ""
 
   ## Grafana client settings
   ##
@@ -196,6 +203,7 @@ grafana:
   compat: {}
 
   serviceAccount:
+    skip: false
     annotations: {}
     labels: {}
     imagePullSecrets: []
@@ -273,6 +281,16 @@ grafana:
   ##
   jsonnet: {}
 
+  ## Defines the time, in seconds, to be used for each field in the liveness probe configuration
+  ## ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/deploy_grafana.md#configuring-readinessliveness-probes
+  ##
+  livenessProbeSpec: {}
+
+  ## Defines the time, in seconds, to be used for each field in the readiness probe configuration
+  ## ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/deploy_grafana.md#configuring-readinessliveness-probes
+  ##
+  readinessProbeSpec: {}
+
 ## Create GrafanaDataSource objects
 ## ref: https://github.com/integr8ly/grafana-operator#grafanadatasource
 ## ref: https://grafana.com/docs/grafana/latest/administration/provisioning/