Apply suggestions from code review

Co-authored-by: Luca Comellini <luca.com@gmail.com>
nginxinc · May 8, 2022 · f484f83 · f484f83
1 parent 695d4e0
commit f484f83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/deployments/helm-chart/templates/controller-service.yaml b/deployments/helm-chart/templates/controller-service.yaml
@@ -20,7 +20,7 @@ spec:
   {{- end }}
 {{- end }}
 {{- if eq .Values.controller.service.type "LoadBalancer" }}
-  {{- if hasKey .Values.controller.service "allocateLoadBalancerNodePorts" }}
+  {{- if and (semverCompare ">=1.22.0-0" .Capabilities.KubeVersion.Version) (.Values.controller.service.allocateLoadBalancerNodePorts) }}
   allocateLoadBalancerNodePorts: {{ .Values.controller.service.allocateLoadBalancerNodePorts }}
   {{- end }}
   {{- if .Values.controller.service.loadBalancerIP }}
@@ -32,7 +32,7 @@ spec:
   {{- end }}
 {{- end }}
   type: {{ .Values.controller.service.type }}
-  {{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
+  {{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version }}
   {{- if .Values.controller.service.ipFamilyPolicy }}
   ipFamilyPolicy: {{ .Values.controller.service.ipFamilyPolicy }}
   {{- end }}

diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -239,7 +239,6 @@ controller:
     # name: nginx-ingress
 
     ## Whether to automatically allocate NodePorts (only for LoadBalancers).
-    ## This is a beta-level feature as of Kubernetes version 1.22.
     # allocateLoadBalancerNodePorts: false
 
     ## Dual stack preference.