diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 07f63fa..3be2864 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -19,8 +19,7 @@ bases: - ../samples - ../webhook - ../certmanager -# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. -#- ../prometheus +- ../prometheus patchesStrategicMerge: # Mount the controller config file for loading manager configurations diff --git a/config/install.yaml b/config/install.yaml index 80bffe8..bc7ca7d 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -2317,6 +2317,9 @@ spec: - containerPort: 9443 name: webhook-server protocol: TCP + - containerPort: 8080 + name: metrics + protocol: TCP readinessProbe: httpGet: path: /readyz @@ -2418,6 +2421,25 @@ spec: name: root-client-certs namespace: kamaji-system --- +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + control-plane: controller-manager + name: kamaji-controller-manager-metrics-monitor + namespace: kamaji-system +spec: + endpoints: + - path: /metrics + port: metrics + scheme: http + namespaceSelector: + matchNames: + - kamaji-system + selector: + matchLabels: + control-plane: controller-manager +--- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 1c51a1e..efa1c20 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -42,6 +42,10 @@ spec: image: controller:latest imagePullPolicy: Always name: manager + ports: + - containerPort: 8080 + name: metrics + protocol: TCP securityContext: allowPrivilegeEscalation: false livenessProbe: diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml index ed13716..81dff32 100644 --- a/config/prometheus/kustomization.yaml +++ b/config/prometheus/kustomization.yaml @@ -1,2 +1,5 @@ resources: - monitor.yaml + +configurations: +- kustomizeconfig.yaml diff --git a/config/prometheus/kustomizeconfig.yaml b/config/prometheus/kustomizeconfig.yaml new file mode 100644 index 0000000..27806ca --- /dev/null +++ b/config/prometheus/kustomizeconfig.yaml @@ -0,0 +1,4 @@ +varReference: + - kind: ServiceMonitor + group: monitoring.coreos.com + path: spec/namespaceSelector/matchNames diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index d19136a..f3edc5d 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -1,4 +1,3 @@ - # Prometheus Monitor Service (Metrics) apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -10,11 +9,11 @@ metadata: spec: endpoints: - path: /metrics - port: https - scheme: https - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - tlsConfig: - insecureSkipVerify: true + port: metrics + scheme: http + namespaceSelector: + matchNames: + - $(SERVICE_NAMESPACE) selector: matchLabels: control-plane: controller-manager