Add Prometheus liveness and readiness probes

CHANGES.md

@@ -6,6 +6,10 @@ Notable changes between versions.
 
 * Update Calico from v3.1.2 to v3.1.3
 
+#### Addons
+
+* Add Prometheus liveness and readiness probes
+
 ## v1.10.3
 
 * Kubernetes [v1.10.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#v1103)

addons/prometheus/deployment.yaml

@@ -17,30 +17,41 @@ spec:
     spec:
       serviceAccountName: prometheus
       containers:
-      - name: prometheus
+        - name: prometheus
-        image: quay.io/prometheus/prometheus:v2.2.1
+          image: quay.io/prometheus/prometheus:v2.2.1
-        args:
+          args:
-          - --config.file=/etc/prometheus/prometheus.yaml
+            - --web.listen-address=0.0.0.0:9090
-          - --storage.tsdb.path=/var/lib/prometheus
+            - --config.file=/etc/prometheus/prometheus.yaml
-        ports:
+            - --storage.tsdb.path=/var/lib/prometheus
-        - name: web
+          ports:
-          containerPort: 9090
+            - name: web
-        volumeMounts:
+              containerPort: 9090
-        - name: config
+          volumeMounts:
-          mountPath: /etc/prometheus
+            - name: config
-        - name: rules
+              mountPath: /etc/prometheus
-          mountPath: /etc/prometheus/rules
+            - name: rules
-        - name: data
+              mountPath: /etc/prometheus/rules
-          mountPath: /var/lib/prometheus
+            - name: data
-      dnsPolicy: ClusterFirst
+              mountPath: /var/lib/prometheus
-      restartPolicy: Always
+          readinessProbe:
+            httpGet:
+              path: /-/ready
+              port: 9090
+            initialDelaySeconds: 10
+            timeoutSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /-/healthy
+              port: 9090
+            initialDelaySeconds: 10
+            timeoutSeconds: 10
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: config
+        - name: config
-        configMap:
+          configMap:
-          name: prometheus-config
+            name: prometheus-config
-      - name: rules
+        - name: rules
-        configMap:
+          configMap:
-          name: prometheus-rules
+            name: prometheus-rules
-      - name: data
+        - name: data
-        emptyDir: {}
+          emptyDir: {}