Revert "Fix Helm deployment name issue" (#2070)

charts/kyverno/templates/deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: kyverno
+  name: {{ template "kyverno.fullname" . }}
   labels: {{ include "kyverno.labels" . | nindent 4 }}
     app: kyverno
   namespace: {{ template "kyverno.namespace" . }}
@@ -103,8 +103,6 @@ spec:
                 fieldPath: metadata.namespace
           - name: KYVERNO_SVC
             value: {{ template "kyverno.serviceName" . }}
-          - name: KYVERNO_DEPLOYMENT
-            value: {{ template "kyverno.fullname" . }}
         {{- with .Values.livenessProbe }}
           livenessProbe: {{ tpl (toYaml .) $ | nindent 12 }}
         {{- end }}

pkg/config/config.go

@@ -58,8 +58,7 @@ var (
 	KyvernoNamespace = getKyvernoNameSpace()
 
 	// KyvernoDeploymentName is the Kyverno deployment name
-	//KyvernoDeploymentName = getKyvernoDeploymentName()
-	KyvernoDeploymentName = "kyverno"
+	KyvernoDeploymentName = getKyvernoDeploymentName()
 
 	//KyvernoServiceName is the Kyverno service name
 	KyvernoServiceName = getKyvernoServiceName()
@@ -115,7 +114,7 @@ func getKyvernoServiceName() string {
 	return webhookServiceName
 }
 
-// getKyvernoDeploymentName - setting default KyvernoDeploymentName
+// getKyvernoDeploymentName - setting default KyvernoServiceName
 func getKyvernoDeploymentName() string {
 	name := os.Getenv("KYVERNO_DEPLOYMENT")
 	if name == "" {