Remove resource kind from resource names

charts/core/templates/NOTES.txt

@@ -4,17 +4,17 @@ http://{{ .Values.manager.ingress.host }}
 {{- else if not .Values.openshift }}
 Get the NeuVector URL by running these commands:
 {{- if contains "NodePort" .Values.manager.svc.type }}
-  NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services neuvector-service-webui)
+  NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services neuvector-webui)
   NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo https://$NODE_IP:$NODE_PORT
 {{- else if contains "ClusterIP" .Values.manager.svc.type }}
-  CLUSTER_IP=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.clusterIP}" services neuvector-service-webui)
+  CLUSTER_IP=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.clusterIP}" services neuvector-webui)
   echo https://$CLUSTER_IP:8443
 {{- else if contains "LoadBalancer" .Values.manager.svc.type }}
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w neuvector-service-webui'
+        Watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w neuvector-webui'
 
-  SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} neuvector-service-webui -o jsonpath="{.status.loadBalancer.ingress[0].ip}")
+  SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} neuvector-webui -o jsonpath="{.status.loadBalancer.ingress[0].ip}")
   echo https://$SERVICE_IP:8443
 {{- end }}
 {{- end }}

charts/core/templates/admission-webhook-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: neuvector-svc-admission-webhook
+  name: neuvector-admission-webhook
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -15,4 +15,4 @@ spec:
       name: admission-webhook
   type: {{ .Values.admissionwebhook.type }}
   selector:
-    app: neuvector-controller-pod
+    app: neuvector-controller

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" . }}
@@ -23,11 +23,11 @@ spec:
 {{ toYaml .Values.controller.strategy | indent 4 }}
   selector:
     matchLabels:
-      app: neuvector-controller-pod
+      app: neuvector-controller
   template:
     metadata:
       labels:
-        app: neuvector-controller-pod
+        app: neuvector-controller
         release: {{ .Release.Name }}
         {{- with .Values.controller.podLabels }}
         {{- toYaml . | nindent 8 }}
@@ -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 }}
@@ -113,7 +113,7 @@ spec:
             periodSeconds: 5
           env:
             - name: CLUSTER_JOIN_ADDR
-              value: neuvector-svc-controller.{{ .Release.Namespace }}
+              value: neuvector-controller.{{ .Release.Namespace }}
             - name: CLUSTER_ADVERTISED_ADDR
               valueFrom:
                 fieldRef:
@@ -287,6 +287,6 @@ spec:
   minAvailable: {{ .Values.controller.disruptionbudget }}
   selector:
     matchLabels:
-      app: neuvector-controller-pod
+      app: neuvector-controller
 {{- end }}
 {{- end }}

charts/core/templates/controller-ingress.yaml

@@ -34,7 +34,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: neuvector-svc-controller-api
+            name: neuvector-controller-api
             port:
               number: 10443
 {{- else }}
@@ -66,7 +66,7 @@ spec:
       paths:
       - path: {{ .Values.controller.ingress.path }}
         backend:
-          serviceName: neuvector-svc-controller-api
+          serviceName: neuvector-controller-api
           servicePort: 10443
 {{- end }}
 {{- end }}
@@ -106,7 +106,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: neuvector-svc-controller-fed-master
+            name: neuvector-controller-fed-master
             port:
               number: 11443
 {{- else }}
@@ -139,7 +139,7 @@ spec:
       paths:
       - path: {{ .Values.controller.federation.mastersvc.ingress.path }}
         backend:
-          serviceName: neuvector-svc-controller-fed-master
+          serviceName: neuvector-controller-fed-master
           servicePort: 11443
 {{- end }}
 {{- end }}
@@ -179,7 +179,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: neuvector-svc-controller-fed-managed
+            name: neuvector-controller-fed-managed
             port:
               number: 10443
 {{- else }}
@@ -212,7 +212,7 @@ spec:
       paths:
       - path: {{ .Values.controller.federation.managedsvc.ingress.path }}
         backend:
-          serviceName: neuvector-svc-controller-fed-managed
+          serviceName: neuvector-controller-fed-managed
           servicePort: 10443
 {{- end }}
 {{- end }}

charts/core/templates/controller-route.yaml

@@ -19,7 +19,7 @@ spec:
 {{- end }}
   to:
     kind: Service
-    name: neuvector-svc-controller-api
+    name: neuvector-controller-api
   port:
     targetPort: controller-api
   tls:
@@ -52,7 +52,7 @@ spec:
 {{- end }}
   to:
     kind: Service
-    name: neuvector-svc-controller-fed-master
+    name: neuvector-controller-fed-master
   port:
     targetPort: fed
   tls:
@@ -84,7 +84,7 @@ spec:
 {{- end }}
   to:
     kind: Service
-    name: neuvector-svc-controller-fed-managed
+    name: neuvector-controller-fed-managed
   port:
     targetPort: fed
   tls:

