Merge pull request #1091 from paulfantom/default-containers

jsonnet: add default container annotation for KSM and blackbox exporter

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' },

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,

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

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