From 3536ec550302356b71c241de8d74b1fdcc8b50f4 Mon Sep 17 00:00:00 2001 From: Michael Goodness <mike.goodness@ticketmaster.com> Date: Wed, 20 Feb 2019 02:36:55 -0600 Subject: [PATCH] Upgrade prometheus-adapter APIService to v1 Also remove unnecessary namespace from prometheus-adapter ClusterRoleBinding Signed-off-by: Michael Goodness <mike.goodness@ticketmaster.com> --- .../prometheus-adapter/prometheus-adapter.libsonnet | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index 8624c94a..079f9fb7 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -50,7 +50,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; prometheusAdapter+:: { apiService: { - apiVersion: 'apiregistration.k8s.io/v1beta1', + apiVersion: 'apiregistration.k8s.io/v1', kind: 'APIService', metadata: { name: 'v1beta1.metrics.k8s.io', @@ -147,7 +147,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; clusterRoleBinding.new() + clusterRoleBinding.mixin.metadata.withName($._config.prometheusAdapter.name) + - clusterRoleBinding.mixin.metadata.withNamespace($._config.namespace) + clusterRoleBinding.mixin.roleRef.withApiGroup('rbac.authorization.k8s.io') + clusterRoleBinding.mixin.roleRef.withName($.prometheusAdapter.clusterRole.metadata.name) + clusterRoleBinding.mixin.roleRef.mixinInstance({ kind: 'ClusterRole' }) + -- GitLab