Remove -pod suffix from non-pod resources

Fixes neuvector#327
lindhe · Nov 11, 2023 · 8a363c7 · 8a363c7
1 parent 26921cb
commit 8a363c7
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/charts/core/templates/controller-deployment.yaml b/charts/core/templates/controller-deployment.yaml
@@ -6,7 +6,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Deployment
 metadata:
-  name: neuvector-controller-pod
+  name: neuvector-controller
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -78,7 +78,7 @@ spec:
       serviceAccount: {{ .Values.serviceAccount }}
       {{- end }}
       containers:
-        - name: neuvector-controller-pod
+        - name: neuvector-controller
           {{- if .Values.global.azure.enabled }}
           image: "{{ .Values.global.azure.images.controller.registry }}/{{ .Values.global.azure.images.controller.image }}@{{ .Values.global.azure.images.controller.digest }}"
           {{- else }}

diff --git a/charts/core/templates/csp-deployment.yaml b/charts/core/templates/csp-deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: neuvector-csp-pod
+  name: neuvector-csp
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -57,7 +57,7 @@ spec:
         {{- else if and .Values.global.azure.enabled }}
         image: "{{ .Values.global.azure.images.neuvector_csp_pod.registry }}/{{ .Values.global.azure.images.neuvector_csp_pod.image }}@{{ .Values.global.azure.images.neuvector_csp_pod.digest }}"
         {{- end }}
-        name: neuvector-csp-pod
+        name: neuvector-csp
         {{- if .Values.global.aws.enabled }}
         imagePullPolicy: "{{ .Values.global.aws.image.imagePullPolicy }}"
         {{- else if .Values.global.azure.enabled }}

diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml
@@ -6,7 +6,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: DaemonSet
 metadata:
-  name: neuvector-enforcer-pod
+  name: neuvector-enforcer
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -50,7 +50,7 @@ spec:
       serviceAccount: {{ .Values.serviceAccount }}
     {{- end }}
       containers:
-        - name: neuvector-enforcer-pod
+        - name: neuvector-enforcer
           {{- if .Values.global.azure.enabled }}
           image: "{{ .Values.global.azure.images.enforcer.registry }}/{{ .Values.global.azure.images.enforcer.image }}@{{ .Values.global.azure.images.enforcer.digest }}"
           {{- else }}

diff --git a/charts/core/templates/manager-deployment.yaml b/charts/core/templates/manager-deployment.yaml
@@ -6,7 +6,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Deployment
 metadata:
-  name: neuvector-manager-pod
+  name: neuvector-manager
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -66,7 +66,7 @@ spec:
         runAsUser: {{ .Values.manager.runAsUser }}
       {{- end }}
       containers:
-        - name: neuvector-manager-pod
+        - name: neuvector-manager
           {{- if .Values.global.azure.enabled }}
           image: "{{ .Values.global.azure.images.manager.registry }}/{{ .Values.global.azure.images.manager.image }}@{{ .Values.global.azure.images.manager.digest }}"
           {{- else }}

diff --git a/charts/core/templates/registry-adapter.yaml b/charts/core/templates/registry-adapter.yaml
@@ -6,7 +6,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Deployment
 metadata:
-  name: neuvector-registry-adapter-pod
+  name: neuvector-registry-adapter
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -66,7 +66,7 @@ spec:
         runAsUser: {{ .Values.cve.adapter.runAsUser }}
       {{- end }}
       containers:
-        - name: neuvector-registry-adapter-pod
+        - name: neuvector-registry-adapter
           {{- if eq .Values.registry "registry.neuvector.com" }}
           {{- if .Values.oem }}
           image: "{{ .Values.registry }}/{{ .Values.oem }}/registry-adapter:{{ .Values.cve.adapter.image.tag }}"

diff --git a/charts/core/templates/scanner-deployment.yaml b/charts/core/templates/scanner-deployment.yaml
@@ -6,7 +6,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Deployment
 metadata:
-  name: neuvector-scanner-pod
+  name: neuvector-scanner
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -62,7 +62,7 @@ spec:
         runAsUser: {{ .Values.cve.scanner.runAsUser }}
       {{- end }}
       containers:
-        - name: neuvector-scanner-pod
+        - name: neuvector-scanner
           {{- if .Values.global.azure.enabled }}
           image: "{{ .Values.global.azure.images.scanner.registry }}/{{ .Values.global.azure.images.scanner.image }}@{{ .Values.global.azure.images.scanner.digest }}"
           {{- else }}

diff --git a/charts/core/templates/updater-cronjob.yaml b/charts/core/templates/updater-cronjob.yaml
@@ -8,7 +8,7 @@ apiVersion: batch/v2alpha1
 {{- end }}
 kind: CronJob
 metadata:
-  name: neuvector-updater-pod
+  name: neuvector-updater
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -54,7 +54,7 @@ spec:
             runAsUser: {{ .Values.cve.updater.runAsUser }}
           {{- end }}
           containers:
-            - name: neuvector-updater-pod
+            - name: neuvector-updater
               {{- if eq .Values.registry "registry.neuvector.com" }}
               {{- if .Values.oem }}
               image: "{{ .Values.registry }}/{{ .Values.oem }}/updater:{{ .Values.cve.updater.image.tag }}"