From 7b69800686864592cf37e3247fc6cf7dbdf29fce Mon Sep 17 00:00:00 2001 From: paulfantom <pawel@krupa.net.pl> Date: Tue, 13 Apr 2021 13:38:02 +0200 Subject: [PATCH] jsonnet: add default container annotation for KSM and blackbox Signed-off-by: paulfantom <pawel@krupa.net.pl> --- .../kube-prometheus/components/blackbox-exporter.libsonnet | 7 ++++++- .../components/kube-state-metrics.libsonnet | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet index 2bec003b..e574c9f2 100644 --- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet @@ -218,7 +218,12 @@ function(params) { replicas: bb._config.replicas, selector: { matchLabels: bb._config.selectorLabels }, template: { - metadata: { labels: bb._config.commonLabels }, + metadata: { + labels: bb._config.commonLabels, + annotations: { + 'kubectl.kubernetes.io/default-container': blackboxExporter.name, + }, + }, spec: { containers: [blackboxExporter, reloader, kubeRbacProxy], nodeSelector: { 'kubernetes.io/os': 'linux' }, diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index c9b5820f..7599f618 100644 --- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet @@ -109,6 +109,11 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- deployment+: { spec+: { template+: { + metadata+: { + annotations+: { + 'kubectl.kubernetes.io/default-container': 'kube-state-metrics', + }, + }, spec+: { containers: std.map(function(c) c { ports:: null, -- GitLab