From 9e18cf2097cc273ac37121ed187be342ed0b0a69 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Thu, 10 Sep 2020 16:15:35 +0200 Subject: [PATCH 1/2] jsonnet: bump kube-rbac-proxy to v0.6.0 Signed-off-by: Damien Grisonnet --- jsonnet/kube-prometheus/kube-prometheus.libsonnet | 5 +++++ .../kube-prometheus/node-exporter/node-exporter.libsonnet | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 7b884be6..d04ec890 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -105,6 +105,11 @@ local configMapList = k3.core.v1.configMapList; versions+:: { grafana: '7.1.0', + kubeRbacProxy: 'v0.6.0', + }, + + imageRepos+:: { + kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy', }, tlsCipherSuites: [ diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 9ef17f63..a162c966 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -6,12 +6,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; versions+:: { nodeExporter: 'v0.18.1', - kubeRbacProxy: 'v0.4.1', }, imageRepos+:: { nodeExporter: 'quay.io/prometheus/node-exporter', - kubeRbacProxy: 'quay.io/coreos/kube-rbac-proxy', }, nodeExporter+:: { From 152c02b7f8486085114bc11c6631ad4a9d5201d9 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Thu, 10 Sep 2020 16:15:53 +0200 Subject: [PATCH 2/2] manifests: regenerate Signed-off-by: Damien Grisonnet --- manifests/kube-state-metrics-deployment.yaml | 4 ++-- manifests/node-exporter-daemonset.yaml | 2 +- manifests/setup/prometheus-operator-deployment.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index 5c729832..a03e6061 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -32,7 +32,7 @@ spec: - --secure-listen-address=:8443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8081/ - image: quay.io/coreos/kube-rbac-proxy:v0.4.1 + image: quay.io/brancz/kube-rbac-proxy:v0.6.0 name: kube-rbac-proxy-main ports: - containerPort: 8443 @@ -44,7 +44,7 @@ spec: - --secure-listen-address=:9443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8082/ - image: quay.io/coreos/kube-rbac-proxy:v0.4.1 + image: quay.io/brancz/kube-rbac-proxy:v0.6.0 name: kube-rbac-proxy-self ports: - containerPort: 9443 diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index eae2e475..f99a1e58 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -55,7 +55,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: quay.io/coreos/kube-rbac-proxy:v0.4.1 + image: quay.io/brancz/kube-rbac-proxy:v0.6.0 name: kube-rbac-proxy ports: - containerPort: 9100 diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml index 225da8c9..1c665a4f 100644 --- a/manifests/setup/prometheus-operator-deployment.yaml +++ b/manifests/setup/prometheus-operator-deployment.yaml @@ -45,7 +45,7 @@ spec: - --secure-listen-address=:8443 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --upstream=http://127.0.0.1:8080/ - image: quay.io/coreos/kube-rbac-proxy:v0.4.1 + image: quay.io/brancz/kube-rbac-proxy:v0.6.0 name: kube-rbac-proxy ports: - containerPort: 8443