Merge pull request #1471 from paulfantom/metadata-management

jsonnet: unify metadata management

Author: paulfantom

jsonnet/kube-prometheus/components/alertmanager.libsonnet

@@ -77,6 +77,11 @@ function(params) {
   // Safety check
   assert std.isObject(am._config.resources),
   assert std.isObject(am._config.mixin._config),
+  _metadata:: {
+    name: 'alertmanager-' + am._config.name,
+    namespace: am._config.namespace,
+    labels: am._config.commonLabels,
+  },
 
   mixin:: (import 'github.com/prometheus/alertmanager/doc/alertmanager-mixin/mixin.libsonnet') +
           (import 'github.com/kubernetes-monitoring/kubernetes-mixin/lib/add-runbook-links.libsonnet') {
@@ -86,10 +91,9 @@ function(params) {
   prometheusRule: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'PrometheusRule',
-    metadata: {
-      labels: am._config.commonLabels + am._config.mixin.ruleLabels,
-      name: 'alertmanager-' + am._config.name + '-rules',
-      namespace: am._config.namespace,
+    metadata: am._metadata {
+      labels+: am._config.mixin.ruleLabels,
+      name: am._metadata.name + '-rules',
     },
     spec: {
       local r = if std.objectHasAll(am.mixin, 'prometheusRules') then am.mixin.prometheusRules.groups else [],
@@ -102,10 +106,8 @@ function(params) {
     apiVersion: 'v1',
     kind: 'Secret',
     type: 'Opaque',
-    metadata: {
-      name: 'alertmanager-' + am._config.name,
-      namespace: am._config.namespace,
-      labels: { alertmanager: am._config.name } + am._config.commonLabels,
+    metadata: am._metadata {
+      labels+: { alertmanager: am._config.name },
     },
     stringData: {
       'alertmanager.yaml': if std.type(am._config.config) == 'object'
@@ -119,46 +121,38 @@ function(params) {
   serviceAccount: {
     apiVersion: 'v1',
     kind: 'ServiceAccount',
-    metadata: {
-      name: 'alertmanager-' + am._config.name,
-      namespace: am._config.namespace,
-      labels: { alertmanager: am._config.name } + am._config.commonLabels,
+    metadata: am._metadata {
+      labels+: { alertmanager: am._config.name },
     },
   },
 
   service: {
     apiVersion: 'v1',
     kind: 'Service',
-    metadata: {
-      name: 'alertmanager-' + am._config.name,
-      namespace: am._config.namespace,
-      labels: { alertmanager: am._config.name } + am._config.commonLabels,
+    metadata: am._metadata {
+      labels+: { alertmanager: am._config.name },
     },
     spec: {
       ports: [
         { name: 'web', targetPort: 'web', port: 9093 },
         { name: 'reloader-web', port: am._config.reloaderPort, targetPort: 'reloader-web' },
       ],
-      selector: {
+      selector: am._config.selectorLabels {
         alertmanager: am._config.name,
-      } + am._config.selectorLabels,
+      },
       sessionAffinity: 'ClientIP',
     },
   },
 
   serviceMonitor: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'ServiceMonitor',
-    metadata: {
-      name: 'alertmanager',
-      namespace: am._config.namespace,
-      labels: am._config.commonLabels,
-    },
+    metadata: am._metadata,
     spec: {
       selector: {
-        matchLabels: {
+        matchLabels: am._config.selectorLabels {
           alertmanager: am._config.name,
-        } + am._config.selectorLabels,
+        },
       },
       endpoints: [
         { port: 'web', interval: '30s' },
@@ -170,41 +164,36 @@ function(params) {
   [if (defaults + params).replicas > 1 then 'podDisruptionBudget']: {
     apiVersion: 'policy/v1',
     kind: 'PodDisruptionBudget',
-    metadata: {
-      name: 'alertmanager-' + am._config.name,
-      namespace: am._config.namespace,
-      labels: am._config.commonLabels,
-    },
+    metadata: am._metadata,
     spec: {
       maxUnavailable: 1,
       selector: {
-        matchLabels: {
+        matchLabels: am._config.selectorLabels {
           alertmanager: am._config.name,
-        } + am._config.selectorLabels,
+        },
       },
     },
   },
 
   alertmanager: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'Alertmanager',
-    metadata: {
+    metadata: am._metadata {
       name: am._config.name,
-      namespace: am._config.namespace,
-      labels: {
+      labels+: {
         alertmanager: am._config.name,
-      } + am._config.commonLabels,
+      },
     },
     spec: {
       replicas: am._config.replicas,
       version: am._config.version,
       image: am._config.image,
       podMetadata: {
-        labels: am._config.commonLabels,
+        labels: am.alertmanager.metadata.labels,
       },
       resources: am._config.resources,
       nodeSelector: { 'kubernetes.io/os': 'linux' },
-      serviceAccountName: 'alertmanager-' + am._config.name,
+      serviceAccountName: am.serviceAccount.metadata.name,
       securityContext: {
         runAsUser: 1000,
         runAsNonRoot: true,

jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet

@@ -92,14 +92,17 @@ function(params) {
   _config:: defaults + params,
   // Safety check
   assert std.isObject(bb._config.resources),
+  _metadata:: {
+    name: 'blackbox-exporter',
+    namespace: bb._config.namespace,
+    labels: bb._config.commonLabels,
+  },
 
   configuration: {
     apiVersion: 'v1',
     kind: 'ConfigMap',
-    metadata: {
+    metadata: bb._metadata {
       name: 'blackbox-exporter-configuration',
-      namespace: bb._config.namespace,
-      labels: bb._config.commonLabels,
     },
     data: {
       'config.yml': std.manifestYamlDoc({ modules: bb._config.modules }),
@@ -109,10 +112,7 @@ function(params) {
   serviceAccount: {
     apiVersion: 'v1',
     kind: 'ServiceAccount',
-    metadata: {
-      name: 'blackbox-exporter',
-      namespace: bb._config.namespace,
-    },
+    metadata: bb._metadata,
   },
 
   clusterRole: {
@@ -138,9 +138,7 @@ function(params) {
   clusterRoleBinding: {
     apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRoleBinding',
-    metadata: {
-      name: 'blackbox-exporter',
-    },
+    metadata: bb._metadata,
     roleRef: {
       apiGroup: 'rbac.authorization.k8s.io',
       kind: 'ClusterRole',
@@ -212,14 +210,12 @@ function(params) {
     {
       apiVersion: 'apps/v1',
       kind: 'Deployment',
-      metadata: {
-        name: 'blackbox-exporter',
-        namespace: bb._config.namespace,
-        labels: bb._config.commonLabels,
-      },
+      metadata: bb._metadata,
       spec: {
         replicas: bb._config.replicas,
-        selector: { matchLabels: bb._config.selectorLabels },
+        selector: {
+          matchLabels: bb._config.selectorLabels,
+        },
         template: {
           metadata: {
             labels: bb._config.commonLabels,
@@ -243,11 +239,7 @@ function(params) {
   service: {
     apiVersion: 'v1',
     kind: 'Service',
-    metadata: {
-      name: 'blackbox-exporter',
-      namespace: bb._config.namespace,
-      labels: bb._config.commonLabels,
-    },
+    metadata: bb._metadata,
     spec: {
       ports: [{
         name: 'https',
@@ -262,29 +254,24 @@ function(params) {
     },
   },
 
-  serviceMonitor:
-    {
-      apiVersion: 'monitoring.coreos.com/v1',
-      kind: 'ServiceMonitor',
-      metadata: {
-        name: 'blackbox-exporter',
-        namespace: bb._config.namespace,
-        labels: bb._config.commonLabels,
-      },
-      spec: {
-        endpoints: [{
-          bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-          interval: '30s',
-          path: '/metrics',
-          port: 'https',
-          scheme: 'https',
-          tlsConfig: {
-            insecureSkipVerify: true,
-          },
-        }],
-        selector: {
-          matchLabels: bb._config.selectorLabels,
+  serviceMonitor: {
+    apiVersion: 'monitoring.coreos.com/v1',
+    kind: 'ServiceMonitor',
+    metadata: bb._metadata,
+    spec: {
+      endpoints: [{
+        bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
+        interval: '30s',
+        path: '/metrics',
+        port: 'https',
+        scheme: 'https',
+        tlsConfig: {
+          insecureSkipVerify: true,
         },
+      }],
+      selector: {
+        matchLabels: bb._config.selectorLabels,
       },
     },
+  },
 }

jsonnet/kube-prometheus/components/grafana.libsonnet

@@ -32,15 +32,16 @@ function(params)
   kubernetesGrafana(config) {
     local g = self,
     _config+:: config,
+    _metadata:: {
+      name: 'grafana',
+      namespace: g._config.namespace,
+      labels: g._config.commonLabels,
+    },
 
     serviceMonitor: {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'ServiceMonitor',
-      metadata: {
-        name: 'grafana',
-        namespace: g._config.namespace,
-        labels: g._config.commonLabels,
-      },
+      metadata: g._metadata,
       spec: {
         selector: {
           matchLabels: {

jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet

@@ -28,6 +28,10 @@ local defaults = {
 function(params) {
   local k8s = self,
   _config:: defaults + params,
+  _metadata:: {
+    labels: k8s._config.commonLabels,
+    namespace: k8s._config.namespace,
+  },
 
   mixin:: (import 'github.com/kubernetes-monitoring/kubernetes-mixin/mixin.libsonnet') {
     _config+:: k8s._config.mixin._config,
@@ -36,10 +40,9 @@ function(params) {
   prometheusRule: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'PrometheusRule',
-    metadata: {
-      labels: k8s._config.commonLabels + k8s._config.mixin.ruleLabels,
+    metadata: k8s._metadata {
       name: 'kubernetes-monitoring-rules',
-      namespace: k8s._config.namespace,
+      labels+: k8s._config.mixin.ruleLabels,
     },
     spec: {
       local r = if std.objectHasAll(k8s.mixin, 'prometheusRules') then k8s.mixin.prometheusRules.groups else {},
@@ -51,10 +54,9 @@ function(params) {
   serviceMonitorKubeScheduler: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'ServiceMonitor',
-    metadata: {
+    metadata: k8s._metadata {
       name: 'kube-scheduler',
-      namespace: k8s._config.namespace,
-      labels: { 'app.kubernetes.io/name': 'kube-scheduler' },
+      labels+: { 'app.kubernetes.io/name': 'kube-scheduler' },
     },
     spec: {
       jobLabel: 'app.kubernetes.io/name',
@@ -77,10 +79,9 @@ function(params) {
   serviceMonitorKubelet: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'ServiceMonitor',
-    metadata: {
+    metadata: k8s._metadata {
       name: 'kubelet',
-      namespace: k8s._config.namespace,
-      labels: { 'app.kubernetes.io/name': 'kubelet' },
+      labels+: { 'app.kubernetes.io/name': 'kubelet' },
     },
     spec: {
       jobLabel: 'app.kubernetes.io/name',
@@ -172,10 +173,9 @@ function(params) {
   serviceMonitorKubeControllerManager: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'ServiceMonitor',
-    metadata: {
+    metadata: k8s._metadata {
       name: 'kube-controller-manager',
-      namespace: k8s._config.namespace,
-      labels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
+      labels+: { 'app.kubernetes.io/name': 'kube-controller-manager' },
     },
     spec: {
       jobLabel: 'app.kubernetes.io/name',
@@ -207,10 +207,9 @@ function(params) {
   serviceMonitorApiserver: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'ServiceMonitor',
-    metadata: {
+    metadata: k8s._metadata {
       name: 'kube-apiserver',
-      namespace: k8s._config.namespace,
-      labels: { 'app.kubernetes.io/name': 'apiserver' },
+      labels+: { 'app.kubernetes.io/name': 'apiserver' },
     },
     spec: {
       jobLabel: 'component',
@@ -261,12 +260,9 @@ function(params) {
   [if (defaults + params).kubeProxy then 'podMonitorKubeProxy']: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'PodMonitor',
-    metadata: {
-      labels: {
-        'k8s-app': 'kube-proxy',
-      },
+    metadata: k8s._metadata {
+      labels+: { 'k8s-app': 'kube-proxy' },
       name: 'kube-proxy',
-      namespace: k8s._config.namespace,
     },
     spec: {
       jobLabel: 'k8s-app',
@@ -300,10 +296,9 @@ function(params) {
   serviceMonitorCoreDNS: {
     apiVersion: 'monitoring.coreos.com/v1',
     kind: 'ServiceMonitor',
-    metadata: {
+    metadata: k8s._metadata {
       name: 'coredns',
-      namespace: k8s._config.namespace,
-      labels: { 'app.kubernetes.io/name': 'coredns' },
+      labels+: { 'app.kubernetes.io/name': 'coredns' },
     },
     spec: {
       jobLabel: 'app.kubernetes.io/name',