Merge pull request #3561 from ntnn/fix-create-ws

Fix create-workspace --create-context pointing at the old workspace

Author: kcp-ci-bot

cli/pkg/workspace/plugin/context.go

@@ -42,6 +42,10 @@ type CreateContextOptions struct {
 	// KeepCurrent indicates whether to keep the current context. When creating a new context, if KeepCurrent is true, the current context will be preserved.
 	KeepCurrent bool
 
+	// ClusterURL is the URL of the cluster to use for the new context.
+	// If empty, the current context's cluster will be used.
+	ClusterURL string
+
 	startingConfig *clientcmdapi.Config
 
 	// for testing
@@ -122,6 +126,9 @@ func (o *CreateContextOptions) Run(ctx context.Context) error {
 
 	newKubeConfig := o.startingConfig.DeepCopy()
 	newCluster := *currentCluster
+	if o.ClusterURL != "" {
+		newCluster.Server = o.ClusterURL
+	}
 	newKubeConfig.Clusters[o.Name] = &newCluster
 	newContext := *currentContext
 	newContext.Cluster = o.Name
@@ -137,14 +144,15 @@ func (o *CreateContextOptions) Run(ctx context.Context) error {
 		return err
 	}
 
+	verb := "Created"
 	if existedBefore {
-		if o.startingConfig.CurrentContext == o.Name {
-			_, err = fmt.Fprintf(o.Out, "Updated context %q.\n", o.Name)
-		} else {
-			_, err = fmt.Fprintf(o.Out, "Updated context %q and switched to it.\n", o.Name)
-		}
+		verb = "Updated"
+	}
+
+	if o.KeepCurrent || o.startingConfig.CurrentContext == o.Name {
+		_, err = fmt.Fprintf(o.Out, "%s context %q.\n", verb, o.Name)
 	} else {
-		_, err = fmt.Fprintf(o.Out, "Created context %q and switched to it.\n", o.Name)
+		_, err = fmt.Fprintf(o.Out, "%s context %q and switched to it.\n", verb, o.Name)
 	}
 
 	return err

cli/pkg/workspace/plugin/create.go

@@ -112,7 +112,7 @@ func (o *CreateWorkspaceOptions) BindFlags(cmd *cobra.Command) {
 	o.Options.BindFlags(cmd)
 	cmd.Flags().StringVar(&o.Type, "type", o.Type, "A workspace type. The default type depends on where this child workspace is created.")
 	cmd.Flags().BoolVar(&o.EnterAfterCreate, "enter", o.EnterAfterCreate, "Immediately enter the created workspace")
-	cmd.Flags().BoolVar(&o.IgnoreExisting, "ignore-existing", o.IgnoreExisting, "Ignore if the workspace already exists. Requires none or absolute type path.")
+	cmd.Flags().BoolVar(&o.IgnoreExisting, "ignore-existing", o.IgnoreExisting, "Ignore if the workspace already exists. Requires none or absolute type path. Overwrites the context if --create-context is set.")
 	cmd.Flags().StringVar(&o.LocationSelector, "location-selector", o.LocationSelector, "A label selector to select the scheduling location of the created workspace.")
 	cmd.Flags().StringVar(&o.CreateContextName, "create-context", o.CreateContextName, "Create a kubeconfig context for the new workspace with the given name.")
 }
@@ -239,7 +239,9 @@ func (o *CreateWorkspaceOptions) Run(ctx context.Context) error {
 	if o.CreateContextName != "" {
 		createContextOptions := NewCreateContextOptions(o.IOStreams)
 		createContextOptions.Name = o.CreateContextName
+		createContextOptions.ClusterURL = ws.Spec.URL
 		createContextOptions.ClientConfig = o.ClientConfig
+		createContextOptions.Overwrite = o.IgnoreExisting
 
 		// If --enter is set, switch to the new context
 		createContextOptions.KeepCurrent = !o.EnterAfterCreate
@@ -266,13 +268,6 @@ func (o *CreateWorkspaceOptions) Run(ctx context.Context) error {
 			return fmt.Errorf("failed to create context: %w", err)
 		}
 
-		// Print output
-		if o.EnterAfterCreate {
-			fmt.Fprintf(o.Out, "Created context %q and switched to it.\n", o.CreateContextName)
-		} else {
-			fmt.Fprintf(o.Out, "Created context %q.\n", o.CreateContextName)
-		}
-
 		return nil
 	}
 

cli/pkg/workspace/plugin/create_test.go

@@ -210,11 +210,12 @@ func TestCreate(t *testing.T) {
 				},
 				Clusters: map[string]*clientcmdapi.Cluster{
 					"test": {Server: "https://test/clusters/root:foo"},
-					"bar":  {Server: "https://test/clusters/root:foo"},
+					"bar":  {Server: "https://test/clusters/root:foo:bar"},
 				},
 				AuthInfos: map[string]*clientcmdapi.AuthInfo{"test": {Token: "test"}},
 			},
 			existingWorkspaces: []string{"test"},
+			newWorkspaceName:   "bar",
 			createContextName:  "bar",
 			useAfterCreation:   false,
 			markReady:          true,
@@ -239,11 +240,12 @@ func TestCreate(t *testing.T) {
 				},
 				Clusters: map[string]*clientcmdapi.Cluster{
 					"test": {Server: "https://test/clusters/root:foo"},
-					"bar":  {Server: "https://test/clusters/root:foo"},
+					"bar":  {Server: "https://test/clusters/root:foo:bar"},
 				},
 				AuthInfos: map[string]*clientcmdapi.AuthInfo{"test": {Token: "test"}},
 			},
 			existingWorkspaces: []string{"test"},
+			newWorkspaceName:   "bar",
 			createContextName:  "bar",
 			useAfterCreation:   true,
 			markReady:          true,