Configure service monitor (#225)

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add ServiceMonitor for monitoring.
+
 ### Changed
 
 - Change container image registry values name to use values from `config` repo.

config/helm/kustomization.yaml

@@ -16,7 +16,6 @@ images:
 
 transformers:
   - common-labels.yaml
-  - monitoring-annotations.yaml
   - webhook-prefix.yaml
 
 patches:
@@ -43,10 +42,11 @@ patches:
   - path: deployment-securitycontext.yaml
   - path: delete-namespace.yaml
   - path: delete-serviceaccount-annotation.yaml
+  - path: metrics-service-named-port.yaml
   - path: webhook-mutating-certificate.yaml
   - path: webhook-mutating-watchfilter.yaml
   - path: webhook-validating-certificate.yaml
   - path: webhook-validating-watchfilter.yaml
-  - path: service-add-metrics-port.yaml
+  - path: webhook-service-named-port.yaml
   - path: certificate.yaml
   - path: secret.yaml

config/helm/metrics-service-named-port.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: capa-metrics-service
+  namespace: capa-system
+spec:
+  ports:
+    - name: metrics
+      port: 8080
+      protocol: TCP
+      targetPort: metrics

config/helm/service-add-metrics-port.yaml → config/helm/webhook-service-named-port.yaml

@@ -2,13 +2,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: capa-system
   name: capa-webhook-service
+  namespace: capa-system
 spec:
   ports:
-    - name: metrics
-      port: 8080
-      targetPort: metrics
     - name: webhook-server
       port: 443
       targetPort: webhook-server

helm/cluster-api-provider-aws/files/copy/service-monitor.yaml

@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "resource.default.name"  . }}
+  namespace: {{ include "resource.default.namespace"  . }}
+  labels:
+    {{- include "labels.common" . | nindent 4 }}
+spec:
+  endpoints:
+    - port: metrics
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/provider: infrastructure-aws

helm/cluster-api-provider-aws/templates/service-monitor.yaml

@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "resource.default.name"  . }}
+  namespace: {{ include "resource.default.namespace"  . }}
+  labels:
+    {{- include "labels.common" . | nindent 4 }}
+spec:
+  endpoints:
+    - port: metrics
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/provider: infrastructure-aws

helm/cluster-api-provider-aws/templates/v1_service_capa-metrics-service.yaml

@@ -14,7 +14,8 @@ metadata:
   namespace: '{{ .Release.Namespace }}'
 spec:
   ports:
-  - port: 8080
+  - name: metrics
+    port: 8080
     protocol: TCP
     targetPort: metrics
   selector:

helm/cluster-api-provider-aws/templates/v1_service_capa-webhook-service.yaml

@@ -14,9 +14,6 @@ metadata:
   namespace: '{{ .Release.Namespace }}'
 spec:
   ports:
-  - name: metrics
-    port: 8080
-    targetPort: metrics
   - name: webhook-server
     port: 443
     targetPort: webhook-server