Merge pull request #64 from sapcc/ingress_metrics

update ingress controller to 0.9.0-beta.2 and add prometheus scrape annotations to service

Author: databus23

system/kube-system/charts/ingress/templates/default-backend-deployment.yaml

@@ -23,7 +23,8 @@ spec:
         # Any image is permissable as long as:
         # 1. It serves a 404 page at /
         # 2. It serves 200 on a /healthz endpoint
-        image: gcr.io/google_containers/defaultbackend:1.0
+        image: "{{ .Values.defaultBackend.image.repository }}:{{ .Values.defaultBackend.image.tag }}"
+        imagePullPolicy: {{ default "" .Values.defaultBackend.image.pullPolicy | quote }} 
         livenessProbe:
           httpGet:
             path: /healthz

system/kube-system/charts/ingress/templates/ingress-controller-configmap.yaml

@@ -3,5 +3,5 @@ kind: ConfigMap
 metadata:
   name: ingress-controller-configmap 
 data:
-  body-size: '0' #disable request size checking
+  proxy-body-size: '0' #disable request size checking
   worker-processes: '40' #default is runtime.NumCPU()

system/kube-system/charts/ingress/templates/ingress-controller-daemonset.yaml

@@ -8,13 +8,18 @@ spec:
   template:
     metadata:
       labels:
-        app: ingress-controller 
+        app: ingress-controller
+      annotations:
+            prometheus.io/scrape: "true"
+            prometheus.io/port: "9101"
     spec:
+      nodeSelector:
+        zone: farm
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
+      - image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
+        imagePullPolicy: {{ default "" .Values.controller.image.pullPolicy | quote }}
         name: nginx-ingress-lb
-        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz
@@ -41,7 +46,11 @@ spec:
             containerPort: 80
           - name: https
             containerPort: 443
+          - name: request-metrics
+            containerPort: 9101
+          - name: metrics
+            containerPort: 10254
         args:
         - /nginx-ingress-controller
         - --default-backend-service={{.Release.Namespace}}/ingress-default-backend
-        - --nginx-configmap={{.Release.Namespace}}/ingress-controller-configmap
+        - --configmap={{.Release.Namespace}}/ingress-controller-configmap

system/kube-system/charts/ingress/templates/ingress-service.yaml

@@ -2,8 +2,10 @@ kind: Service
 apiVersion: v1
 
 metadata:
-  name: ingress-controller 
-
+  name: ingress-controller
+  annotations:
+      prometheus.io/scrape: "true"
+      prometheus.io/port: "10254"
 spec:
   type: ClusterIP 
   selector:
@@ -14,6 +16,6 @@ spec:
       targetPort: http
     - name: https 
       port: 443 
-      targetPort: https 
+      targetPort: https
   externalIPs: 
     - {{.Values.external_service_ip}}