update flags

Author: salonichf5

charts/nginx-gateway-fabric/README.md

@@ -245,7 +245,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
 | `nginx.usage.resolver` | The nameserver used to resolve the NGINX Plus usage reporting endpoint. Used with NGINX Instance Manager. | string | `""` |
 | `nginx.usage.secretName` | The name of the Secret containing the JWT for NGINX Plus usage reporting. Must exist in the same namespace that the NGINX Gateway Fabric control plane is running in (default namespace: nginx-gateway). | string | `"nplus-license"` |
 | `nginx.usage.skipVerify` | Disable client verification of the NGINX Plus usage reporting server certificate. | bool | `false` |
-| `nginxGateway` | The nginxGateway section contains configuration for the NGINX Gateway Fabric control plane deployment. | object | `{"affinity":{},"autoscaling":{"enable":false},"config":{"logging":{"level":"info"}},"configAnnotations":{},"extraVolumeMounts":[],"extraVolumes":[],"gatewayClassAnnotations":{},"gatewayClassName":"nginx","gatewayControllerName":"gateway.nginx.org/nginx-gateway-controller","gwAPIExperimentalFeatures":{"enable":false},"gwAPIInferenceExtension":{"enable":false,"endpointPicker":{"disableTLS":false,"enableSecureVerify":false}},"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric","tag":"edge"},"kind":"deployment","labels":{},"leaderElection":{"enable":true,"lockName":""},"lifecycle":{},"metrics":{"enable":true,"port":9113,"secure":false},"name":"","nodeSelector":{},"podAnnotations":{},"productTelemetry":{"enable":true},"readinessProbe":{"enable":true,"initialDelaySeconds":3,"port":8081},"replicas":1,"resources":{},"service":{"annotations":{},"labels":{}},"serviceAccount":{"annotations":{},"imagePullSecret":"","imagePullSecrets":[],"name":""},"snippetsFilters":{"enable":false},"terminationGracePeriodSeconds":30,"tolerations":[],"topologySpreadConstraints":[]}` |
+| `nginxGateway` | The nginxGateway section contains configuration for the NGINX Gateway Fabric control plane deployment. | object | `{"affinity":{},"autoscaling":{"enable":false},"config":{"logging":{"level":"info"}},"configAnnotations":{},"extraVolumeMounts":[],"extraVolumes":[],"gatewayClassAnnotations":{},"gatewayClassName":"nginx","gatewayControllerName":"gateway.nginx.org/nginx-gateway-controller","gwAPIExperimentalFeatures":{"enable":false},"gwAPIInferenceExtension":{"enable":false,"endpointPicker":{"disableTLS":false,"skipVerify":true}},"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric","tag":"edge"},"kind":"deployment","labels":{},"leaderElection":{"enable":true,"lockName":""},"lifecycle":{},"metrics":{"enable":true,"port":9113,"secure":false},"name":"","nodeSelector":{},"podAnnotations":{},"productTelemetry":{"enable":true},"readinessProbe":{"enable":true,"initialDelaySeconds":3,"port":8081},"replicas":1,"resources":{},"service":{"annotations":{},"labels":{}},"serviceAccount":{"annotations":{},"imagePullSecret":"","imagePullSecrets":[],"name":""},"snippetsFilters":{"enable":false},"terminationGracePeriodSeconds":30,"tolerations":[],"topologySpreadConstraints":[]}` |
 | `nginxGateway.affinity` | The affinity of the NGINX Gateway Fabric control plane pod. | object | `{}` |
 | `nginxGateway.autoscaling` | Autoscaling configuration for the NGINX Gateway Fabric control plane. | object | `{"enable":false}` |
 | `nginxGateway.autoscaling.enable` | Enable or disable Horizontal Pod Autoscaler for the control plane. | bool | `false` |
@@ -258,9 +258,9 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
 | `nginxGateway.gatewayControllerName` | The name of the Gateway controller. The controller name must be of the form: DOMAIN/PATH. The controller's domain is gateway.nginx.org. | string | `"gateway.nginx.org/nginx-gateway-controller"` |
 | `nginxGateway.gwAPIExperimentalFeatures.enable` | Enable the experimental features of Gateway API which are supported by NGINX Gateway Fabric. Requires the Gateway APIs installed from the experimental channel. | bool | `false` |
 | `nginxGateway.gwAPIInferenceExtension.enable` | Enable Gateway API Inference Extension support. Allows for configuring InferencePools to route traffic to AI workloads. | bool | `false` |
