🔧 Rename PriorityClass names to contain namespace

Signed-off-by: Rintaro Okamura <[email protected]>
vdaas · Dec 24, 2020 · 47eab08 · 47eab08
1 parent 923ef5a
commit 47eab08
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" . }}