Merge pull request #133 from metacpan/ssoriche/metrics

Ingress NGINX metrics

Author: oalders

apps/grep/base/deployment.yaml

@@ -16,38 +16,38 @@ spec:
         app: grep
     spec:
       initContainers:
-      - name: repo-seed
-        image: bitnami/git:latest
-        imagePullPolicy: Always
-        volumeMounts:
-        - name: gitrepo
-          mountPath: /shared/metacpan_git
-        command:
-          - sh
-          - -c
-          - |-
-            [ -d /shared/metacpan_git/.git ] \
-            || git clone https://github.com/metacpan/metacpan-cpan-extracted.git /shared/metacpan_git \
-              && touch /shared/metacpan_git/.init_complete 
+        - name: repo-seed
+          image: bitnami/git:latest
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: gitrepo
+              mountPath: /shared/metacpan_git
+          command:
+            - sh
+            - -c
+            - |-
+              [ -d /shared/metacpan_git/.git ] \
+              || git clone https://github.com/metacpan/metacpan-cpan-extracted.git /shared/metacpan_git \
+                && touch /shared/metacpan_git/.init_complete
       containers:
-      - name: web
-        image: metacpan/metacpan-grep-front-end:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 3000
-        envFrom:
-        - configMapRef:
-            name: grep
-        resources:
-          # Manage how much memory is allocated, could add cpu if we wanted
-          requests:
-            memory: "4072Mi"
-          limits:
-            memory: "4072Mi"
-        volumeMounts:
-        - name: gitrepo
-          mountPath: /shared/metacpan_git
-          readOnly: false
+        - name: web
+          image: metacpan/metacpan-grep-front-end:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 3000
+          envFrom:
+            - configMapRef:
+                name: grep
+          resources:
+            # Manage how much memory is allocated, could add cpu if we wanted
+            requests:
+              memory: "4072Mi"
+            limits:
+              memory: "4072Mi"
+          volumeMounts:
+            - name: gitrepo
+              mountPath: /shared/metacpan_git
+              readOnly: false
       volumes:
         - name: gitrepo
           persistentVolumeClaim:

platform/ingress-nginx/kustomization.yaml

@@ -3,6 +3,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.10.1/deploy/static/provider/do/deploy.yaml
+  - service.yaml
+  - servicemonitor.yaml
 patchesStrategicMerge:
   - |-
     apiVersion: v1
@@ -26,6 +28,23 @@ patchesStrategicMerge:
       replicas: 3
       template:
         spec:
+          containers:
+            - name: controller
+              args:
+                - /nginx-ingress-controller
+                - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
+                - --election-id=ingress-nginx-leader
+                - --controller-class=k8s.io/ingress-nginx
+                - --ingress-class=nginx
+                - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
+                - --validating-webhook=:8443
+                - --validating-webhook-certificate=/usr/local/certificates/cert
+                - --validating-webhook-key=/usr/local/certificates/key
+                - --enable-metrics=true
+              ports:
+                - name: metrics
+                  containerPort: 10254
+                  protocol: TCP
           affinity:
             podAntiAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
@@ -35,4 +54,4 @@ patchesStrategicMerge:
                         operator: In
                         values:
                           - ingress-nginx
-                  topologyKey: "kubernetes.io/hostname"
+                  topologyKey: "kubernetes.io/hostname"

platform/ingress-nginx/service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: ingress-nginx-controller-metrics
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/component: controller
+spec:
+  type: ClusterIP
+  ports:
+    - name: metrics
+      port: 10254
+      targetPort: 10254
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/component: controller

platform/ingress-nginx/servicemonitor.yaml

@@ -0,0 +1,22 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    release: prometheus
+spec:
+  endpoints:
+    - port: metrics
+      interval: 30s
+      path: /metrics
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: ingress-nginx
+      app.kubernetes.io/instance: ingress-nginx
+      app.kubernetes.io/component: controller
+  namespaceSelector:
+    matchNames:
+      - ingress-nginx