[fix][plugin] add missing CLI flags for create cluster cmd (#3237)

Author: davidxia

Diff for: kubectl-plugin/pkg/cmd/create/create_cluster.go

@@ -22,6 +22,8 @@ import (
 type CreateClusterOptions struct {
 	cmdFactory             cmdutil.Factory
 	ioStreams              *genericclioptions.IOStreams
+	labels                 map[string]string
+	annotations            map[string]string
 	workerRayStartParams   map[string]string
 	headRayStartParams     map[string]string
 	headNodeSelectors      map[string]string
@@ -109,6 +111,8 @@ func NewCreateClusterCommand(cmdFactory cmdutil.Factory, streams genericclioptio
 	cmd.Flags().DurationVar(&options.timeout, "timeout", defaultProvisionedTimeout, "the timeout for --wait")
 	cmd.Flags().StringToStringVar(&options.headNodeSelectors, "head-node-selectors", nil, "Node selectors to apply to all head pods in the cluster (e.g. --head-node-selectors cloud.google.com/gke-accelerator=nvidia-l4,cloud.google.com/gke-nodepool=my-node-pool)")
 	cmd.Flags().StringToStringVar(&options.workerNodeSelectors, "worker-node-selectors", nil, "Node selectors to apply to all worker pods in the cluster (e.g. --worker-node-selectors cloud.google.com/gke-accelerator=nvidia-l4,cloud.google.com/gke-nodepool=my-node-pool)")
+	cmd.Flags().StringToStringVar(&options.labels, "labels", nil, "K8s labels (e.g. --labels app=ray,env=dev)")
+	cmd.Flags().StringToStringVar(&options.annotations, "annotations", nil, "K8s annotations (e.g. --annotations ttl-hours=24,owner=chthulu)")
 
 	return cmd
 }
@@ -168,6 +172,8 @@ func (options *CreateClusterOptions) Run(ctx context.Context, k8sClient client.C
 	rayClusterSpecObject := generation.RayClusterSpecObject{
 		Namespace:            &options.namespace,
 		Name:                 &options.clusterName,
+		Labels:               options.labels,
+		Annotations:          options.annotations,
 		RayVersion:           &options.rayVersion,
 		Image:                &options.image,
 		HeadCPU:              &options.headCPU,

Diff for: kubectl-plugin/pkg/cmd/create/create_cluster_test.go

@@ -72,6 +72,8 @@ func TestRayClusterCreateClusterRun(t *testing.T) {
 	options := CreateClusterOptions{
 		cmdFactory:   cmdFactory,
 		clusterName:  clusterName,
+		labels:       map[string]string{"app": "ray", "env": "dev"},
+		annotations:  map[string]string{"ttl-hours": "24", "owner": "chthulu"},
 		headCPU:      "1",
 		headMemory:   "1Gi",
 		headGPU:      "0",
@@ -98,3 +100,34 @@ func TestRayClusterCreateClusterRun(t *testing.T) {
 		require.Error(t, err)
 	})
 }
+
+func TestNewCreateClusterCommand(t *testing.T) {
+	testStreams, _, _, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCreateClusterCommand(cmdutil.NewFactory(genericclioptions.NewConfigFlags(true)), testStreams)
+	cmd.Flags().StringP("namespace", "n", "", "")
+
+	cmd.SetArgs([]string{
+		"sample-cluster",
+		"--ray-version", "2.44.0",
+		"--image", "rayproject/ray:2.44.0",
+		"--head-cpu", "1",
+		"--head-memory", "5Gi",
+		"--head-gpu", "1",
+		"--head-ephemeral-storage", "10Gi",
+		"--head-ray-start-params", "metrics-export-port=8080,num-cpus=2",
+		"--head-node-selectors", "app=ray,env=dev",
+		"--worker-replicas", "3",
+		"--worker-cpu", "1",
+		"--worker-memory", "5Gi",
+		"--worker-gpu", "1",
+		"--worker-ephemeral-storage", "10Gi",
+		"--worker-ray-start-params", "metrics-export-port=8081,num-cpus=2",
+		"--worker-node-selectors", "app=ray,env=dev",
+		"--labels", "app=ray,env=dev",
+		"--annotations", "ttl-hours=24,owner=chthulu",
+		"--dry-run",
+		"--wait",
+		"--timeout", "10s",
+	})
+	require.NoError(t, cmd.Execute())
+}