-| `nginxGateway.gwAPIInferenceExtension.endpointPicker` | EndpointPicker TLS configuration. | object | `{"disableTLS":false,"enableSecureVerify":false}` |
+| `nginxGateway.gwAPIInferenceExtension.endpointPicker` | EndpointPicker TLS configuration. | object | `{"disableTLS":false,"skipVerify":true}` |
 | `nginxGateway.gwAPIInferenceExtension.endpointPicker.disableTLS` | Disable TLS for EndpointPicker communication. By default, TLS is enabled. Set to true only for development/testing or when using a service mesh for encryption. | bool | `false` |
-| `nginxGateway.gwAPIInferenceExtension.endpointPicker.enableSecureVerify` | Enable TLS certificate verification when connecting to the EndpointPicker. By default, certificate verification is disabled. REQUIRED: Must be false until Gateway API Inference Extension EndpointPicker supports mounting certificates. See: https://github.com/kubernetes-sigs/gateway-api-inference-extension/issues/1556 | bool | `false` |
+| `nginxGateway.gwAPIInferenceExtension.endpointPicker.skipVerify` | Disables TLS certificate verification when connecting to the EndpointPicker. By default, certificate verification is disabled. REQUIRED: Must be true until Gateway API Inference Extension EndpointPicker supports mounting certificates. See: https://github.com/kubernetes-sigs/gateway-api-inference-extension/issues/1556 | bool | `true` |
 | `nginxGateway.image` | The image configuration for the NGINX Gateway Fabric control plane. | object | `{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric","tag":"edge"}` |
 | `nginxGateway.image.repository` | The NGINX Gateway Fabric image to use | string | `"ghcr.io/nginx/nginx-gateway-fabric"` |
 | `nginxGateway.kind` | The kind of the NGINX Gateway Fabric installation - currently, only deployment is supported. | string | `"deployment"` |

charts/nginx-gateway-fabric/templates/deployment.yaml

@@ -106,8 +106,8 @@ spec:
         {{- if .Values.nginxGateway.gwAPIInferenceExtension.endpointPicker.disableTLS }}
         - --endpoint-picker-disable-tls
         {{- end }}
-        {{- if .Values.nginxGateway.gwAPIInferenceExtension.endpointPicker.enableSecureVerify }}
-        - --endpoint-picker-enable-secure-verify
+        {{- if .Values.nginxGateway.gwAPIInferenceExtension.endpointPicker.skipVerify }}
+        - --endpoint-picker-tls-skip-verify
         {{- end }}
         {{- if .Values.nginxGateway.snippetsFilters.enable }}
         - --snippets-filters

charts/nginx-gateway-fabric/values.schema.json

@@ -857,11 +857,11 @@
                   "title": "disableTLS",
                   "type": "boolean"
                 },
-                "enableSecureVerify": {
-                  "default": false,
-                  "description": "Enable TLS certificate verification when connecting to the EndpointPicker.\nBy default, certificate verification is disabled.\nREQUIRED: Must be false until Gateway API Inference Extension EndpointPicker supports mounting certificates.\nSee: https://github.com/kubernetes-sigs/gateway-api-inference-extension/issues/1556",
+                "skipVerify": {
+                  "default": true,
+                  "description": "Disables TLS certificate verification when connecting to the EndpointPicker.\nBy default, certificate verification is disabled.\nREQUIRED: Must be true until Gateway API Inference Extension EndpointPicker supports mounting certificates.\nSee: https://github.com/kubernetes-sigs/gateway-api-inference-extension/issues/1556",
                   "required": [],
-                  "title": "enableSecureVerify",
+                  "title": "skipVerify",
                   "type": "boolean"
                 }
               },

charts/nginx-gateway-fabric/values.yaml

@@ -220,11 +220,11 @@ nginxGateway:
       # Set to true only for development/testing or when using a service mesh for encryption.
       disableTLS: false
 
-      # -- Enable TLS certificate verification when connecting to the EndpointPicker.
+      # -- Disables TLS certificate verification when connecting to the EndpointPicker.
       # By default, certificate verification is disabled.
-      # REQUIRED: Must be false until Gateway API Inference Extension EndpointPicker supports mounting certificates.
+      # REQUIRED: Must be true until Gateway API Inference Extension EndpointPicker supports mounting certificates.
       # See: https://github.com/kubernetes-sigs/gateway-api-inference-extension/issues/1556
-      enableSecureVerify: false
+      skipVerify: true
 
 
   snippetsFilters:

cmd/gateway/commands.go

