Merge pull request #892 from paulfantom/easier_images

jsonnet: move all images and versions into values.common

jsonnet/kube-prometheus/main.libsonnet

@@ -18,60 +18,79 @@ local prometheus = import './components/prometheus.libsonnet';
         role: 'alert-rules',
         prometheus: $.values.prometheus.name,
       },
+      versions: {
+        alertmanager: '0.21.0',
+        blackboxExporter: '0.18.0',
+        grafana: '7.3.7',
+        kubeStateMetrics: '1.9.7',
+        nodeExporter: '1.0.1',
+        prometheus: '2.24.0',
+        prometheusAdapter: '0.8.2',
+        prometheusOperator: '0.45.0',
+      },
+      images: {
+        alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
+        blackboxExporter: 'quay.io/prometheus/blackbox-exporter:v' + $.values.common.versions.blackboxExporter,
+        grafana: 'grafana/grafana:v' + $.values.common.versions.grafana,
+        kubeStateMetrics: 'quay.io/coreos/kube-state-metrics:v' + $.values.common.versions.kubeStateMetrics,
+        nodeExporter: 'quay.io/prometheus/node-exporter:v' + $.values.common.versions.nodeExporter,
+        prometheus: 'quay.io/prometheus/prometheus:v' + $.values.common.versions.prometheus,
+        prometheusAdapter: 'directxman12/k8s-prometheus-adapter:v' + $.values.common.versions.prometheusAdapter,
+        prometheusOperator: 'quay.io/prometheus-operator/prometheus-operator:v' + $.values.common.versions.prometheusOperator,
+        prometheusOperatorReloader: 'quay.io/prometheus-operator/prometheus-config-reloader:v' + $.values.common.versions.prometheusOperator,
+      },
     },
     alertmanager: {
       name: 'main',
       namespace: $.values.common.namespace,
-      version: '0.21.0',
+      version: $.values.common.versions.alertmanager,
-      image: 'quay.io/prometheus/alertmanager:v0.21.0',
+      image: $.values.common.images.alertmanager,
-      mixin+: {
+      mixin+: { ruleLabels: $.values.common.ruleLabels },
-        ruleLabels: $.values.common.ruleLabels,
-      },
     },
     blackboxExporter: {
       namespace: $.values.common.namespace,
-      version: '0.18.0',
+      version: $.values.common.versions.blackboxExporter,
-      image: 'quay.io/prometheus/blackbox-exporter:v0.18.0',
+      image: $.values.common.images.blackboxExporter,
     },
     grafana: {
       namespace: $.values.common.namespace,
-      version: '7.3.5',
+      version: $.values.common.versions.grafana,
-      image: 'grafana/grafana:v7.3.7',
+      image: $.values.common.images.grafana,
       prometheusName: $.values.prometheus.name,
       // TODO(paulfantom) This should be done by iterating over all objects and looking for object.mixin.grafanaDashboards
       dashboards: $.nodeExporter.mixin.grafanaDashboards + $.prometheus.mixin.grafanaDashboards + $.kubernetesMixin.mixin.grafanaDashboards,
     },
     kubeStateMetrics: {
       namespace: $.values.common.namespace,
-      version: '1.9.7',
+      version: $.values.common.versions.kubeStateMetrics,
-      image: 'quay.io/coreos/kube-state-metrics:v1.9.7',
+      image: $.values.common.images.kubeStateMetrics,
       mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     nodeExporter: {
       namespace: $.values.common.namespace,
-      version: '1.0.1',
+      version: $.values.common.versions.nodeExporter,
-      image: 'quay.io/prometheus/node-exporter:v1.0.1',
+      image: $.values.common.images.nodeExporter,
       mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     prometheus: {
       namespace: $.values.common.namespace,
-      version: '2.24.0',
+      version: $.values.common.versions.prometheus,
-      image: 'quay.io/prometheus/prometheus:v2.24.0',
+      image: $.values.common.images.prometheus,
       name: 'k8s',
       alertmanagerName: $.values.alertmanager.name,
       mixin+: { ruleLabels: $.values.common.ruleLabels },
     },
     prometheusAdapter: {
       namespace: $.values.common.namespace,
-      version: '0.8.2',
+      version: $.values.common.versions.prometheusAdapter,
-      image: 'directxman12/k8s-prometheus-adapter:v0.8.2',
+      image: $.values.common.images.prometheusAdapter,
       prometheusURL: 'http://prometheus-' + $.values.prometheus.name + '.' + $.values.common.namespace + '.svc.cluster.local:9090/',
     },
     prometheusOperator: {
       namespace: $.values.common.namespace,
-      version: '0.45.0',
+      version: $.values.common.versions.prometheusOperator,
-      image: 'quay.io/prometheus-operator/prometheus-operator:v0.45.0',
+      image: $.values.common.images.prometheusOperator,
-      configReloaderImage: 'quay.io/prometheus-operator/prometheus-config-reloader:v0.45.0',
+      configReloaderImage: $.values.common.images.prometheusOperatorReloader,
       commonLabels+: {
         'app.kubernetes.io/part-of': 'kube-prometheus',
       },

manifests/grafana-dashboardDatasources.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana-datasources
   namespace: monitoring
 type: Opaque

manifests/grafana-dashboardDefinitions.yaml

@@ -1733,7 +1733,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-apiserver
     namespace: monitoring
 - apiVersion: v1
@@ -3604,7 +3604,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-cluster-total
     namespace: monitoring
 - apiVersion: v1
@@ -4744,7 +4744,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-controller-manager
     namespace: monitoring
 - apiVersion: v1
@@ -7315,7 +7315,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-cluster
     namespace: monitoring
 - apiVersion: v1
@@ -9590,7 +9590,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -10557,7 +10557,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-node
     namespace: monitoring
 - apiVersion: v1
@@ -12318,7 +12318,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-pod
     namespace: monitoring
 - apiVersion: v1
@@ -14341,7 +14341,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-workload
     namespace: monitoring
 - apiVersion: v1
@@ -16525,7 +16525,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-k8s-resources-workloads-namespace
     namespace: monitoring
 - apiVersion: v1
@@ -19047,7 +19047,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-kubelet
     namespace: monitoring
 - apiVersion: v1
@@ -20500,7 +20500,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-namespace-by-pod
     namespace: monitoring
 - apiVersion: v1
@@ -22225,7 +22225,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-namespace-by-workload
     namespace: monitoring
 - apiVersion: v1
@@ -23178,7 +23178,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-node-cluster-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -24158,7 +24158,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-node-rsrc-use
     namespace: monitoring
 - apiVersion: v1
@@ -25144,7 +25144,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-nodes
     namespace: monitoring
 - apiVersion: v1
@@ -25710,7 +25710,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-persistentvolumesusage
     namespace: monitoring
 - apiVersion: v1
@@ -26927,7 +26927,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-pod-total
     namespace: monitoring
 - apiVersion: v1
@@ -28586,7 +28586,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-prometheus-remote-write
     namespace: monitoring
 - apiVersion: v1
@@ -29802,7 +29802,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-prometheus
     namespace: monitoring
 - apiVersion: v1
@@ -31022,7 +31022,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-proxy
     namespace: monitoring
 - apiVersion: v1
@@ -32085,7 +32085,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-scheduler
     namespace: monitoring
 - apiVersion: v1
@@ -33002,7 +33002,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-statefulset
     namespace: monitoring
 - apiVersion: v1
@@ -34429,7 +34429,7 @@ items:
       app.kubernetes.io/component: grafana
       app.kubernetes.io/name: grafana
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 7.3.5
+      app.kubernetes.io/version: 7.3.7
     name: grafana-dashboard-workload-total
     namespace: monitoring
 kind: ConfigMapList

manifests/grafana-dashboardSources.yaml

@@ -21,6 +21,6 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana-dashboards
   namespace: monitoring

manifests/grafana-deployment.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana
   namespace: monitoring
 spec:
@@ -18,16 +18,16 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/grafana-datasources: a77789e5440a1e51e204e99e2f0f480a
+        checksum/grafana-datasources: b559161af8b85c237ef0432d8431a19a
       labels:
         app.kubernetes.io/component: grafana
         app.kubernetes.io/name: grafana
         app.kubernetes.io/part-of: kube-prometheus
-        app.kubernetes.io/version: 7.3.5
+        app.kubernetes.io/version: 7.3.7
     spec:
       containers:
       - env: []
-        image: grafana/grafana:7.3.5
+        image: grafana/grafana:7.3.7
         name: grafana
         ports:
         - containerPort: 3000

manifests/grafana-service.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana
   namespace: monitoring
 spec:

manifests/grafana-serviceMonitor.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 7.3.5
+    app.kubernetes.io/version: 7.3.7
   name: grafana
   namespace: monitoring
 spec: