Merge remote-tracking branch 'origin/main' into k0s-1-29

laverya · laverya · commit 240907aa7978 · 2025-02-07T12:12:57.000-05:00
diff --git a/cmd/installer/cli/install.go b/cmd/installer/cli/install.go
@@ -898,10 +898,6 @@ func waitForK0s() error {
 }
 
 func recordInstallation(ctx context.Context, kcli client.Client, flags InstallCmdFlags, k0sCfg *k0sv1beta1.ClusterConfig, disasterRecoveryEnabled bool) (*ecv1beta1.Installation, error) {
-	loading := spinner.Start()
-	defer loading.Close()
-	loading.Infof("Creating types")
-
 	// ensure that the embedded-cluster namespace exists
 	if err := createECNamespace(ctx, kcli); err != nil {
 		return nil, fmt.Errorf("create embedded-cluster namespace: %w", err)
@@ -965,7 +961,6 @@ func recordInstallation(ctx context.Context, kcli client.Client, flags InstallCm
 		return nil, fmt.Errorf("set installation state to KubernetesInstalled: %w", err)
 	}
 
-	loading.Infof("Types created!")
 	return installation, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -898,10 +898,6 @@ func waitForK0s() error {`
`898`	`898`	`}`
`899`	`899`
`900`	`900`	`func recordInstallation(ctx context.Context, kcli client.Client, flags InstallCmdFlags, k0sCfg k0sv1beta1.ClusterConfig, disasterRecoveryEnabled bool) (ecv1beta1.Installation, error) {`
`901`		`- loading := spinner.Start()`
`902`		`- defer loading.Close()`
`903`		`- loading.Infof("Creating types")`
`904`		`-`
`905`	`901`	`// ensure that the embedded-cluster namespace exists`
`906`	`902`	`if err := createECNamespace(ctx, kcli); err != nil {`
`907`	`903`	`return nil, fmt.Errorf("create embedded-cluster namespace: %w", err)`
`@@ -965,7 +961,6 @@ func recordInstallation(ctx context.Context, kcli client.Client, flags InstallCm`
`965`	`961`	`return nil, fmt.Errorf("set installation state to KubernetesInstalled: %w", err)`
`966`	`962`	`}`
`967`	`963`
`968`		`- loading.Infof("Types created!")`
`969`	`964`	`return installation, nil`
`970`	`965`	`}`
`971`	`966`