From 5ac45699985d2ea3a7e0df0237a94de8cf17412a Mon Sep 17 00:00:00 2001 From: Christos Kotsis Date: Tue, 18 May 2021 15:29:58 +0300 Subject: [PATCH] [addons/networking.cilium.io] enable prometheus scraping When EnablePromethesMetrics is enabled the required metrics endpoints are exposed but no annotations is included in the agents. This commit includes the prometheus.io/scrape and prometheus.io/port annotations that prometheus scrappers can use for auto-discovery Co-authored-by: tchatzig --- .../addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template | 6 ++++++ .../addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template | 6 ++++++ .../networking.cilium.io/k8s-1.16-v1.10.yaml.template | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template index e446ea6442..3868cea2ea 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template @@ -417,6 +417,12 @@ spec: # gets priority scheduling. # https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ scheduler.alpha.kubernetes.io/critical-pod: "" + # Annotation required for prometheus auto-discovery scrapping + # https://docs.cilium.io/en/v1.9/operations/metrics/#installation + {{ if .EnablePrometheusMetrics }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .AgentPrometheusPort | quote }} + {{ end }} labels: k8s-app: cilium kubernetes.io/cluster-service: "true" diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template index 59b0f8b1f7..7829c480b4 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template @@ -503,6 +503,12 @@ spec: # gets priority scheduling. # https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ scheduler.alpha.kubernetes.io/critical-pod: "" + # Annotation required for prometheus auto-discovery scrapping + # https://docs.cilium.io/en/v1.9/operations/metrics/#installation + {{ if .EnablePrometheusMetrics }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .AgentPrometheusPort | quote }} + {{ end }} labels: k8s-app: cilium kubernetes.io/cluster-service: "true" diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template index 34c29830a1..94460b106e 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template @@ -519,6 +519,12 @@ spec: # gets priority scheduling. # https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ scheduler.alpha.kubernetes.io/critical-pod: "" + # Annotation required for prometheus auto-discovery scrapping + # https://docs.cilium.io/en/v1.9/operations/metrics/#installation + {{ if .EnablePrometheusMetrics }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .AgentPrometheusPort | quote }} + {{ end }} labels: k8s-app: cilium kubernetes.io/cluster-service: "true"