Merge pull request #316 from HubertStefanski/fix-crds

fix grafana.yaml
grafana · Dec 11, 2020 · 0161a99 · 0161a99
2 parents fc92a14 + 3d4c084
commit 0161a99
Showing 1 changed file with 75 additions and 66 deletions.
diff --git a/deploy/crds/Grafana.yaml b/deploy/crds/Grafana.yaml
@@ -147,69 +147,78 @@ 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
+            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