From 5148443ca74de7bfba0ecad36e223341c22f7b8c Mon Sep 17 00:00:00 2001
From: Laszlo Janosi <laszlo.janosi@ibm.com>
Date: Mon, 4 May 2020 17:50:00 +0000
Subject: [PATCH] Move webhook runAsUser from patch.image.runAsUser to
 patch.runAsUser

---
 .../admission-webhooks/job-patch/job-createSecret.yaml          | 2 +-
 .../admission-webhooks/job-patch/job-patchWebhook.yaml          | 2 +-
 charts/ingress-nginx/values.yaml                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
index 966117e5e..d8e9763a1 100644
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -43,5 +43,5 @@ spec:
     {{- end }}
       securityContext:
         runAsNonRoot: true
-        runAsUser: {{ .Values.controller.admissionWebhooks.patch.image.runAsUser }}
+        runAsUser: {{ .Values.controller.admissionWebhooks.patch.runAsUser }}
 {{- end }}
diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
index 7ee52c3ae..e5c0b9dbf 100644
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -45,5 +45,5 @@ spec:
     {{- end }}
       securityContext:
         runAsNonRoot: true
-        runAsUser: {{ .Values.controller.admissionWebhooks.patch.image.runAsUser }}
+        runAsUser: {{ .Values.controller.admissionWebhooks.patch.runAsUser }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 8827ccad4..54a97348c 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -362,12 +362,12 @@ controller:
         repository: jettech/kube-webhook-certgen
         tag: v1.2.0
         pullPolicy: IfNotPresent
-        runAsUser: 2000
       ## Provide a priority class name to the webhook patching job
       ##
       priorityClassName: ""
       podAnnotations: {}
       nodeSelector: {}
+      runAsUser: 2000
 
   metrics:
     port: 10254