From 93e0e63fce689e9c8eccaf3474bbb3e5b4c95548 Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Thu, 24 Dec 2020 11:00:16 +0900 Subject: [PATCH] :wrench: Rename PriorityClass names to contain namespace Signed-off-by: Rintaro Okamura --- charts/vald/templates/agent/daemonset.yaml | 2 +- charts/vald/templates/agent/deployment.yaml | 2 +- charts/vald/templates/agent/priorityclass.yaml | 2 +- charts/vald/templates/agent/statefulset.yaml | 2 +- charts/vald/templates/discoverer/daemonset.yaml | 2 +- charts/vald/templates/discoverer/deployment.yaml | 2 +- charts/vald/templates/discoverer/priorityclass.yaml | 2 +- charts/vald/templates/gateway/vald/daemonset.yaml | 2 +- charts/vald/templates/gateway/vald/deployment.yaml | 2 +- charts/vald/templates/gateway/vald/priorityclass.yaml | 2 +- charts/vald/templates/manager/backup/daemonset.yaml | 2 +- charts/vald/templates/manager/backup/deployment.yaml | 2 +- charts/vald/templates/manager/backup/priorityclass.yaml | 2 +- charts/vald/templates/manager/compressor/daemonset.yaml | 2 +- charts/vald/templates/manager/compressor/deployment.yaml | 2 +- charts/vald/templates/manager/compressor/priorityclass.yaml | 2 +- charts/vald/templates/manager/index/daemonset.yaml | 2 +- charts/vald/templates/manager/index/deployment.yaml | 2 +- charts/vald/templates/manager/index/priorityclass.yaml | 2 +- charts/vald/templates/meta/daemonset.yaml | 2 +- charts/vald/templates/meta/deployment.yaml | 2 +- charts/vald/templates/meta/priorityclass.yaml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/charts/vald/templates/agent/daemonset.yaml b/charts/vald/templates/agent/daemonset.yaml index e39ddc24e1..f2e9961c98 100644 --- a/charts/vald/templates/agent/daemonset.yaml +++ b/charts/vald/templates/agent/daemonset.yaml @@ -165,7 +165,7 @@ spec: {{- end }} {{- if .Values.agent.podPriority }} {{- if .Values.agent.podPriority.enabled }} - priorityClassName: {{ .Values.agent.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.agent.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/agent/deployment.yaml b/charts/vald/templates/agent/deployment.yaml index 89a587a760..0b0ddf2c43 100644 --- a/charts/vald/templates/agent/deployment.yaml +++ b/charts/vald/templates/agent/deployment.yaml @@ -170,7 +170,7 @@ spec: {{- end }} {{- if .Values.agent.podPriority }} {{- if .Values.agent.podPriority.enabled }} - priorityClassName: {{ .Values.agent.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.agent.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/agent/priorityclass.yaml b/charts/vald/templates/agent/priorityclass.yaml index 918872063e..7b3fd3b1ac 100644 --- a/charts/vald/templates/agent/priorityclass.yaml +++ b/charts/vald/templates/agent/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.agent.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.agent.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }} diff --git a/charts/vald/templates/agent/statefulset.yaml b/charts/vald/templates/agent/statefulset.yaml index f1a225a37c..25406f8169 100644 --- a/charts/vald/templates/agent/statefulset.yaml +++ b/charts/vald/templates/agent/statefulset.yaml @@ -186,7 +186,7 @@ spec: {{- end }} {{- if .Values.agent.podPriority }} {{- if .Values.agent.podPriority.enabled }} - priorityClassName: {{ .Values.agent.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.agent.name }}-priority {{- end }} {{- end }} {{- if not .Values.agent.ngt.enable_in_memory_mode }} diff --git a/charts/vald/templates/discoverer/daemonset.yaml b/charts/vald/templates/discoverer/daemonset.yaml index 03bcb462a5..0959662dde 100644 --- a/charts/vald/templates/discoverer/daemonset.yaml +++ b/charts/vald/templates/discoverer/daemonset.yaml @@ -112,7 +112,7 @@ spec: {{- end }} {{- if .Values.discoverer.podPriority }} {{- if .Values.discoverer.podPriority.enabled }} - priorityClassName: {{ .Values.discoverer.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.discoverer.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/discoverer/deployment.yaml b/charts/vald/templates/discoverer/deployment.yaml index 11017eb8c4..0a6151e3cc 100644 --- a/charts/vald/templates/discoverer/deployment.yaml +++ b/charts/vald/templates/discoverer/deployment.yaml @@ -117,7 +117,7 @@ spec: {{- end }} {{- if .Values.discoverer.podPriority }} {{- if .Values.discoverer.podPriority.enabled }} - priorityClassName: {{ .Values.discoverer.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.discoverer.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/discoverer/priorityclass.yaml b/charts/vald/templates/discoverer/priorityclass.yaml index b9ab80ea09..6304a6766e 100644 --- a/charts/vald/templates/discoverer/priorityclass.yaml +++ b/charts/vald/templates/discoverer/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.discoverer.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.discoverer.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }} diff --git a/charts/vald/templates/gateway/vald/daemonset.yaml b/charts/vald/templates/gateway/vald/daemonset.yaml index ec9c5bb470..a399303d4e 100644 --- a/charts/vald/templates/gateway/vald/daemonset.yaml +++ b/charts/vald/templates/gateway/vald/daemonset.yaml @@ -110,7 +110,7 @@ spec: {{- end }} {{- if .Values.gateway.podPriority }} {{- if .Values.gateway.podPriority.enabled }} - priorityClassName: {{ .Values.gateway.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.gateway.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/gateway/vald/deployment.yaml b/charts/vald/templates/gateway/vald/deployment.yaml index a44c317e1c..295c409b06 100644 --- a/charts/vald/templates/gateway/vald/deployment.yaml +++ b/charts/vald/templates/gateway/vald/deployment.yaml @@ -115,7 +115,7 @@ spec: {{- end }} {{- if .Values.gateway.podPriority }} {{- if .Values.gateway.podPriority.enabled }} - priorityClassName: {{ .Values.gateway.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.gateway.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/gateway/vald/priorityclass.yaml b/charts/vald/templates/gateway/vald/priorityclass.yaml index 2386775dfe..d2b9f044a7 100644 --- a/charts/vald/templates/gateway/vald/priorityclass.yaml +++ b/charts/vald/templates/gateway/vald/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.gateway.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.gateway.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }} diff --git a/charts/vald/templates/manager/backup/daemonset.yaml b/charts/vald/templates/manager/backup/daemonset.yaml index 5a1ccc8577..659853f17b 100644 --- a/charts/vald/templates/manager/backup/daemonset.yaml +++ b/charts/vald/templates/manager/backup/daemonset.yaml @@ -110,7 +110,7 @@ spec: {{- end }} {{- if .Values.backupManager.podPriority }} {{- if .Values.backupManager.podPriority.enabled }} - priorityClassName: {{ .Values.backupManager.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.backupManager.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/manager/backup/deployment.yaml b/charts/vald/templates/manager/backup/deployment.yaml index 5673c6c37c..d79250dc14 100644 --- a/charts/vald/templates/manager/backup/deployment.yaml +++ b/charts/vald/templates/manager/backup/deployment.yaml @@ -115,7 +115,7 @@ spec: {{- end }} {{- if .Values.backupManager.podPriority }} {{- if .Values.backupManager.podPriority.enabled }} - priorityClassName: {{ .Values.backupManager.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.backupManager.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/manager/backup/priorityclass.yaml b/charts/vald/templates/manager/backup/priorityclass.yaml index c0b02e4752..d2fd8a191d 100644 --- a/charts/vald/templates/manager/backup/priorityclass.yaml +++ b/charts/vald/templates/manager/backup/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.backupManager.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.backupManager.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }} diff --git a/charts/vald/templates/manager/compressor/daemonset.yaml b/charts/vald/templates/manager/compressor/daemonset.yaml index 290ebee446..e212e82226 100644 --- a/charts/vald/templates/manager/compressor/daemonset.yaml +++ b/charts/vald/templates/manager/compressor/daemonset.yaml @@ -110,7 +110,7 @@ spec: {{- end }} {{- if .Values.compressor.podPriority }} {{- if .Values.compressor.podPriority.enabled }} - priorityClassName: {{ .Values.compressor.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.compressor.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/manager/compressor/deployment.yaml b/charts/vald/templates/manager/compressor/deployment.yaml index f718d84320..13e1c9dbcd 100644 --- a/charts/vald/templates/manager/compressor/deployment.yaml +++ b/charts/vald/templates/manager/compressor/deployment.yaml @@ -115,7 +115,7 @@ spec: {{- end }} {{- if .Values.compressor.podPriority }} {{- if .Values.compressor.podPriority.enabled }} - priorityClassName: {{ .Values.compressor.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.compressor.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/manager/compressor/priorityclass.yaml b/charts/vald/templates/manager/compressor/priorityclass.yaml index c981d26774..bb26afa5e2 100644 --- a/charts/vald/templates/manager/compressor/priorityclass.yaml +++ b/charts/vald/templates/manager/compressor/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.compressor.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.compressor.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }} diff --git a/charts/vald/templates/manager/index/daemonset.yaml b/charts/vald/templates/manager/index/daemonset.yaml index ade6f00a01..e94111065f 100644 --- a/charts/vald/templates/manager/index/daemonset.yaml +++ b/charts/vald/templates/manager/index/daemonset.yaml @@ -110,7 +110,7 @@ spec: {{- end }} {{- if .Values.indexManager.podPriority }} {{- if .Values.indexManager.podPriority.enabled }} - priorityClassName: {{ .Values.indexManager.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.indexManager.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/manager/index/deployment.yaml b/charts/vald/templates/manager/index/deployment.yaml index 91e91e8df4..5b60b318cc 100644 --- a/charts/vald/templates/manager/index/deployment.yaml +++ b/charts/vald/templates/manager/index/deployment.yaml @@ -113,7 +113,7 @@ spec: {{- end }} {{- if .Values.indexManager.podPriority }} {{- if .Values.indexManager.podPriority.enabled }} - priorityClassName: {{ .Values.indexManager.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.indexManager.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/manager/index/priorityclass.yaml b/charts/vald/templates/manager/index/priorityclass.yaml index f1e78c47f5..bbac922642 100644 --- a/charts/vald/templates/manager/index/priorityclass.yaml +++ b/charts/vald/templates/manager/index/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.indexManager.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.indexManager.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }} diff --git a/charts/vald/templates/meta/daemonset.yaml b/charts/vald/templates/meta/daemonset.yaml index 225a87b6f5..9a7be9fac0 100644 --- a/charts/vald/templates/meta/daemonset.yaml +++ b/charts/vald/templates/meta/daemonset.yaml @@ -110,7 +110,7 @@ spec: {{- end }} {{- if .Values.meta.podPriority }} {{- if .Values.meta.podPriority.enabled }} - priorityClassName: {{ .Values.meta.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.meta.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/meta/deployment.yaml b/charts/vald/templates/meta/deployment.yaml index a7fa9ff577..b33ed9f2af 100644 --- a/charts/vald/templates/meta/deployment.yaml +++ b/charts/vald/templates/meta/deployment.yaml @@ -115,7 +115,7 @@ spec: {{- end }} {{- if .Values.meta.podPriority }} {{- if .Values.meta.podPriority.enabled }} - priorityClassName: {{ .Values.meta.name }}-priority + priorityClassName: {{ .Release.Namespace }}-{{ .Values.meta.name }}-priority {{- end }} {{- end }} status: diff --git a/charts/vald/templates/meta/priorityclass.yaml b/charts/vald/templates/meta/priorityclass.yaml index 1a6b9e768d..b4975fc9b0 100644 --- a/charts/vald/templates/meta/priorityclass.yaml +++ b/charts/vald/templates/meta/priorityclass.yaml @@ -17,7 +17,7 @@ apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: - name: {{ .Values.meta.name }}-priority + name: {{ .Release.Namespace }}-{{ .Values.meta.name }}-priority labels: app.kubernetes.io/name: {{ include "vald.name" . }} helm.sh/chart: {{ include "vald.chart" . }}