implement ready/live probe customization

add missing fields for probes fix nil pointer dereference in get methods for live/ready probes move crd to proper version, add documentation format
rewantsoni · Dec 8, 2020 · 6dc868f · 6dc868f
1 parent abacc53
commit 6dc868f
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 53 deletions.
diff --git a/deploy/crds/Grafana.yaml b/deploy/crds/Grafana.yaml
@@ -11,11 +11,11 @@ spec:
     singular: grafana
   scope: Namespaced
   subresources:
-    status: {}
+    status: { }
   version: v1alpha1
   validation:
     openAPIV3Schema:
-      required: ["spec"]
+      required: [ "spec" ]
       properties:
         spec:
           properties:
@@ -106,7 +106,7 @@ spec:
                 labels:
                   type: object
                   description: Additional labels for the service
-                nodeSelector: 
+                nodeSelector:
                   type: object
                   description: Additional labels for the running grafana pods in a labeled node.
                 tolerations:
@@ -147,3 +147,69 @@ spec:
             jsonnet:
               type: object
               description: Jsonnet library configuration
+        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
diff --git a/deploy/examples/Grafana.yaml b/deploy/examples/Grafana.yaml
@@ -32,4 +32,4 @@ spec:
       memory: 8000Mi
     requests:
       cpu: 100m
-      memory: 200Mi
+      memory: 200Mi
diff --git a/deploy/olm-catalog/grafana-operator/2.x.x/Grafana.yaml b/deploy/olm-catalog/grafana-operator/2.x.x/Grafana.yaml
@@ -13,7 +13,7 @@ spec:
   version: v1alpha1
   validation:
     openAPIV3Schema:
-      required: ["spec"]
+      required: [ "spec" ]
       properties:
         spec:
           properties:
@@ -90,4 +90,4 @@ spec:
               type: array
               items:
                 type: object
-                description: Label selector or match expressions
+                description: Label selector or match expressions