Merge pull request #1124 from kaflake/feature/configRbacImage

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

@@ -21,6 +21,7 @@ local defaults = {
     if !std.setMember(labelName, ['app.kubernetes.io/version'])
   },
   configmapReloaderImage: error 'must provide version',
+  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,
     });
 
     {

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

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+: {

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' },
@@ -200,6 +201,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' } } },

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+: {

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',
         configmapReload: error 'must provide version',
       } + (import 'versions.json'),
       images: {
@@ -42,6 +43,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,
         configmapReload: 'jimmidyson/configmap-reload:v' + $.values.common.versions.configmapReload,
       },
     },
@@ -56,6 +58,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,
       configmapReloaderImage: $.values.common.images.configmapReload,
     },
     grafana: {
@@ -71,12 +74,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,
@@ -101,6 +106,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,

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",
   "configmapReload": "0.5.0"
-}
+}