Add CLI arguments for configuring ports for default server

charts/nginx-ingress/templates/controller-daemonset.yaml

@@ -237,7 +237,8 @@ spec:
           - -enable-cert-manager={{ .Values.controller.enableCertManager }}
           - -enable-oidc={{ .Values.controller.enableOIDC }}
           - -enable-external-dns={{ .Values.controller.enableExternalDNS }}
-          - -disable-default-listeners={{ .Values.controller.disableDefaultListeners }}
+          - -default-http-listener-port={{ .Values.controller.defaultHTTPListenerPort}}
+          - -default-https-listener-port={{ .Values.controller.defaultHTTPSListenerPort}}
 {{- if .Values.controller.globalConfiguration.create }}
           - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }}
 {{- end }}

charts/nginx-ingress/templates/controller-deployment.yaml

@@ -244,7 +244,8 @@ spec:
           - -enable-cert-manager={{ .Values.controller.enableCertManager }}
           - -enable-oidc={{ .Values.controller.enableOIDC }}
           - -enable-external-dns={{ .Values.controller.enableExternalDNS }}
-          - -disable-default-listeners={{ .Values.controller.disableDefaultListeners }}
+          - -default-http-listener-port={{ .Values.controller.defaultHTTPListenerPort}}
+          - -default-https-listener-port={{ .Values.controller.defaultHTTPSListenerPort}}
 {{- if .Values.controller.globalConfiguration.create }}
           - -global-configuration=$(POD_NAMESPACE)/{{ include "nginx-ingress.controller.fullname" . }}
 {{- end }}

charts/nginx-ingress/values.schema.json

@@ -1262,12 +1262,20 @@
             false
           ]
         },
-        "disableDefaultListeners": {
-          "type": "boolean",
-          "default": false,
-          "title": "The disableDefaultListeners",
+        "defaultHTTPListenerPort": {
+          "type": "integer",
+          "default": 80,
+          "title": "The defaultHTTPListenerPort",
           "examples": [
-            false
+            80
+          ]
+        },
+        "defaultHTTPSListenerPort": {
+          "type": "integer",
+          "default": 443,
+          "title": "The defaultHTTPSListenerPort",
+          "examples": [
+            443
           ]
         },
         "readOnlyRootFilesystem": {
@@ -1419,7 +1427,8 @@
           },
           "enableLatencyMetrics": false,
           "disableIPV6": false,
-          "disableDefaultListeners": false,
+          "defaultHTTPListenerPort": 80,
+          "defaultHTTPSListenerPort": 443,
           "readOnlyRootFilesystem": false
         }
       ]
@@ -1785,7 +1794,8 @@
         },
         "enableLatencyMetrics": false,
         "disableIPV6": false,
