mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

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

Browse source
This commit is contained in:
shuting 2021-06-24 14:22:34 -07:00 • committed by GitHub
parent 54a85c5da1
commit 0a13ce9c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/kyverno/templates/deployment.yaml
View file

@ -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 }}

5
pkg/config/config.go
View file

@ -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 == "" {