From 5f02e2741c6d7d4fa32ceca6bc6454c88618c09a Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Fri, 30 Apr 2021 13:48:34 +0200 Subject: [PATCH 1/6] can change kubeRbacProxy over $.values.common.images --- .../kube-prometheus/components/blackbox-exporter.libsonnet | 2 ++ .../kube-prometheus/components/kube-rbac-proxy.libsonnet | 2 +- .../kube-prometheus/components/kube-state-metrics.libsonnet | 3 +++ jsonnet/kube-prometheus/components/node-exporter.libsonnet | 2 ++ .../components/prometheus-operator.libsonnet | 2 ++ jsonnet/kube-prometheus/main.libsonnet | 6 ++++++ jsonnet/kube-prometheus/versions.json | 5 +++-- 7 files changed, 19 insertions(+), 3 deletions(-) diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet index e574c9f2..bd61e25f 100644 --- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet @@ -21,6 +21,7 @@ local defaults = { if !std.setMember(labelName, ['app.kubernetes.io/version']) }, configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0', + kubeRbacProxyImage: error 'must provide kubeRbacProxyImage', port: 9115, internalPort: 19115, @@ -204,6 +205,7 @@ function(params) { ports: [ { name: 'https', containerPort: bb._config.port }, ], + image: bb._config.kubeRbacProxyImage, }); { diff --git a/jsonnet/kube-prometheus/components/kube-rbac-proxy.libsonnet b/jsonnet/kube-prometheus/components/kube-rbac-proxy.libsonnet index faec1f40..534a2eed 100644 --- a/jsonnet/kube-prometheus/components/kube-rbac-proxy.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-rbac-proxy.libsonnet @@ -1,6 +1,6 @@ local defaults = { namespace: error 'must provide namespace', - image: 'quay.io/brancz/kube-rbac-proxy:v0.8.0', + image: error 'must provide image', ports: error 'must provide ports', secureListenAddress: error 'must provide secureListenAddress', upstream: error 'must provide upstream', diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index 7599f618..462e02fe 100644 --- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet @@ -6,6 +6,7 @@ local defaults = { namespace: error 'must provide namespace', version: error 'must provide version', image: error 'must provide version', + kubeRbacProxyImage: error 'must provide kubeRbacProxyImage', resources: { requests: { cpu: '10m', memory: '190Mi' }, limits: { cpu: '100m', memory: '250Mi' }, @@ -95,6 +96,7 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- limits+: { cpu: '40m' }, requests+: { cpu: '20m' }, }, + image: ksm._config.kubeRbacProxyImage }), local kubeRbacProxySelf = krp({ @@ -104,6 +106,7 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- ports: [ { name: 'https-self', containerPort: 9443 }, ], + image: ksm._config.kubeRbacProxyImage, }), deployment+: { diff --git a/jsonnet/kube-prometheus/components/node-exporter.libsonnet b/jsonnet/kube-prometheus/components/node-exporter.libsonnet index c4d4bc16..9228e6d2 100644 --- a/jsonnet/kube-prometheus/components/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/node-exporter.libsonnet @@ -6,6 +6,7 @@ local defaults = { namespace: error 'must provide namespace', version: error 'must provide version', image: error 'must provide version', + kubeRbacProxyImage: error 'must provide kubeRbacProxyImage', resources: { requests: { cpu: '102m', memory: '180Mi' }, limits: { cpu: '250m', memory: '180Mi' }, @@ -203,6 +204,7 @@ function(params) { ports: [ { name: 'https', containerPort: ne._config.port, hostPort: ne._config.port }, ], + image: ne._config.kubeRbacProxyImage, }) + { env: [ { name: 'IP', valueFrom: { fieldRef: { fieldPath: 'status.podIP' } } }, diff --git a/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet index 7b6d0a33..4bb98b48 100644 --- a/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet @@ -7,6 +7,7 @@ local defaults = { namespace: error 'must provide namespace', version: error 'must provide version', image: error 'must provide image', + kubeRbacProxyImage: error 'must provide kubeRbacProxyImage', configReloaderImage: error 'must provide config reloader image', resources: { limits: { cpu: '200m', memory: '200Mi' }, @@ -114,6 +115,7 @@ function(params) ports: [ { name: 'https', containerPort: 8443 }, ], + image: po._config.kubeRbacProxyImage, }), deployment+: { diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index 1c13b7b9..435c1acc 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -30,6 +30,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; prometheus: error 'must provide version', prometheusAdapter: error 'must provide version', prometheusOperator: error 'must provide version', + kubeRbacProxy: error 'must provide version', } + (import 'versions.json'), images: { alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager, @@ -41,6 +42,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; 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, + kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy }, }, alertmanager: { @@ -54,6 +56,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; namespace: $.values.common.namespace, version: $.values.common.versions.blackboxExporter, image: $.values.common.images.blackboxExporter, + kubeRbacProxyImage: $.values.common.images.kubeRbacProxy, }, grafana: { namespace: $.values.common.namespace, @@ -68,12 +71,14 @@ local platformPatch = import './platforms/platforms.libsonnet'; version: $.values.common.versions.kubeStateMetrics, image: $.values.common.images.kubeStateMetrics, mixin+: { ruleLabels: $.values.common.ruleLabels }, + kubeRbacProxyImage: $.values.common.images.kubeRbacProxy, }, nodeExporter: { namespace: $.values.common.namespace, version: $.values.common.versions.nodeExporter, image: $.values.common.images.nodeExporter, mixin+: { ruleLabels: $.values.common.ruleLabels }, + kubeRbacProxyImage: $.values.common.images.kubeRbacProxy, }, prometheus: { namespace: $.values.common.namespace, @@ -98,6 +103,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; 'app.kubernetes.io/part-of': 'kube-prometheus', }, mixin+: { ruleLabels: $.values.common.ruleLabels }, + kubeRbacProxyImage: $.values.common.images.kubeRbacProxy, }, kubernetesControlPlane: { namespace: $.values.common.namespace, diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 72f91628..ca9e2368 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -6,5 +6,6 @@ "nodeExporter": "1.1.2", "prometheus": "2.26.0", "prometheusAdapter": "0.8.4", - "prometheusOperator": "0.47.0" -} + "prometheusOperator": "0.47.0", + "kubeRbacProxy": "0.8.0" +} \ No newline at end of file From 58006b585a6ebd2e2c83827f45ec802ef06460eb Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Mon, 3 May 2021 06:59:10 +0200 Subject: [PATCH 2/6] fix formatting issues --- jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet | 2 +- jsonnet/kube-prometheus/main.libsonnet | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index 462e02fe..1ebd1480 100644 --- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet @@ -96,7 +96,7 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- limits+: { cpu: '40m' }, requests+: { cpu: '20m' }, }, - image: ksm._config.kubeRbacProxyImage + image: ksm._config.kubeRbacProxyImage, }), local kubeRbacProxySelf = krp({ diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index 435c1acc..a1a62bbc 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -42,7 +42,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; 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, - kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy + kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy, }, }, alertmanager: { From abd442d24f9f50861da86d41c63d8f377fb90389 Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Fri, 30 Apr 2021 12:46:48 +0200 Subject: [PATCH 3/6] can change configmapReload over $.values.common.images --- jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet | 2 +- jsonnet/kube-prometheus/main.libsonnet | 3 +++ jsonnet/kube-prometheus/versions.json | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet index bd61e25f..a5ca911d 100644 --- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet @@ -20,7 +20,7 @@ local defaults = { for labelName in std.objectFields(defaults.commonLabels) if !std.setMember(labelName, ['app.kubernetes.io/version']) }, - configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0', + configmapReloaderImage: error 'must provide version', kubeRbacProxyImage: error 'must provide kubeRbacProxyImage', port: 9115, diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index a1a62bbc..fe1f29b8 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -31,6 +31,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; prometheusAdapter: error 'must provide version', prometheusOperator: error 'must provide version', kubeRbacProxy: error 'must provide version', + configmapReload: error 'must provide version' } + (import 'versions.json'), images: { alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager, @@ -43,6 +44,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; 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, kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy, + configmapReload: 'jimmidyson/configmap-reload:v' + $.values.common.versions.configmapReload, }, }, alertmanager: { @@ -57,6 +59,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; version: $.values.common.versions.blackboxExporter, image: $.values.common.images.blackboxExporter, kubeRbacProxyImage: $.values.common.images.kubeRbacProxy, + configmapReloaderImage: $.values.common.images.configmapReload, }, grafana: { namespace: $.values.common.namespace, diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index ca9e2368..796f8049 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -7,5 +7,6 @@ "prometheus": "2.26.0", "prometheusAdapter": "0.8.4", "prometheusOperator": "0.47.0", - "kubeRbacProxy": "0.8.0" + "kubeRbacProxy": "0.8.0", + "configmapReload": "0.5.0" } \ No newline at end of file From 013adb7f6ca92e0c9fb5fc03ed4d17a621ddc077 Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Mon, 3 May 2021 07:02:28 +0200 Subject: [PATCH 4/6] fix formatting issues --- jsonnet/kube-prometheus/main.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index fe1f29b8..a9b68896 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -31,7 +31,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; prometheusAdapter: error 'must provide version', prometheusOperator: error 'must provide version', kubeRbacProxy: error 'must provide version', - configmapReload: error 'must provide version' + configmapReload: error 'must provide version', } + (import 'versions.json'), images: { alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager, From 6da3452a1c5bd54de7681e9bda7dc5e70885d4cb Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Fri, 30 Apr 2021 14:05:23 +0200 Subject: [PATCH 5/6] can change grafanaImage over $.values.common.images --- jsonnet/kube-prometheus/components/grafana.libsonnet | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index 5d2eeb5b..1fd668f3 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -3,8 +3,7 @@ local defaults = { name: 'grafana', namespace: error 'must provide namespace', version: error 'must provide version', - // image: error 'must provide image', - imageRepos: 'grafana/grafana', + image: error 'must provide image', resources: { requests: { cpu: '100m', memory: '100Mi' }, limits: { cpu: '200m', memory: '200Mi' }, @@ -44,7 +43,7 @@ function(params) { grafana: g._config.version, }, imageRepos+:: { - grafana: g._config.imageRepos, + grafana: std.split(g._config.image, ":")[0], }, prometheus+:: { name: g._config.prometheusName, From 02ed3e2519a7c6b9dac74bd005a93c01c014068b Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Mon, 3 May 2021 06:35:59 +0200 Subject: [PATCH 6/6] replace double quotes with single quotes --- jsonnet/kube-prometheus/components/grafana.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index 1fd668f3..f45d75f8 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -43,7 +43,7 @@ function(params) { grafana: g._config.version, }, imageRepos+:: { - grafana: std.split(g._config.image, ":")[0], + grafana: std.split(g._config.image, ':')[0], }, prometheus+:: { name: g._config.prometheusName,