-        "disableDefaultListeners": false,
+        "defaultHTTPListenerPort": 80,
+        "defaultHTTPSListenerPort": 443,
         "readOnlyRootFilesystem": false
       },
       "rbac": {

charts/nginx-ingress/values.yaml

@@ -443,8 +443,11 @@ controller:
   ## Disable IPV6 listeners explicitly for nodes that do not support the IPV6 stack.
   disableIPV6: false
 
-  ## Disable both HTTP and HTTPS default server listeners.
-  disableDefaultListeners: false
+  ## Sets the port for the HTTP `default_server` listener.
+  defaultHTTPListenerPort: 80
+
+  ## Sets the port for the HTTPS `default_server` listener.
+  defaultHTTPSListenerPort: 443
 
   ## Configure root filesystem as read-only and add volumes for temporary data.
   readOnlyRootFilesystem: false

cmd/nginx-ingress/flags.go

@@ -194,8 +194,9 @@ var (
 	disableIPV6 = flag.Bool("disable-ipv6", false,
 		`Disable IPV6 listeners explicitly for nodes that do not support the IPV6 stack`)
 
-	disableDefaultListeners = flag.Bool("disable-default-listeners", false,
-		`Disable port 80 and 443 default_server listeners`)
+	defaultHTTPListenerPort = flag.Int("default-http-listener-port", 80, "Sets a custom port for the HTTP NGINX `default_server`. [1024 - 65535]")
+
+	defaultHTTPSListenerPort = flag.Int("default-https-listener-port", 443, "Sets a custom port for the HTTPS `default_server`. [1024 - 65535]")
 
 	startupCheckFn func() error
 )

cmd/nginx-ingress/main.go

@@ -90,7 +90,8 @@ func main() {
 
 	staticCfgParams := &configs.StaticConfigParams{
 		DisableIPV6:                    *disableIPV6,
-		DisableDefaultListeners:        *disableDefaultListeners,
+		DefaultHTTPListenerPort:        *defaultHTTPListenerPort,
+		DefaultHTTPSListenerPort:       *defaultHTTPSListenerPort,
 		HealthStatus:                   *healthStatus,
 		HealthStatusURI:                *healthStatusURI,
 		NginxStatus:                    *nginxStatus,

docs/content/configuration/global-configuration/command-line-arguments.md

@@ -509,10 +509,18 @@ Default `false`.
  
 <a name="cmdoption-disable-ipv6"></a>
 
-### -disable-default-listeners
+### -default-http-listener-port
 
-Disable both HTTP and HTTPS default server listeners.
+Sets the port for the HTTP `default_server` listener.
 
-Default `false`.
+Default `80`.
+&nbsp;
+<a name="cmdoption-default-http-listener-port"></a>
+
+### -default-https-listener-port
+
+Sets the port for the HTTPS `default_server` listener.
+
+Default `443`.
 &nbsp;
-<a name="cmdoption-disable-default-listeners"></a>
+<a name="cmdoption-default-https-listener-port"></a>

internal/configs/config_params.go

@@ -114,7 +114,8 @@ type ConfigParams struct {
 // StaticConfigParams holds immutable NGINX configuration parameters that affect the main NGINX config.
 type StaticConfigParams struct {
 	DisableIPV6                    bool
-	DisableDefaultListeners        bool
+	DefaultHTTPListenerPort        int
+	DefaultHTTPSListenerPort       int
 	HealthStatus                   bool
 	HealthStatusURI                string
 	NginxStatus                    bool

internal/configs/configmaps.go

@@ -514,7 +514,8 @@ func GenerateNginxMainConfig(staticCfgParams *StaticConfigParams, config *Config
 		DefaultServerAccessLogOff:          config.DefaultServerAccessLogOff,
 		DefaultServerReturn:                config.DefaultServerReturn,
 		DisableIPV6:                        staticCfgParams.DisableIPV6,
-		DisableDefaultListeners:            staticCfgParams.DisableDefaultListeners,
+		DefaultHTTPListenerPort:            staticCfgParams.DefaultHTTPListenerPort,
+		DefaultHTTPSListenerPort:           staticCfgParams.DefaultHTTPSListenerPort,
 		ErrorLogLevel:                      config.MainErrorLogLevel,
 		HealthStatus:                       staticCfgParams.HealthStatus,
 		HealthStatusURI:                    staticCfgParams.HealthStatusURI,

internal/configs/version1/config.go

@@ -165,7 +165,8 @@ type MainConfig struct {
 	DefaultServerAccessLogOff          bool
 	DefaultServerReturn                string
 	DisableIPV6                        bool
-	DisableDefaultListeners            bool
+	DefaultHTTPListenerPort            int
+	DefaultHTTPSListenerPort           int
 	ErrorLogLevel                      string
 	HealthStatus                       bool
 	HealthStatusURI                    string

internal/configs/version1/nginx-plus.tmpl

@@ -153,20 +153,16 @@ http {
         set $resource_namespace "";
         set $service "";
 
-        {{if not .DisableDefaultListeners}}
-        listen 80 default_server{{if .ProxyProtocol}} proxy_protocol{{end}};
-        {{if not .DisableIPV6}}listen [::]:80 default_server{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
-        {{end}}
+        listen {{ .DefaultHTTPListenerPort }} default_server{{if .ProxyProtocol}} proxy_protocol{{end}};
+        {{if not .DisableIPV6}}listen [::]:{{ .DefaultHTTPListenerPort }} default_server{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
 
         {{if .TLSPassthrough}}
         listen unix:/var/lib/nginx/passthrough-https.sock ssl default_server{{if .HTTP2}} http2{{end}} proxy_protocol;
         set_real_ip_from unix:;
         real_ip_header proxy_protocol;
         {{else}}
-        {{if not .DisableDefaultListeners}}
-        listen 443 ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};
-        {{if not .DisableIPV6}}listen [::]:443 ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
-        {{end}}
+        listen {{ .DefaultHTTPSListenerPort }} ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};
+        {{if not .DisableIPV6}}listen [::]:{{ .DefaultHTTPSListenerPort }} ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
         {{end}}
 
         {{if .SSLRejectHandshake}}

internal/configs/version1/nginx.tmpl

@@ -106,20 +106,16 @@ http {
         set $resource_namespace "";
         set $service "";
 
-        {{if not .DisableDefaultListeners}}
-        listen 80 default_server{{if .ProxyProtocol}} proxy_protocol{{end}};
-        {{if not .DisableIPV6}}listen [::]:80 default_server{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
-        {{end}}
+        listen {{ .DefaultHTTPListenerPort}} default_server{{if .ProxyProtocol}} proxy_protocol{{end}};
+        {{if not .DisableIPV6}}listen [::]:{{ .DefaultHTTPListenerPort}} default_server{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
 
         {{if .TLSPassthrough}}
         listen unix:/var/lib/nginx/passthrough-https.sock ssl default_server{{if .HTTP2}} http2{{end}} proxy_protocol;
         set_real_ip_from unix:;
         real_ip_header proxy_protocol;
         {{else}}
-        {{if not .DisableDefaultListeners}}
-        listen 443 ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};
-        {{if not .DisableIPV6}}listen [::]:443 ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
-        {{end}}
+        listen {{ .DefaultHTTPSListenerPort}} ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};
+        {{if not .DisableIPV6}}listen [::]:{{ .DefaultHTTPSListenerPort}} ssl default_server{{if .HTTP2}} http2{{end}}{{if .ProxyProtocol}} proxy_protocol{{end}};{{end}}
         {{end}}
 
         {{if .SSLRejectHandshake}}