Skip to content
Snippets Groups Projects
Unverified Commit 80d04a1d authored by Maxime Brunet's avatar Maxime Brunet
Browse files

addons: Always use proper values scope for namespace

parent fcd8d01f
No related branches found
No related tags found
No related merge requests found
......@@ -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,
),
......
......@@ -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',
},
......
......@@ -4,7 +4,7 @@
{
values+:: {
prometheusAdapter+: {
namespace: $.values.common.namespace,
namespace: $.values.prometheusAdapter.namespace,
// Rules for custom-metrics
config+:: {
rules+: [
......
......@@ -4,7 +4,6 @@
{
values+:: {
prometheusAdapter+: {
namespace: $.values.common.namespace,
// Rules for external-metrics
config+:: {
externalRules+: [
......
......@@ -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: {
......
......@@ -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',
......
......@@ -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),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment