From 7b69800686864592cf37e3247fc6cf7dbdf29fce Mon Sep 17 00:00:00 2001 From: paulfantom Date: Tue, 13 Apr 2021 13:38:02 +0200 Subject: [PATCH 1/2] jsonnet: add default container annotation for KSM and blackbox Signed-off-by: paulfantom --- .../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, From 412061ef51ad68a01fff69dcd770e3088679cece Mon Sep 17 00:00:00 2001 From: paulfantom Date: Tue, 13 Apr 2021 14:34:09 +0200 Subject: [PATCH 2/2] manifests: regenerate --- manifests/blackbox-exporter-deployment.yaml | 2 ++ manifests/kube-state-metrics-deployment.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/manifests/blackbox-exporter-deployment.yaml b/manifests/blackbox-exporter-deployment.yaml index 359b2e16..8f895846 100644 --- a/manifests/blackbox-exporter-deployment.yaml +++ b/manifests/blackbox-exporter-deployment.yaml @@ -17,6 +17,8 @@ spec: app.kubernetes.io/part-of: kube-prometheus template: metadata: + annotations: + kubectl.kubernetes.io/default-container: blackbox-exporter labels: app.kubernetes.io/component: exporter app.kubernetes.io/name: blackbox-exporter diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index b5776083..5327e389 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -17,6 +17,8 @@ spec: app.kubernetes.io/part-of: kube-prometheus template: metadata: + annotations: + kubectl.kubernetes.io/default-container: kube-state-metrics labels: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics