KUBESAW-172: Restart host-operator at the end of the register-member command

pkg/cmd/adm/register_member.go

@@ -23,6 +23,7 @@
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@@ -72,7 +73,7 @@
 		RunE: func(cmd *cobra.Command, args []string) error {
 			term := ioutils.NewTerminal(cmd.InOrStdin, cmd.OutOrStdout)
 			ctx := newExtendedCommandContext(term, client.DefaultNewClientFromRestConfig)
-			return registerMemberCluster(ctx, commandArgs)
+			return registerMemberCluster(ctx, commandArgs, restart)
 		},
 	}
 
@@ -94,8 +95,8 @@
 	return cmd
 }
 
-func registerMemberCluster(ctx *extendedCommandContext, args registerMemberArgs) error {
-	validated, err := validateArgs(ctx, args)
+func registerMemberCluster(ctx *extendedCommandContext, args registerMemberArgs, restart restartFunc) error {
+	validated, err := validateArgs(ctx, args, restart)
 	if err != nil {
 		return err
 	}
@@ -351,6 +352,7 @@
 	memberClusterData clusterData
 	warnings          []string
 	errors            []string
+	restartFunc       func(ctx *clicontext.CommandContext, clusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error
 }
 
 func getApiEndpointAndClient(ctx *extendedCommandContext, kubeConfigPath string) (apiEndpoint string, cl runtimeclient.Client, err error) {
@@ -374,7 +376,7 @@
 	return
 }
 
-func validateArgs(ctx *extendedCommandContext, args registerMemberArgs) (*registerMemberValidated, error) {
+func validateArgs(ctx *extendedCommandContext, args registerMemberArgs, restart restartFunc) (*registerMemberValidated, error) {
 	hostApiEndpoint, hostClusterClient, err := getApiEndpointAndClient(ctx, args.hostKubeConfig)
 	if err != nil {
 		return nil, err
@@ -442,8 +444,9 @@
 			toolchainClusterName: memberToolchainClusterName,
 			kubeConfig:           args.memberKubeConfig,
 		},
-		warnings: warnings,
-		errors:   errors,
+		warnings:    warnings,
+		errors:      errors,
+		restartFunc: restart,
 	}, nil
 }
 
@@ -483,6 +486,11 @@
 		return err
 	}
 
+	// restart Host Operator using the adm-restart command
+	if err := v.restartFunc(ctx.CommandContext, "host", v.getRegMemConfigFlagsAndClient); err != nil {
+		return err
+	}
+
 	exampleSPC := &toolchainv1alpha1.SpaceProvisionerConfig{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "SpaceProvisionerConfig",
@@ -509,6 +517,20 @@
 `, v.hostClusterData.apiEndpoint))
 }
 
+func (v *registerMemberValidated) getRegMemConfigFlagsAndClient(ctx *clicontext.CommandContext, clusterName string) (kubeConfigFlag *genericclioptions.ConfigFlags, rccl runtimeclient.Client, err error) {
+	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
+
+	kubeConfigFlags.ClusterName = nil  // `cluster` flag is redefined for our own purpose
+	kubeConfigFlags.AuthInfoName = nil // unused here, so we can hide it
+	kubeConfigFlags.Context = nil      // unused here, so we can hide it
+
+	kubeConfigFlags.Namespace = &v.hostClusterData.namespace
+	kubeConfigFlags.APIServer = &v.hostClusterData.apiEndpoint
+	kubeConfigFlags.KubeConfig = &v.hostClusterData.kubeConfig
+
+	return kubeConfigFlags, v.hostClusterData.client, nil
+}
+
 func findToolchainClusterForMember(allToolchainClusters []toolchainv1alpha1.ToolchainCluster, memberAPIEndpoint, memberOperatorNamespace string) *toolchainv1alpha1.ToolchainCluster {
 	for _, tc := range allToolchainClusters {
 		if tc.Status.APIEndpoint == memberAPIEndpoint && tc.Status.OperatorNamespace == memberOperatorNamespace {

pkg/cmd/adm/register_member_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/codeready-toolchain/toolchain-common/pkg/test"
 	"github.com/ghodss/yaml"
 	"github.com/kubesaw/ksctl/pkg/configuration"
+	clicontext "github.com/kubesaw/ksctl/pkg/context"
 	. "github.com/kubesaw/ksctl/pkg/test"
 	"github.com/kubesaw/ksctl/pkg/utils"
 	"github.com/stretchr/testify/assert"
@@ -82,7 +83,9 @@ func TestRegisterMember(t *testing.T) {
 		}
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.NoError(t, err)
@@ -115,7 +118,9 @@ func TestRegisterMember(t *testing.T) {
 		ctx := newExtendedCommandContext(term, newClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -135,7 +140,9 @@ func TestRegisterMember(t *testing.T) {
 		ctx := newExtendedCommandContext(term, newClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -155,7 +162,9 @@ func TestRegisterMember(t *testing.T) {
 		ctx := newExtendedCommandContext(term, newClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.NoError(t, err)
@@ -171,7 +180,9 @@ func TestRegisterMember(t *testing.T) {
 		ctx := newExtendedCommandContext(term, newClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, true))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, true), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.NoError(t, err)
@@ -206,7 +217,9 @@ func TestRegisterMember(t *testing.T) {
 		mockCreateToolchainClusterWithReadyCondition(t, fakeClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWithSuffix(hostKubeconfig, memberKubeconfig, false, "2"))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWithSuffix(hostKubeconfig, memberKubeconfig, false, "2"), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.NoError(t, err)
@@ -227,8 +240,12 @@ func TestRegisterMember(t *testing.T) {
 		ctx2 := newExtendedCommandContext(term2, newClient)
 
 		// when
-		err1 := registerMemberCluster(ctx1, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
-		err2 := registerMemberCluster(ctx2, newRegisterMemberArgsWithSuffix(hostKubeconfig, memberKubeconfig, false, "1"))
+		err1 := registerMemberCluster(ctx1, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
+		err2 := registerMemberCluster(ctx2, newRegisterMemberArgsWithSuffix(hostKubeconfig, memberKubeconfig, false, "1"), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.NoError(t, err1)
@@ -250,8 +267,12 @@ func TestRegisterMember(t *testing.T) {
 		ctx2 := newExtendedCommandContext(term2, newClient)
 
 		// when
-		err1 := registerMemberCluster(ctx1, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
-		err2 := registerMemberCluster(ctx2, newRegisterMemberArgsWithSuffix(hostKubeconfig, memberKubeconfig, false, ""))
+		err1 := registerMemberCluster(ctx1, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
+		err2 := registerMemberCluster(ctx2, newRegisterMemberArgsWithSuffix(hostKubeconfig, memberKubeconfig, false, ""), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.NoError(t, err1)
@@ -305,7 +326,9 @@ func TestRegisterMember(t *testing.T) {
 		require.NoError(t, fakeClient.Create(context.TODO(), preexistingToolchainCluster2.DeepCopy()))
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -337,7 +360,9 @@ func TestRegisterMember(t *testing.T) {
 		require.NoError(t, fakeClient.Create(context.TODO(), preexistingToolchainCluster.DeepCopy()))
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -369,7 +394,9 @@ func TestRegisterMember(t *testing.T) {
 		require.NoError(t, fakeClient.Create(context.TODO(), preexistingToolchainCluster.DeepCopy()))
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -402,7 +429,9 @@ func TestRegisterMember(t *testing.T) {
 		require.NoError(t, fakeClient.Create(context.TODO(), preexistingToolchainCluster.DeepCopy()))
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -419,7 +448,9 @@ func TestRegisterMember(t *testing.T) {
 		ctx := newExtendedCommandContext(term, newClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -438,7 +469,9 @@ func TestRegisterMember(t *testing.T) {
 		ctx := newExtendedCommandContext(term, newClient)
 
 		// when
-		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false))
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return nil
+		})
 
 		// then
 		require.Error(t, err)
@@ -449,6 +482,23 @@ func TestRegisterMember(t *testing.T) {
 		require.NoError(t, fakeClient.List(context.TODO(), tcs, runtimeclient.InNamespace(test.MemberOperatorNs)))
 		assert.Empty(t, tcs.Items)
 	})
+
+	t.Run("reports error when host-operator is not restarted", func(t *testing.T) {
+		// given
+		term := NewFakeTerminalWithResponse("Y")
+		newClient, fakeClient := newFakeClientsFromRestConfig(t, &toolchainClusterMemberSa, &toolchainClusterHostSa)
+		mockCreateToolchainClusterWithReadyCondition(t, fakeClient)
+		ctx := newExtendedCommandContext(term, newClient)
+
+		// when
+		err := registerMemberCluster(ctx, newRegisterMemberArgsWith(hostKubeconfig, memberKubeconfig, false), func(ctx *clicontext.CommandContext, restartClusterName string, cfcGetter ConfigFlagsAndClientGetterFunc) error {
+			return fmt.Errorf("restart did not happen")
+		})
+
+		// then
+		require.EqualError(t, err, "restart did not happen")
+	})
+
 }
 
 func mockCreateToolchainClusterInNamespaceWithReadyCondition(t *testing.T, fakeClient *test.FakeClient, namespace string) {

pkg/cmd/adm/restart.go

@@ -21,8 +21,9 @@
 )
 
 type (
-	RolloutRestartFunc       func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error
-	RolloutStatusCheckerFunc func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error
+	RolloutRestartFunc             func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error
+	RolloutStatusCheckerFunc       func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error
+	ConfigFlagsAndClientGetterFunc func(ctx *clicontext.CommandContext, clusterName string) (kubeConfigFlag *genericclioptions.ConfigFlags, rccl runtimeclient.Client, err error)
 )
 
 // NewRestartCmd() is a function to restart the whole operator, it relies on the target cluster and fetches the cluster config
@@ -45,52 +46,62 @@
 		RunE: func(cmd *cobra.Command, args []string) error {
 			term := ioutils.NewTerminal(cmd.InOrStdin, cmd.OutOrStdout)
 			ctx := clicontext.NewCommandContext(term, client.DefaultNewClient)
-			return restart(ctx, args[0])
+			return restart(ctx, args[0], getConfigFlagsAndClient)
 		},
 	}
 	return command
 }
 
-func restart(ctx *clicontext.CommandContext, clusterName string) error {
-	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
+func restart(ctx *clicontext.CommandContext, clusterName string, configFlagsClientGetter ConfigFlagsAndClientGetterFunc) error {
 	ioStreams := genericiooptions.IOStreams{
 		In:     os.Stdin,
 		Out:    os.Stdout,
 		ErrOut: os.Stderr,
 	}
+
+	kubeConfigFlags, cl, err := configFlagsClientGetter(ctx, clusterName)
+	if err != nil {
+		return err
+	}
+	factory := cmdutil.NewFactory(cmdutil.NewMatchVersionFlags(kubeConfigFlags))
+
+	if !ctx.AskForConfirmation(
+		ioutils.WithMessagef("restart all the deployments in the cluster  '%s' and namespace '%s' \n", clusterName, *kubeConfigFlags.Namespace)) {
+		return nil
+	}
+
+	return restartDeployments(ctx, cl, *kubeConfigFlags.Namespace, func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error {
+		return checkRolloutStatus(ctx, factory, ioStreams, deployment)
+	}, func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error {
+		return restartNonOlmDeployments(ctx, deployment, factory, ioStreams)
+	})
+}
+
+func getConfigFlagsAndClient(ctx *clicontext.CommandContext, clusterName string) (kubeConfigFlag *genericclioptions.ConfigFlags, rccl runtimeclient.Client, err error) {
+	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
+
 	kubeConfigFlags.ClusterName = nil  // `cluster` flag is redefined for our own purpose
 	kubeConfigFlags.AuthInfoName = nil // unused here, so we can hide it
 	kubeConfigFlags.Context = nil      // unused here, so we can hide it
 
 	cfg, err := configuration.LoadClusterConfig(ctx, clusterName)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 	kubeConfigFlags.Namespace = &cfg.OperatorNamespace
 	kubeConfigFlags.APIServer = &cfg.ServerAPI
 	kubeConfigFlags.BearerToken = &cfg.Token
 	kubeconfig, err := client.EnsureKsctlConfigFile()
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 	kubeConfigFlags.KubeConfig = &kubeconfig
-	factory := cmdutil.NewFactory(cmdutil.NewMatchVersionFlags(kubeConfigFlags))
-
-	if !ctx.AskForConfirmation(
-		ioutils.WithMessagef("restart all the deployments in the cluster  '%s' and namespace '%s' \n", clusterName, cfg.OperatorNamespace)) {
-		return nil
-	}
 
 	cl, err := ctx.NewClient(cfg.Token, cfg.ServerAPI)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
-
-	return restartDeployments(ctx, cl, cfg.OperatorNamespace, func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error {
-		return checkRolloutStatus(ctx, factory, ioStreams, deployment)
-	}, func(ctx *clicontext.CommandContext, deployment appsv1.Deployment) error {
-		return restartNonOlmDeployments(ctx, deployment, factory, ioStreams)
-	})
+	return kubeConfigFlags, cl, nil
 }
 
 // This function has the whole logic of getting the list of olm and non-olm based deployment, then proceed on restarting/deleting accordingly

pkg/cmd/adm/restart_test.go

@@ -331,7 +331,7 @@ func TestRestart(t *testing.T) {
 		newClient, _ := NewFakeClients(t)
 		ctx := clicontext.NewCommandContext(term, newClient)
 		//when
-		err := restart(ctx, "host")
+		err := restart(ctx, "host", getConfigFlagsAndClient)
 
 		//then
 		require.NoError(t, err)