Support multiple commands in gateway binary

cmd/gateway/commands.go

@@ -83,13 +83,13 @@ func createRootCommand() *cobra.Command {
 	return rootCmd
 }
 
-func createControlPlaneCommand() *cobra.Command {
+func createStaticModeCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:   "control-plane",
-		Short: "Start the control plane",
+		Use:   "static-mode",
+		Short: "Configure NGINX in the scope of a single Gateway resource",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			logger := zap.New()
-			logger.Info("Starting NGINX Kubernetes Gateway Control Plane",
+			logger.Info("Starting NGINX Kubernetes Gateway in static mode",
 				"version", version,
 				"commit", commit,
 				"date", date,
@@ -116,10 +116,10 @@ func createControlPlaneCommand() *cobra.Command {
 	}
 }
 
-func createProvisionerCommand() *cobra.Command {
+func createProvisionerModeCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:    "provisioner",
-		Short:  "Start the provisioner",
+		Use:    "provisioner-mode",
+		Short:  "Provision an NGINX Gateway Deployment per Gateway resource configured in the static mode",
 		Hidden: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			logger := zap.New()

cmd/gateway/commands_test.go

@@ -31,7 +31,7 @@ func TestRootCmdFlagValidation(t *testing.T) {
 			expectedErrPrefix: `required flag(s) "gateway-ctlr-name" not set`,
 		},
 		{
-			name: "gateway-ctrl-name is set to empty string",
+			name: "gateway-ctlr-name is set to empty string",
 			args: []string{
 				"--gateway-ctlr-name=",
 				"--gatewayclass=nginx",

cmd/gateway/main.go

@@ -15,9 +15,10 @@ var (
 func main() {
 	rootCmd := createRootCommand()
 
-	rootCmd.AddCommand(createControlPlaneCommand())
-	p := createProvisionerCommand()
-	rootCmd.AddCommand(p)
+	rootCmd.AddCommand(
+		createStaticModeCommand(),
+		createProvisionerModeCommand(),
+	)
 
 	if err := rootCmd.Execute(); err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, err)

cmd/gateway/validation.go

@@ -12,7 +12,7 @@ import (
 
 const (
 	// nolint:lll
-	// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.6.2/apis/v1beta1/shared_types.go#L495
+	// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.7.0/apis/v1beta1/shared_types.go#L495
 	controllerNameRegex = `^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$` //nolint:lll
 )
 

deploy/manifests/nginx-gateway.yaml

@@ -119,7 +119,7 @@ spec:
             fieldRef:
               fieldPath: status.podIP
         args:
-        - control-plane
+        - static-mode
         - --gateway-ctlr-name=k8s-gateway.nginx.org/nginx-gateway-controller
         - --gatewayclass=nginx
       - image: nginx:1.23

docs/cli-help.md

@@ -2,14 +2,18 @@
 
 This document describes the commands available in the `gateway` binary of `nginx-kubernetes-gateway` container.
 
-## Control Plane 
+## Static Mode
 
-This command starts the control plane.
+This command configures NGINX in the scope of a single Gateway resource. In case of multiple Gateway resources created
+in the cluster, NGINX Kubernetes Gateway will use a deterministic conflict resolution strategy: it will choose the
+oldest resource by creation timestamp. If the timestamps are equal, NGINX Kubernetes Gateway will choose the resource
+that appears first in alphabetical order by “{namespace}/{name}”. We might support multiple Gateway resources. Please
+share your use case with us if you're interested in that support.
 
 Usage:
 
 ```
-  gateway control-plane [flags]
+  gateway static-mode [flags]
 ```
 
 Flags:

docs/gateway-api-compatibility.md

@@ -35,7 +35,7 @@ For a description of each field, visit the [Gateway API documentation](https://g
 > Status: Partially supported. 
 
 NGINX Kubernetes Gateway supports only a single GatewayClass resource configured via `--gatewayclass` flag
-of the [control-plane](./cli-help.md#control-plane) command.
+of the [static-mode](./cli-help.md#static-mode) command.
 
 Fields:
 * `spec`
@@ -49,7 +49,9 @@ Fields:
 
 > Status: Partially supported.
 
-NGINX Kubernetes Gateway supports only a single Gateway resource. The Gateway resource must reference NGINX Kubernetes Gateway's corresponding GatewayClass. In case of multiple Gateway resources created in the cluster, NGINX Kubernetes Gateway will use a deterministic conflict resolution strategy: it will choose the oldest resource by creation timestamp. If the timestamps are equal, NGINX Kubernetes Gateway will choose the resource that appears first in alphabetical order by “{namespace}/{name}”. We might support multiple Gateway resources. Please share your use case with us if you're interested in that support.
+NGINX Kubernetes Gateway supports only a single Gateway resource. The Gateway resource must reference NGINX Kubernetes Gateway's corresponding GatewayClass.
+In case of multiple Gateway resources created in the cluster, NGINX Kubernetes Gateway will use a deterministic conflict resolution strategy.
+See [static-mode](./cli-help.md#static-mode) command for more info.
 
 Fields:
 * `spec`