Merge "Add toleration to Nginx IC daemonset and job"

stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec

@@ -30,6 +30,8 @@ Source5: nginx_ingress_controller_manifest.yaml
 
 BuildArch: noarch
 
+Patch01: 0001-add-toleration.patch
+
 BuildRequires: helm
 BuildRequires: chartmuseum
 BuildRequires: python-k8sapp-nginx-ingress-controller
@@ -40,6 +42,7 @@ StarlingX Nginx Ingress Controller Application Armada Helm Charts
 
 %prep
 %setup -n helm-charts
+%patch01 -p1
 
 %build
 # Host a server for the charts

stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/files/0001-add-toleration.patch

@@ -0,0 +1,27 @@
+From 8901108acc3b364c9121481f9556acbf2e4edb6d Mon Sep 17 00:00:00 2001
+From: Rafael Camargos <RafaelLucas.Camargos@windriver.com>
+Date: Mon, 27 Sep 2021 22:31:26 -0300
+Subject: [PATCH] Add toleration to daemonset
+
+---
+ charts/ingress-nginx/templates/controller-daemonset.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/charts/ingress-nginx/templates/controller-daemonset.yaml b/charts/ingress-nginx/templates/controller-daemonset.yaml
+index aa8693b47..6df0a9809 100644
+--- a/charts/ingress-nginx/templates/controller-daemonset.yaml
++++ b/charts/ingress-nginx/templates/controller-daemonset.yaml
+@@ -61,6 +61,10 @@ spec:
+           value: {{ $value | quote }}
+     {{- end }}
+     {{- end }}
++      tolerations:
++        - key: "node-role.kubernetes.io/master"
++          operator: "Exists"
++          effect: "NoSchedule"
+       containers:
+         - name: controller
+           {{- with .Values.controller.image }}
+-- 
+2.17.1
+

stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/manifests/nginx_ingress_controller_manifest.yaml

@@ -49,6 +49,11 @@ data:
       admissionWebhooks:
         # default port 8443 conflicts with lighttpd using https
         port: 5443
+        patch:
+          tolerations:
+            - key: "node-role.kubernetes.io/master"
+              operator: "Exists"
+              effect: "NoSchedule"
     defaultBackend:
       image:
         repository: k8s.gcr.io/defaultbackend