@@ -37,11 +37,11 @@ const (
 		`The controller name must be of the form: DOMAIN/PATH. The controller's domain is '%s'`
 	plusFlag = "nginx-plus"
 
-	serverTLSSecret                      = "server-tls"
-	agentTLSSecret                       = "agent-tls"
-	nginxOneTelemetryEndpointHost        = "agent.connect.nginx.com"
-	endpointPickerDisableTLSFlag         = "endpoint-picker-disable-tls"
-	endpointPickerEnableSecureVerifyFlag = "endpoint-picker-enable-secure-verify"
+	serverTLSSecret                 = "server-tls"
+	agentTLSSecret                  = "agent-tls"
+	nginxOneTelemetryEndpointHost   = "agent.connect.nginx.com"
+	endpointPickerDisableTLSFlag    = "endpoint-picker-disable-tls"
+	endpointPickerTLSSkipVerifyFlag = "endpoint-picker-tls-skip-verify"
 )
 
 // usageReportParams holds the parameters for building the usage report configuration for PLUS.
@@ -165,8 +165,8 @@ func createControllerCommand() *cobra.Command {
 			validator: validateResourceName,
 		}
 
-		endpointPickerDisableTLS         bool
-		endpointPickerEnableSecureVerify bool
+		endpointPickerDisableTLS        bool
+		endpointPickerTLSSkipVerifyFlag bool
 	)
 
 	usageReportParams := usageReportParams{
@@ -293,8 +293,8 @@ func createControllerCommand() *cobra.Command {
 					EndpointPort:           nginxOneConsoleTelemetryEndpointPort.value,
 					EndpointTLSSkipVerify:  nginxOneConsoleTLSSkipVerify,
 				},
-				EndpointPickerDisableTLS:         endpointPickerDisableTLS,
-				EndpointPickerEnableSecureVerify: endpointPickerEnableSecureVerify,
+				EndpointPickerDisableTLS:    endpointPickerDisableTLS,
+				EndpointPickerTLSSkipVerify: endpointPickerTLSSkipVerifyFlag,
 			}
 
 			if err := controller.StartManager(conf); err != nil {
@@ -448,7 +448,7 @@ func createControllerCommand() *cobra.Command {
 			"traffic to AI workloads.",
 	)
 
-	addEPPConnectionFlags(cmd, endpointPickerDisableTLS, endpointPickerEnableSecureVerify)
+	addEPPConnectionFlags(cmd, endpointPickerDisableTLS, endpointPickerTLSSkipVerifyFlag)
 
 	cmd.Flags().Var(
 		&nginxDockerSecrets,
@@ -767,26 +767,26 @@ func createSleepCommand() *cobra.Command {
 }
 
 func createEndpointPickerCommand() *cobra.Command {
-	var endpointPickerDisableTLS, endpointPickerEnableSecureVerify bool
+	var endpointPickerDisableTLS, endpointPickerTLSSkipVerifyFlag bool
 	cmd := &cobra.Command{
 		Use:   "endpoint-picker",
 		Short: "Shim server for communication between NGINX and the Gateway API Inference Extension Endpoint Picker",
 		RunE: func(_ *cobra.Command, _ []string) error {
 			logger := ctlrZap.New().WithName("endpoint-picker-shim")
 			handler := createEndpointPickerHandler(
-				realExtProcClientFactory(endpointPickerDisableTLS, endpointPickerEnableSecureVerify),
+				realExtProcClientFactory(endpointPickerDisableTLS, endpointPickerTLSSkipVerifyFlag),
 				logger,
 			)
 			return endpointPickerServer(handler)
 		},
 	}
 
-	addEPPConnectionFlags(cmd, endpointPickerDisableTLS, endpointPickerEnableSecureVerify)
+	addEPPConnectionFlags(cmd, endpointPickerDisableTLS, endpointPickerTLSSkipVerifyFlag)
 
 	return cmd
 }
 
-func addEPPConnectionFlags(cmd *cobra.Command, disableTLS, enableSecureVerify bool) {
+func addEPPConnectionFlags(cmd *cobra.Command, disableTLS, skipSecureVerify bool) {
 	cmd.Flags().BoolVar(
 		&disableTLS,
 		endpointPickerDisableTLSFlag,
@@ -796,11 +796,11 @@ func addEPPConnectionFlags(cmd *cobra.Command, disableTLS, enableSecureVerify bo
 	)
 
 	cmd.Flags().BoolVar(
-		&enableSecureVerify,
-		endpointPickerEnableSecureVerifyFlag,
-		false,
-		"Enables server certificate verification when connecting to the EndpointPicker, if TLS is enabled. "+
-			"REQUIRED: Must be false until Gateway API Inference Extension EndpointPicker supports mounting certificates.",
+		&skipSecureVerify,
+		endpointPickerTLSSkipVerifyFlag,
+		true,
+		"Disables server certificate verification when connecting to the EndpointPicker, if TLS is enabled. "+
+			"REQUIRED: Must be true until Gateway API Inference Extension EndpointPicker supports mounting certificates.",
 	)
 }
 

cmd/gateway/commands_test.go

@@ -162,7 +162,7 @@ func TestControllerCmdFlagValidation(t *testing.T) {
 				"--nginx-one-telemetry-endpoint-port=443",
 				"--nginx-one-tls-skip-verify",
 				"--endpoint-picker-disable-tls",
-				"--endpoint-picker-enable-secure-verify",
+				"--endpoint-picker-tls-skip-verify",
 			},
 			wantErr: false,
 		},
@@ -934,15 +934,15 @@ func TestEndpointPickerFlags(t *testing.T) {
 			name: "valid flags with default values",
 			args: []string{
 				"--endpoint-picker-disable-tls=false",
-				"--endpoint-picker-enable-secure-verify=false",
+				"--endpoint-picker-tls-skip-verify=true",
 			},
 			wantErr: false,
 		},
 		{
 			name: "valid flags with changed values",
 			args: []string{
 				"--endpoint-picker-disable-tls=true",
-				"--endpoint-picker-enable-secure-verify=true",
+				"--endpoint-picker-tls-skip-verify=false",
 			},
 			wantErr: false,
 		},
@@ -956,12 +956,12 @@ func TestEndpointPickerFlags(t *testing.T) {
 				` strconv.ParseBool: parsing "not-a-bool": invalid syntax`,
 		},
 		{
-			name: "endpoint-picker-enable-secure-verify is not a bool",
+			name: "endpoint-picker-tls-skip-verify is not a bool",
 			args: []string{
-				"--endpoint-picker-enable-secure-verify=not-a-bool",
+				"--endpoint-picker-tls-skip-verify=not-a-bool",
 			},
 			wantErr: true,
-			expectedErrPrefix: `invalid argument "not-a-bool" for "--endpoint-picker-enable-secure-verify" flag:` +
+			expectedErrPrefix: `invalid argument "not-a-bool" for "--endpoint-picker-tls-skip-verify" flag:` +
 				` strconv.ParseBool: parsing "not-a-bool": invalid syntax`,
 		},
 	}

cmd/gateway/endpoint_picker.go

@@ -35,15 +35,15 @@ func endpointPickerServer(handler http.Handler) error {
 }
 
 // realExtProcClientFactory returns a factory that creates a new gRPC connection and client per request.
-func realExtProcClientFactory(disableTLS, enableSecureVerify bool) extProcClientFactory {
+func realExtProcClientFactory(disableTLS, tlsSkipVerify bool) extProcClientFactory {
 	return func(target string) (extprocv3.ExternalProcessorClient, func() error, error) {
 		var opts []grpc.DialOption
 
 		if disableTLS {
 			opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 		} else {
 			creds := credentials.NewTLS(&tls.Config{
-				InsecureSkipVerify: !enableSecureVerify, //nolint:gosec
+				InsecureSkipVerify: tlsSkipVerify, //nolint:gosec
 			})
 			opts = append(opts, grpc.WithTransportCredentials(creds))
 		}

deploy/azure/deploy.yaml

@@ -286,6 +286,7 @@ spec:
         - --metrics-port=9113
         - --health-port=8081
         - --leader-election-lock-name=nginx-gateway-leader-election
+        - --endpoint-picker-tls-skip-verify
         env:
         - name: POD_NAMESPACE
           valueFrom:

deploy/default/deploy.yaml

@@ -286,6 +286,7 @@ spec:
         - --metrics-port=9113
         - --health-port=8081
         - --leader-election-lock-name=nginx-gateway-leader-election
+        - --endpoint-picker-tls-skip-verify
         env:
         - name: POD_NAMESPACE
           valueFrom:

deploy/experimental-nginx-plus/deploy.yaml

@@ -295,6 +295,7 @@ spec:
         - --health-port=8081
         - --leader-election-lock-name=nginx-gateway-leader-election
         - --gateway-api-experimental-features
+        - --endpoint-picker-tls-skip-verify
         env:
         - name: POD_NAMESPACE
           valueFrom: