From 7c07940cb8d823d0555bb39c544eb1a22e22e125 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Sun, 22 Apr 2018 10:50:26 +0100
Subject: [PATCH] kube-prometheus: Fix config reloader RBAC
---
.../prometheus-k8s-role-binding-config.libsonnet | 2 +-
.../prometheus-k8s-role-binding-default.libsonnet | 2 +-
.../prometheus-k8s-role-binding-kube-system.libsonnet | 2 +-
.../prometheus-k8s-role-binding-namespace.libsonnet | 2 +-
.../prometheus-namespace-role-binding.libsonnet | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/jsonnet/prometheus/prometheus-k8s-role-binding-config.libsonnet b/jsonnet/prometheus/prometheus-k8s-role-binding-config.libsonnet
index 2319aa35..631e5fa5 100644
--- a/jsonnet/prometheus/prometheus-k8s-role-binding-config.libsonnet
+++ b/jsonnet/prometheus/prometheus-k8s-role-binding-config.libsonnet
@@ -1,5 +1,5 @@
local prometheusNamespaceRoleBinding = import "prometheus-namespace-role-binding.libsonnet";
{
- new(namespace):: prometheusNamespaceRoleBinding.new(namespace, namespace, "prometheus-k8s-config")
+ new(namespace):: prometheusNamespaceRoleBinding.new(namespace, namespace, "prometheus-k8s-config", "prometheus-k8s")
}
diff --git a/jsonnet/prometheus/prometheus-k8s-role-binding-default.libsonnet b/jsonnet/prometheus/prometheus-k8s-role-binding-default.libsonnet
index f5d38ce7..e88ece99 100644
--- a/jsonnet/prometheus/prometheus-k8s-role-binding-default.libsonnet
+++ b/jsonnet/prometheus/prometheus-k8s-role-binding-default.libsonnet
@@ -1,5 +1,5 @@
local prometheusNamespaceRoleBinding = import "prometheus-namespace-role-binding.libsonnet";
{
- new(namespace):: prometheusNamespaceRoleBinding.new(namespace, "default", "prometheus-k8s")
+ new(namespace):: prometheusNamespaceRoleBinding.new(namespace, "default", "prometheus-k8s", "prometheus-k8s")
}
diff --git a/jsonnet/prometheus/prometheus-k8s-role-binding-kube-system.libsonnet b/jsonnet/prometheus/prometheus-k8s-role-binding-kube-system.libsonnet
index 04c481ca..33967e0a 100644
--- a/jsonnet/prometheus/prometheus-k8s-role-binding-kube-system.libsonnet
+++ b/jsonnet/prometheus/prometheus-k8s-role-binding-kube-system.libsonnet
@@ -1,5 +1,5 @@
local prometheusNamespaceRoleBinding = import "prometheus-namespace-role-binding.libsonnet";
{
- new(namespace):: prometheusNamespaceRoleBinding.new(namespace, "kube-system", "prometheus-k8s")
+ new(namespace):: prometheusNamespaceRoleBinding.new(namespace, "kube-system", "prometheus-k8s", "prometheus-k8s")
}
diff --git a/jsonnet/prometheus/prometheus-k8s-role-binding-namespace.libsonnet b/jsonnet/prometheus/prometheus-k8s-role-binding-namespace.libsonnet
index 7833f785..d70ed6ac 100644
--- a/jsonnet/prometheus/prometheus-k8s-role-binding-namespace.libsonnet
+++ b/jsonnet/prometheus/prometheus-k8s-role-binding-namespace.libsonnet
@@ -1,5 +1,5 @@
local prometheusNamespaceRoleBinding = import "prometheus-namespace-role-binding.libsonnet";
{
- new(namespace):: prometheusNamespaceRoleBinding.new(namespace, namespace, "prometheus-k8s")
+ new(namespace):: prometheusNamespaceRoleBinding.new(namespace, namespace, "prometheus-k8s", "prometheus-k8s")
}
diff --git a/jsonnet/prometheus/prometheus-namespace-role-binding.libsonnet b/jsonnet/prometheus/prometheus-namespace-role-binding.libsonnet
index 8b255fa0..a63bcc9c 100644
--- a/jsonnet/prometheus/prometheus-namespace-role-binding.libsonnet
+++ b/jsonnet/prometheus/prometheus-namespace-role-binding.libsonnet
@@ -2,12 +2,12 @@ local k = import "ksonnet.beta.3/k.libsonnet";
local roleBinding = k.rbac.v1.roleBinding;
{
- new(serviceAccountNamespace, namespace, name)::
+ new(serviceAccountNamespace, namespace, roleName, serviceAccountName)::
roleBinding.new() +
- roleBinding.mixin.metadata.withName(name) +
+ roleBinding.mixin.metadata.withName(roleName) +
roleBinding.mixin.metadata.withNamespace(namespace) +
roleBinding.mixin.roleRef.withApiGroup("rbac.authorization.k8s.io") +
- roleBinding.mixin.roleRef.withName(name) +
+ roleBinding.mixin.roleRef.withName(roleName) +
roleBinding.mixin.roleRef.mixinInstance({kind: "Role"}) +
- roleBinding.withSubjects([{kind: "ServiceAccount", name: name, namespace: serviceAccountNamespace}])
+ roleBinding.withSubjects([{kind: "ServiceAccount", name: serviceAccountName, namespace: serviceAccountNamespace}])
}
--
GitLab