From 80d04a1d53376ec31b3924b23d2fc1604bd0c952 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <maxime.brunet@paytm.com>
Date: Mon, 22 Nov 2021 17:10:17 -0800
Subject: [PATCH] addons: Always use proper values scope for namespace
---
.../kube-prometheus/addons/anti-affinity.libsonnet | 8 ++++----
jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet | 2 +-
.../kube-prometheus/addons/custom-metrics.libsonnet | 2 +-
.../addons/external-metrics.libsonnet | 1 -
.../kube-prometheus/addons/ksm-autoscaler.libsonnet | 12 ++++++------
.../addons/podsecuritypolicies.libsonnet | 8 ++++----
jsonnet/kube-prometheus/addons/static-etcd.libsonnet | 2 +-
7 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
index e266b913..ef92453e 100644
--- a/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
+++ b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
@@ -46,7 +46,7 @@
spec+:
$.antiaffinity(
$.alertmanager._config.selectorLabels,
- $.values.common.namespace,
+ $.values.alertmanager.namespace,
$.values.alertmanager.podAntiAffinity,
$.values.alertmanager.podAntiAffinityTopologyKey,
),
@@ -58,7 +58,7 @@
spec+:
$.antiaffinity(
$.prometheus._config.selectorLabels,
- $.values.common.namespace,
+ $.values.prometheus.namespace,
$.values.prometheus.podAntiAffinity,
$.values.prometheus.podAntiAffinityTopologyKey,
),
@@ -72,7 +72,7 @@
spec+:
$.antiaffinity(
$.blackboxExporter._config.selectorLabels,
- $.values.common.namespace,
+ $.values.blackboxExporter.namespace,
$.values.blackboxExporter.podAntiAffinity,
$.values.blackboxExporter.podAntiAffinityTopologyKey,
),
@@ -88,7 +88,7 @@
spec+:
$.antiaffinity(
$.prometheusAdapter._config.selectorLabels,
- $.values.common.namespace,
+ $.values.prometheusAdapter.namespace,
$.values.prometheusAdapter.podAntiAffinity,
$.values.prometheusAdapter.podAntiAffinityTopologyKey,
),
diff --git a/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet b/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet
index 61e7aaa4..d7a617fd 100644
--- a/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet
+++ b/jsonnet/kube-prometheus/addons/aws-vpc-cni.libsonnet
@@ -37,7 +37,7 @@
kind: 'ServiceMonitor',
metadata: {
name: 'aws-node',
- namespace: $.values.common.namespace,
+ namespace: $.values.kubernetesControlPlane.namespace,
labels: {
'app.kubernetes.io/name': 'aws-node',
},
diff --git a/jsonnet/kube-prometheus/addons/custom-metrics.libsonnet b/jsonnet/kube-prometheus/addons/custom-metrics.libsonnet
index 06e9c5a0..8ac49885 100644
--- a/jsonnet/kube-prometheus/addons/custom-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/addons/custom-metrics.libsonnet
@@ -4,7 +4,7 @@
{
values+:: {
prometheusAdapter+: {
- namespace: $.values.common.namespace,
+ namespace: $.values.prometheusAdapter.namespace,
// Rules for custom-metrics
config+:: {
rules+: [
diff --git a/jsonnet/kube-prometheus/addons/external-metrics.libsonnet b/jsonnet/kube-prometheus/addons/external-metrics.libsonnet
index 928d29e7..dac9d5f9 100644
--- a/jsonnet/kube-prometheus/addons/external-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/addons/external-metrics.libsonnet
@@ -4,7 +4,6 @@
{
values+:: {
prometheusAdapter+: {
- namespace: $.values.common.namespace,
// Rules for external-metrics
config+:: {
externalRules+: [
diff --git a/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet b/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet
index 9573072c..35b7f4ef 100644
--- a/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet
+++ b/jsonnet/kube-prometheus/addons/ksm-autoscaler.libsonnet
@@ -30,7 +30,7 @@
kind: 'ClusterRole',
name: 'ksm-autoscaler',
},
- subjects: [{ kind: 'ServiceAccount', name: 'ksm-autoscaler', namespace: $.values.common.namespace }],
+ subjects: [{ kind: 'ServiceAccount', name: 'ksm-autoscaler', namespace: $.values.kubeStateMetrics.namespace }],
},
roleBinding: {
@@ -38,7 +38,7 @@
kind: 'RoleBinding',
metadata: {
name: 'ksm-autoscaler',
- namespace: $.values.common.namespace,
+ namespace: $.values.kubeStateMetrics.namespace,
},
roleRef: {
apiGroup: 'rbac.authorization.k8s.io',
@@ -53,7 +53,7 @@
kind: 'Role',
metadata: {
name: 'ksm-autoscaler',
- namespace: $.values.common.namespace,
+ namespace: $.values.kubeStateMetrics.namespace,
},
rules: [
{
@@ -76,7 +76,7 @@
kind: 'ServiceAccount',
metadata: {
name: 'ksm-autoscaler',
- namespace: $.values.common.namespace,
+ namespace: $.values.kubeStateMetrics.namespace,
},
},
@@ -88,7 +88,7 @@
args: [
'/cpvpa',
'--target=deployment/kube-state-metrics',
- '--namespace=' + $.values.common.namespace,
+ '--namespace=' + $.values.kubeStateMetrics.namespace,
'--logtostderr=true',
'--poll-period-seconds=10',
'--default-config={"kube-state-metrics":{"requests":{"cpu":{"base":"' + $.values.clusterVerticalAutoscaler.baseCPU +
@@ -110,7 +110,7 @@
kind: 'Deployment',
metadata: {
name: 'ksm-autoscaler',
- namespace: $.values.common.namespace,
+ namespace: $.values.kubeStateMetrics.namespace,
labels: podLabels,
},
spec: {
diff --git a/jsonnet/kube-prometheus/addons/podsecuritypolicies.libsonnet b/jsonnet/kube-prometheus/addons/podsecuritypolicies.libsonnet
index 61439b59..aa03e30f 100644
--- a/jsonnet/kube-prometheus/addons/podsecuritypolicies.libsonnet
+++ b/jsonnet/kube-prometheus/addons/podsecuritypolicies.libsonnet
@@ -59,7 +59,7 @@ local restrictedPodSecurityPolicy = {
kind: 'Role',
metadata: {
name: 'alertmanager-' + $.values.alertmanager.name,
- namespace: $.values.common.namespace,
+ namespace: $.values.alertmanager.namespace,
},
rules: [{
apiGroups: ['policy'],
@@ -74,7 +74,7 @@ local restrictedPodSecurityPolicy = {
kind: 'RoleBinding',
metadata: {
name: 'alertmanager-' + $.values.alertmanager.name,
- namespace: $.values.common.namespace,
+ namespace: $.values.alertmanager.namespace,
},
roleRef: {
apiGroup: 'rbac.authorization.k8s.io',
@@ -132,7 +132,7 @@ local restrictedPodSecurityPolicy = {
kind: 'Role',
metadata: {
name: 'grafana',
- namespace: $.values.common.namespace,
+ namespace: $.values.grafana.namespace,
},
rules: [{
apiGroups: ['policy'],
@@ -147,7 +147,7 @@ local restrictedPodSecurityPolicy = {
kind: 'RoleBinding',
metadata: {
name: 'grafana',
- namespace: $.values.common.namespace,
+ namespace: $.values.grafana.namespace,
},
roleRef: {
apiGroup: 'rbac.authorization.k8s.io',
diff --git a/jsonnet/kube-prometheus/addons/static-etcd.libsonnet b/jsonnet/kube-prometheus/addons/static-etcd.libsonnet
index 4f11a076..1d8050e4 100644
--- a/jsonnet/kube-prometheus/addons/static-etcd.libsonnet
+++ b/jsonnet/kube-prometheus/addons/static-etcd.libsonnet
@@ -84,7 +84,7 @@
type: 'Opaque',
metadata: {
name: 'kube-etcd-client-certs',
- namespace: $.values.common.namespace,
+ namespace: $.values.prometheus.namespace,
},
data: {
'etcd-client-ca.crt': std.base64($.values.etcd.clientCA),
--
GitLab