From 3f0404d9e330563cd8cc244c48c27907c6c24882 Mon Sep 17 00:00:00 2001 From: leonnicolas Date: Thu, 13 May 2021 16:25:29 +0200 Subject: [PATCH] manifests/*: add example podMonitor Signed-off-by: leonnicolas --- manifests/kilo-bootkube-flannel.yaml | 3 +++ manifests/kilo-bootkube.yaml | 3 +++ manifests/kilo-k3s-flannel.yaml | 3 +++ .../kilo-k3s-userspace-heterogeneous.yaml | 9 +++++++++ manifests/kilo-k3s-userspace.yaml | 9 ++++++--- manifests/kilo-k3s.yaml | 3 +++ manifests/kilo-kubeadm-flannel.yaml | 3 +++ manifests/kilo-kubeadm.yaml | 3 +++ manifests/kilo-typhoon-flannel.yaml | 3 +++ manifests/kilo-typhoon.yaml | 3 +++ manifests/podmonitor.yaml | 19 +++++++++++++++++++ 11 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 manifests/podmonitor.yaml diff --git a/manifests/kilo-bootkube-flannel.yaml b/manifests/kilo-bootkube-flannel.yaml index 5d0a0a1..2963ed2 100644 --- a/manifests/kilo-bootkube-flannel.yaml +++ b/manifests/kilo-bootkube-flannel.yaml @@ -52,14 +52,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-bootkube.yaml b/manifests/kilo-bootkube.yaml index e1be55d..9556b8f 100644 --- a/manifests/kilo-bootkube.yaml +++ b/manifests/kilo-bootkube.yaml @@ -86,14 +86,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-k3s-flannel.yaml b/manifests/kilo-k3s-flannel.yaml index 3a09b7e..67bf340 100644 --- a/manifests/kilo-k3s-flannel.yaml +++ b/manifests/kilo-k3s-flannel.yaml @@ -52,14 +52,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-k3s-userspace-heterogeneous.yaml b/manifests/kilo-k3s-userspace-heterogeneous.yaml index c328699..1f22140 100644 --- a/manifests/kilo-k3s-userspace-heterogeneous.yaml +++ b/manifests/kilo-k3s-userspace-heterogeneous.yaml @@ -87,14 +87,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: nodeSelector: nkml.squat.ai/wireguard: "true" @@ -192,14 +195,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo-userspace + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo-userspace + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo-userspace + app.kubernetes.io/part-of: kilo spec: nodeSelector: nkml.squat.ai/wireguard: "false" @@ -218,6 +224,9 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + ports: + - containerPort: 1107 + name: metrics securityContext: privileged: true volumeMounts: diff --git a/manifests/kilo-k3s-userspace.yaml b/manifests/kilo-k3s-userspace.yaml index 2c4c9f5..dcc10bc 100644 --- a/manifests/kilo-k3s-userspace.yaml +++ b/manifests/kilo-k3s-userspace.yaml @@ -85,15 +85,18 @@ metadata: name: kilo namespace: kube-system labels: - app.kubernetes.io/name: kilo + app.kubernetes.io/name: kilo-userspace + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: - app.kubernetes.io/name: kilo + app.kubernetes.io/name: kilo-userspace + app.kubernetes.io/part-of: kilo template: metadata: labels: - app.kubernetes.io/name: kilo + app.kubernetes.io/name: kilo-userspace + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-k3s.yaml b/manifests/kilo-k3s.yaml index ec05244..529f276 100644 --- a/manifests/kilo-k3s.yaml +++ b/manifests/kilo-k3s.yaml @@ -86,14 +86,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-kubeadm-flannel.yaml b/manifests/kilo-kubeadm-flannel.yaml index 01e1373..3c4c958 100644 --- a/manifests/kilo-kubeadm-flannel.yaml +++ b/manifests/kilo-kubeadm-flannel.yaml @@ -52,14 +52,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-kubeadm.yaml b/manifests/kilo-kubeadm.yaml index dbfd1b6..dd2c718 100644 --- a/manifests/kilo-kubeadm.yaml +++ b/manifests/kilo-kubeadm.yaml @@ -86,14 +86,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-typhoon-flannel.yaml b/manifests/kilo-typhoon-flannel.yaml index 8f285a6..666f0c9 100644 --- a/manifests/kilo-typhoon-flannel.yaml +++ b/manifests/kilo-typhoon-flannel.yaml @@ -52,14 +52,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/kilo-typhoon.yaml b/manifests/kilo-typhoon.yaml index ae2ff9d..9e61ecf 100644 --- a/manifests/kilo-typhoon.yaml +++ b/manifests/kilo-typhoon.yaml @@ -86,14 +86,17 @@ metadata: namespace: kube-system labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: selector: matchLabels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo template: metadata: labels: app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo spec: serviceAccountName: kilo hostNetwork: true diff --git a/manifests/podmonitor.yaml b/manifests/podmonitor.yaml new file mode 100644 index 0000000..2a617b0 --- /dev/null +++ b/manifests/podmonitor.yaml @@ -0,0 +1,19 @@ +apiVersion: monitoring.coreos.com/v1 +kind: PodMonitor +metadata: + labels: + app.kubernetes.io/name: kilo + app.kubernetes.io/part-of: kilo + name: kilo + namespace: kilo +spec: + namespaceSelector: + matchNames: + - kube-system + podMetricsEndpoints: + - interval: 15s + port: metrics + path: /metrics + selector: + matchLabels: + app.kubernetes.io/part-of: kilo