Merge pull request #28 from punkprzemo/hostPort-only

hostPort without hostNetwork

Author: dkorunic

kubernetes-ingress/templates/controller-daemonset.yaml

@@ -15,6 +15,7 @@ limitations under the License.
 */}}
 
 {{- if eq .Values.controller.kind "DaemonSet" }}
+{{- $useHostNetwork := .Values.controller.daemonset.useHostNetwork -}}
 {{- $useHostPort := .Values.controller.daemonset.useHostPort -}}
 {{- $hostPorts := .Values.controller.daemonset.hostPorts -}}
 apiVersion: apps/v1
@@ -52,7 +53,7 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ template "kubernetes-ingress.serviceAccountName" . }}
-      {{- if $useHostPort }}
+      {{- if $useHostNetwork }}
       hostNetwork: true
       {{- end }}
 {{- if .Values.controller.imageCredentials.registry }}

kubernetes-ingress/templates/controller-podsecuritypolicy.yaml

@@ -15,6 +15,7 @@ limitations under the License.
 */}}
 
 {{- if and .Values.rbac.create .Values.podSecurityPolicy.enabled }}
+{{- $useHostNetwork := .Values.controller.daemonset.useHostNetwork }}
 {{- $useHostPort := .Values.controller.daemonset.useHostPort }}
 {{- $hostPorts := .Values.controller.daemonset.hostPorts -}}
 apiVersion: policy/v1beta1
@@ -41,8 +42,10 @@ spec:
     - max: 65535
       min: 1
     rule: MustRunAs
-{{- if $useHostPort }}
+{{- if $useHostNetwork }}
   hostNetwork: true
+{{- end }}
+{{- if or $useHostPort $useHostNetwork }}
   hostPorts:
 {{- range $key, $value := .Values.controller.containerPort }}
   - min: {{ $value }}

kubernetes-ingress/values.yaml

@@ -274,6 +274,7 @@ controller:
   ## Controller DaemonSet configuration
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
   daemonset:
+    useHostNetwork: false
     useHostPort: false
     hostPorts:
       http: 80