charts/core/templates/controller-service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: neuvector-svc-controller
+  name: neuvector-controller
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -21,13 +21,13 @@ spec:
       protocol: "UDP"
       name: "cluster-udp-18301"
   selector:
-    app: neuvector-controller-pod
+    app: neuvector-controller
 {{- if .Values.controller.apisvc.type }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: neuvector-svc-controller-api
+  name: neuvector-controller-api
   namespace: {{ .Release.Namespace }}
 {{- with .Values.controller.apisvc.annotations }}
   annotations:
@@ -44,14 +44,14 @@ spec:
       protocol: "TCP"
       name: "controller-api"
   selector:
-    app: neuvector-controller-pod
+    app: neuvector-controller
 {{ end -}}
 {{- if .Values.controller.federation.mastersvc.type }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: neuvector-svc-controller-fed-master
+  name: neuvector-controller-fed-master
   namespace: {{ .Release.Namespace }}
 {{- with .Values.controller.federation.mastersvc.annotations }}
   annotations:
@@ -68,14 +68,14 @@ spec:
     name: fed
     protocol: TCP
   selector:
-    app: neuvector-controller-pod
+    app: neuvector-controller
 {{ end -}}
 {{- if .Values.controller.federation.managedsvc.type }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: neuvector-svc-controller-fed-managed
+  name: neuvector-controller-fed-managed
   namespace: {{ .Release.Namespace }}
 {{- with .Values.controller.federation.managedsvc.annotations }}
   annotations:
@@ -92,6 +92,6 @@ spec:
     name: fed
     protocol: TCP
   selector:
-    app: neuvector-controller-pod
+    app: neuvector-controller
 {{ end -}}
 {{- end -}}

charts/core/templates/crd.yaml

@@ -827,7 +827,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: neuvector-svc-crd-webhook
+  name: neuvector-crd-webhook
   namespace: {{ .Release.Namespace }}
   labels:
     chart: {{ template "neuvector.chart" . }}
@@ -841,5 +841,5 @@ spec:
       name: crd-webhook
   type: {{ .Values.crdwebhook.type }}
   selector:
-    app: neuvector-controller-pod
+    app: neuvector-controller
 {{- end }}

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" . }}
@@ -15,11 +15,11 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: neuvector-csp-pod
+      app: neuvector-csp
   template:
     metadata:
       labels:
-        app: neuvector-csp-pod
+        app: neuvector-csp
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.global.aws.imagePullSecrets }}
@@ -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 }}

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" . }}
@@ -16,11 +16,11 @@ spec:
   updateStrategy: {{- toYaml .Values.enforcer.updateStrategy | nindent 4 }}
   selector:
     matchLabels:
-      app: neuvector-enforcer-pod
+      app: neuvector-enforcer
   template:
     metadata:
       labels:
-        app: neuvector-enforcer-pod
+        app: neuvector-enforcer
         release: {{ .Release.Name }}
         {{- with .Values.enforcer.podLabels }}
         {{- toYaml . | nindent 8 }}
@@ -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 }}
@@ -78,7 +78,7 @@ spec:
           {{- end }}
           env:
             - name: CLUSTER_JOIN_ADDR
-              value: neuvector-svc-controller.{{ .Release.Namespace }}
+              value: neuvector-controller.{{ .Release.Namespace }}
             - name: CLUSTER_ADVERTISED_ADDR
               valueFrom:
                 fieldRef:

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" . }}
@@ -16,11 +16,11 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: neuvector-manager-pod
+      app: neuvector-manager
   template:
     metadata:
       labels:
-        app: neuvector-manager-pod
+        app: neuvector-manager
         release: {{ .Release.Name }}
         {{- with .Values.manager.podLabels }}
         {{- toYaml . | nindent 8 }}
@@ -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 }}
@@ -86,7 +86,7 @@ spec:
           {{- end }}
           env:
             - name: CTRL_SERVER_IP
-              value: neuvector-svc-controller.{{ .Release.Namespace }}
+              value: neuvector-controller.{{ .Release.Namespace }}
             {{- if not .Values.manager.env.ssl }}
             - name: MANAGER_SSL
               value: "off"
@@ -129,6 +129,6 @@ spec:
       {{- else if .Values.autoGenerateCert }}
         - name: cert
           secret:
-            secretName: neuvector-manager-secret
+            secretName: neuvector-manager
       {{- end }}
 {{- end }}

charts/core/templates/manager-ingress.yaml

@@ -33,7 +33,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: neuvector-service-webui
+            name: neuvector-webui
             port:
               number: 8443
 {{- else }}
@@ -65,7 +65,7 @@ spec:
       paths:
       - path: {{ .Values.manager.ingress.path }}
         backend:
-          serviceName: neuvector-service-webui
+          serviceName: neuvector-webui
           servicePort: 8443
 {{- end }}
 {{- end -}}