fix: install join nil point

Signed-off-by: renxiangyu <[email protected]>
kosmos-io · Nov 24, 2023 · c920ce5 · c920ce5
1 parent 2aa0100
commit c920ce5
Showing 1 changed file with 41 additions and 38 deletions.
diff --git a/pkg/kosmosctl/install/install.go b/pkg/kosmosctl/install/install.go
@@ -565,20 +565,21 @@ func (o *CommandInstallOptions) createControlCluster() error {
 			if apierrors.IsNotFound(err) {
 				clusterArgs := []string{"cluster"}
 				joinOptions := join.CommandJoinOptions{
-					Name:             utils.DefaultClusterName,
-					Namespace:        o.Namespace,
-					ImageRegistry:    o.ImageRegistry,
-					KubeConfigStream: o.HostKubeConfigStream,
-					WaitTime:         o.WaitTime,
-					KosmosClient:     o.KosmosClient,
-					K8sClient:        o.K8sClient,
-					RootFlag:         true,
-					EnableLink:       true,
-					CNI:              o.CNI,
-					DefaultNICName:   o.DefaultNICName,
-					NetworkType:      o.NetworkType,
-					IpFamily:         o.IpFamily,
-					UseProxy:         o.UseProxy,
+					Name:                utils.DefaultClusterName,
+					Namespace:           o.Namespace,
+					ImageRegistry:       o.ImageRegistry,
+					KubeConfigStream:    o.HostKubeConfigStream,
+					WaitTime:            o.WaitTime,
+					KosmosClient:        o.KosmosClient,
+					K8sClient:           o.K8sClient,
+					K8sExtensionsClient: o.K8sExtensionsClient,
+					RootFlag:            true,
+					EnableLink:          true,
+					CNI:                 o.CNI,
+					DefaultNICName:      o.DefaultNICName,
+					NetworkType:         o.NetworkType,
+					IpFamily:            o.IpFamily,
+					UseProxy:            o.UseProxy,
 				}
 
 				err = joinOptions.Run(clusterArgs)
@@ -621,15 +622,16 @@ func (o *CommandInstallOptions) createControlCluster() error {
 			if apierrors.IsNotFound(err) {
 				clusterArgs := []string{"cluster"}
 				joinOptions := join.CommandJoinOptions{
-					Name:             utils.DefaultClusterName,
-					Namespace:        o.Namespace,
-					ImageRegistry:    o.ImageRegistry,
-					KubeConfigStream: o.HostKubeConfigStream,
-					WaitTime:         o.WaitTime,
-					KosmosClient:     o.KosmosClient,
-					K8sClient:        o.K8sClient,
-					RootFlag:         true,
-					EnableTree:       true,
+					Name:                utils.DefaultClusterName,
+					Namespace:           o.Namespace,
+					ImageRegistry:       o.ImageRegistry,
+					KubeConfigStream:    o.HostKubeConfigStream,
+					K8sExtensionsClient: o.K8sExtensionsClient,
+					WaitTime:            o.WaitTime,
+					KosmosClient:        o.KosmosClient,
+					K8sClient:           o.K8sClient,
+					RootFlag:            true,
+					EnableTree:          true,
 				}
 
 				err = joinOptions.Run(clusterArgs)
@@ -657,21 +659,22 @@ func (o *CommandInstallOptions) createControlCluster() error {
 			if apierrors.IsNotFound(err) {
 				clusterArgs := []string{"cluster"}
 				joinOptions := join.CommandJoinOptions{
-					Name:             utils.DefaultClusterName,
-					Namespace:        o.Namespace,
-					ImageRegistry:    o.ImageRegistry,
-					KubeConfigStream: o.HostKubeConfigStream,
-					WaitTime:         o.WaitTime,
-					KosmosClient:     o.KosmosClient,
-					K8sClient:        o.K8sClient,
-					RootFlag:         true,
-					EnableLink:       true,
-					CNI:              o.CNI,
-					DefaultNICName:   o.DefaultNICName,
-					NetworkType:      o.NetworkType,
-					IpFamily:         o.IpFamily,
-					UseProxy:         o.UseProxy,
-					EnableTree:       true,
+					Name:                utils.DefaultClusterName,
+					Namespace:           o.Namespace,
+					ImageRegistry:       o.ImageRegistry,
+					KubeConfigStream:    o.HostKubeConfigStream,
+					K8sExtensionsClient: o.K8sExtensionsClient,
+					WaitTime:            o.WaitTime,
+					KosmosClient:        o.KosmosClient,
+					K8sClient:           o.K8sClient,
+					RootFlag:            true,
+					EnableLink:          true,
+					CNI:                 o.CNI,
+					DefaultNICName:      o.DefaultNICName,
+					NetworkType:         o.NetworkType,
+					IpFamily:            o.IpFamily,
+					UseProxy:            o.UseProxy,
+					EnableTree:          true,
 				}
 
 				err = joinOptions.Run(clusterArgs)