Remove duplicated annotations definition and refactor hostPort configuration

charts/ingress-nginx/values.yaml

@@ -28,11 +28,6 @@ controller:
   # Will add custom headers before sending response traffic to the client according to: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#add-headers
   addHeaders: {}
 
-  # Required for use with CNI based kubernetes installations (such as ones set up by kubeadm),
-  # since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920
-  # is merged
-  hostNetwork: false
-
   # Optionally customize the pod dnsConfig.
   dnsConfig: {}
 
@@ -45,13 +40,19 @@ controller:
   # Ingress status was blank because there is no Service exposing the NGINX Ingress controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply
   reportNodeInternalIp: false
 
-  ## Use host ports 80 and 443
-  daemonset:
-    useHostPort: false
+  # Required for use with CNI based kubernetes installations (such as ones set up by kubeadm),
+  # since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920
+  # is merged
+  hostNetwork: false
 
-  hostPorts:
-    http: 80
-    https: 443
+  ## Use host ports 80 and 443
+  ## Disabled by default
+  ##
+  hostPort:
+    enabled: false
+    ports:
+      http: 80
+      https: 443
 
   ## Required only if defaultBackend.enabled = false
   ## Must be <namespace>/<service_name>
@@ -130,13 +131,9 @@ controller:
   ##
   kind: Deployment
 
-  ## Annotations to be added to the controller deployment
+  ## Annotations to be added to the controller Deployment or DaemonSet
   ##
-  deploymentAnnotations: {}
-
-  ## Annotations to be added to the controller daemonset
-  ##
-  daemonsetAnnotations: {}
+  annotations: {}
 
   # The update strategy to apply to the Deployment or DaemonSet
   ##