From 66759b02207bc78859a7d91c7b54e378e987f0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Frydlewicz?= Date: Thu, 19 Nov 2020 16:02:49 +0100 Subject: [PATCH 1/2] charts-release-namespace * Fixes [#1358](https://github.com/tomkerkhove/promitor/issues/1358) --- charts/promitor-agent-resource-discovery/Chart.yaml | 2 +- .../promitor-agent-resource-discovery/templates/configmap.yaml | 1 + .../promitor-agent-resource-discovery/templates/deployment.yaml | 1 + .../templates/podsecuritypolicy.yaml | 1 + charts/promitor-agent-resource-discovery/templates/role.yaml | 1 + .../templates/rolebinding.yaml | 1 + charts/promitor-agent-resource-discovery/templates/secret.yaml | 1 + charts/promitor-agent-resource-discovery/templates/service.yaml | 1 + .../templates/serviceaccount.yaml | 1 + charts/promitor-agent-scraper/Chart.yaml | 2 +- charts/promitor-agent-scraper/templates/configmap.yaml | 1 + charts/promitor-agent-scraper/templates/deployment.yaml | 1 + charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml | 1 + charts/promitor-agent-scraper/templates/role.yaml | 1 + charts/promitor-agent-scraper/templates/rolebinding.yaml | 1 + charts/promitor-agent-scraper/templates/secret.yaml | 1 + charts/promitor-agent-scraper/templates/service.yaml | 1 + charts/promitor-agent-scraper/templates/serviceaccount.yaml | 1 + 18 files changed, 18 insertions(+), 2 deletions(-) diff --git a/charts/promitor-agent-resource-discovery/Chart.yaml b/charts/promitor-agent-resource-discovery/Chart.yaml index 4b50afcf9..44c5706af 100644 --- a/charts/promitor-agent-resource-discovery/Chart.yaml +++ b/charts/promitor-agent-resource-discovery/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 0.1.0 +version: 0.2.0 appVersion: 0.1.0-preview-3 type: application name: promitor-agent-resource-discovery diff --git a/charts/promitor-agent-resource-discovery/templates/configmap.yaml b/charts/promitor-agent-resource-discovery/templates/configmap.yaml index 80d868999..974e97b64 100644 --- a/charts/promitor-agent-resource-discovery/templates/configmap.yaml +++ b/charts/promitor-agent-resource-discovery/templates/configmap.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-map-{{ template "promitor-agent-resource-discovery.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} data: diff --git a/charts/promitor-agent-resource-discovery/templates/deployment.yaml b/charts/promitor-agent-resource-discovery/templates/deployment.yaml index 11eeedfb8..45926188e 100644 --- a/charts/promitor-agent-resource-discovery/templates/deployment.yaml +++ b/charts/promitor-agent-resource-discovery/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "promitor-agent-resource-discovery.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} spec: diff --git a/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml b/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml index 20456ae44..fb66098dd 100644 --- a/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml +++ b/charts/promitor-agent-resource-discovery/templates/podsecuritypolicy.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "promitor-agent-resource-discovery.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} spec: diff --git a/charts/promitor-agent-resource-discovery/templates/role.yaml b/charts/promitor-agent-resource-discovery/templates/role.yaml index 128431fb4..a2e3cfcf8 100644 --- a/charts/promitor-agent-resource-discovery/templates/role.yaml +++ b/charts/promitor-agent-resource-discovery/templates/role.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: Role metadata: name: {{ template "promitor-agent-resource-discovery.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} rules: diff --git a/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml b/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml index df640597c..ebd69b590 100644 --- a/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml +++ b/charts/promitor-agent-resource-discovery/templates/rolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding metadata: name: {{ template "promitor-agent-resource-discovery.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} roleRef: diff --git a/charts/promitor-agent-resource-discovery/templates/secret.yaml b/charts/promitor-agent-resource-discovery/templates/secret.yaml index 64f8991ea..d2ab19f95 100644 --- a/charts/promitor-agent-resource-discovery/templates/secret.yaml +++ b/charts/promitor-agent-resource-discovery/templates/secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "promitor-agent-resource-discovery.secretname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} type: Opaque diff --git a/charts/promitor-agent-resource-discovery/templates/service.yaml b/charts/promitor-agent-resource-discovery/templates/service.yaml index 286e29393..90ba39ee1 100644 --- a/charts/promitor-agent-resource-discovery/templates/service.yaml +++ b/charts/promitor-agent-resource-discovery/templates/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "promitor-agent-resource-discovery.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} {{- if and (.Values.service.loadBalancer.enabled) (.Values.service.loadBalancer.dnsPrefix) }} diff --git a/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml b/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml index 37849b575..6e1332dfd 100644 --- a/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml +++ b/charts/promitor-agent-resource-discovery/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "promitor-agent-resource-discovery.serviceaccountname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-resource-discovery.labels" . | nindent 4 }} {{- if .Values.rbac.serviceAccount.annotations }} diff --git a/charts/promitor-agent-scraper/Chart.yaml b/charts/promitor-agent-scraper/Chart.yaml index 92ba82054..f918a3521 100644 --- a/charts/promitor-agent-scraper/Chart.yaml +++ b/charts/promitor-agent-scraper/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 0.2.0 +version: 0.3.0 appVersion: 1.0.0 type: application name: promitor-agent-scraper diff --git a/charts/promitor-agent-scraper/templates/configmap.yaml b/charts/promitor-agent-scraper/templates/configmap.yaml index 5b3cb97b8..cb29fcd48 100644 --- a/charts/promitor-agent-scraper/templates/configmap.yaml +++ b/charts/promitor-agent-scraper/templates/configmap.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-map-{{ template "promitor-agent-scraper.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} data: diff --git a/charts/promitor-agent-scraper/templates/deployment.yaml b/charts/promitor-agent-scraper/templates/deployment.yaml index 67f284bfe..adffd4860 100644 --- a/charts/promitor-agent-scraper/templates/deployment.yaml +++ b/charts/promitor-agent-scraper/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "promitor-agent-scraper.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} spec: diff --git a/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml b/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml index 6ba6efd71..48da02fae 100644 --- a/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml +++ b/charts/promitor-agent-scraper/templates/podsecuritypolicy.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "promitor-agent-scraper.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} spec: diff --git a/charts/promitor-agent-scraper/templates/role.yaml b/charts/promitor-agent-scraper/templates/role.yaml index b953bd089..8157148b3 100644 --- a/charts/promitor-agent-scraper/templates/role.yaml +++ b/charts/promitor-agent-scraper/templates/role.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: Role metadata: name: {{ template "promitor-agent-scraper.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} rules: diff --git a/charts/promitor-agent-scraper/templates/rolebinding.yaml b/charts/promitor-agent-scraper/templates/rolebinding.yaml index 8c90c1592..a3ab26967 100644 --- a/charts/promitor-agent-scraper/templates/rolebinding.yaml +++ b/charts/promitor-agent-scraper/templates/rolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding metadata: name: {{ template "promitor-agent-scraper.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} roleRef: diff --git a/charts/promitor-agent-scraper/templates/secret.yaml b/charts/promitor-agent-scraper/templates/secret.yaml index 325ddabb9..d86098783 100644 --- a/charts/promitor-agent-scraper/templates/secret.yaml +++ b/charts/promitor-agent-scraper/templates/secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "promitor-agent-scraper.secretname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} type: Opaque diff --git a/charts/promitor-agent-scraper/templates/service.yaml b/charts/promitor-agent-scraper/templates/service.yaml index 8e5719d50..a90fcec2a 100644 --- a/charts/promitor-agent-scraper/templates/service.yaml +++ b/charts/promitor-agent-scraper/templates/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "promitor-agent-scraper.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} {{- if and (.Values.service.loadBalancer.enabled) (.Values.service.loadBalancer.dnsPrefix) }} diff --git a/charts/promitor-agent-scraper/templates/serviceaccount.yaml b/charts/promitor-agent-scraper/templates/serviceaccount.yaml index fb77dd8cc..10070b429 100644 --- a/charts/promitor-agent-scraper/templates/serviceaccount.yaml +++ b/charts/promitor-agent-scraper/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "promitor-agent-scraper.serviceaccountname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "promitor-agent-scraper.labels" . | nindent 4 }} {{- if .Values.rbac.serviceAccount.annotations }} From 746e2b69c3016640676c4851088ecd1954b4b8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Frydlewicz?= Date: Thu, 19 Nov 2020 16:19:42 +0100 Subject: [PATCH 2/2] charts-release-namespace * revert version bump --- charts/promitor-agent-resource-discovery/Chart.yaml | 2 +- charts/promitor-agent-scraper/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/promitor-agent-resource-discovery/Chart.yaml b/charts/promitor-agent-resource-discovery/Chart.yaml index 44c5706af..4b50afcf9 100644 --- a/charts/promitor-agent-resource-discovery/Chart.yaml +++ b/charts/promitor-agent-resource-discovery/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 0.2.0 +version: 0.1.0 appVersion: 0.1.0-preview-3 type: application name: promitor-agent-resource-discovery diff --git a/charts/promitor-agent-scraper/Chart.yaml b/charts/promitor-agent-scraper/Chart.yaml index f918a3521..92ba82054 100644 --- a/charts/promitor-agent-scraper/Chart.yaml +++ b/charts/promitor-agent-scraper/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 0.3.0 +version: 0.2.0 appVersion: 1.0.0 type: application name: promitor-agent-scraper