support --configfile for kubenest

Signed-off-by: duanmengkk <[email protected]>
kosmos-io · Jul 2, 2024 · f628306 · f628306
1 parent 2af26a6
commit f628306
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/cmd/kubenest/operator/app/operator.go b/cmd/kubenest/operator/app/operator.go
@@ -61,7 +61,7 @@ func NewVirtualClusterOperatorCommand(ctx context.Context) *cobra.Command {
 }
 
 func runCommand(ctx context.Context, opts *options.Options) error {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	kc, err := SetupConfig(opts)
@@ -74,7 +74,7 @@ func runCommand(ctx context.Context, opts *options.Options) error {
 func SetupConfig(opts *options.Options) (*config.Config, error) {
 	c := &config.Config{}
 
-	koc := v1alpha1.KubeNestConfiguration{}
+	var koc v1alpha1.KubeNestConfiguration
 	if len(opts.ConfigFile) != 0 {
 		ko, err := loadConfig(opts.ConfigFile)
 		if err != nil {

diff --git a/pkg/kubenest/controller/kosmos/kosmos_join_controller.go b/pkg/kubenest/controller/kosmos/kosmos_join_controller.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	restclient "k8s.io/client-go/rest"
 	"os"
 	"reflect"
 	"sync"
@@ -15,6 +14,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
+	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"

diff --git a/pkg/kubenest/controlplane/etcd.go b/pkg/kubenest/controlplane/etcd.go
@@ -73,21 +73,21 @@ func installEtcd(client clientset.Interface, name, namespace string, kubeNestCon
 		ETCDStorageClass, ETCDStorageSize                                                                      string
 		IPV6First                                                                                              bool
 	}{
-		StatefulSetName:      fmt.Sprintf("%s-%s", name, "etcd"),
-		Namespace:            namespace,
-		ImageRepository:      imageRepository,
-		Version:              imageVersion,
-		EtcdClientService:    fmt.Sprintf("%s-%s", name, "etcd-client"),
-		CertsSecretName:      fmt.Sprintf("%s-%s", name, "etcd-cert"),
-		EtcdPeerServiceName:  fmt.Sprintf("%s-%s", name, "etcd"),
-		EtcdDataVolumeName:   constants.EtcdDataVolumeName,
-		InitialCluster:       strings.Join(initialClusters, ","),
-		EtcdCipherSuites:     strings.Join(flag.PreferredTLSCipherNames(), ","),
-		Replicas:             constants.EtcdReplicas,
-		EtcdListenClientPort: constants.EtcdListenClientPort,
-		EtcdListenPeerPort:   constants.EtcdListenPeerPort,
-		ETCDStorageClass:     kubeNestConfiguration.KubeInKubeConfig.ETCDStorageClass,
-		ETCDStorageSize:      resourceQuantity.String(),
+		StatefulSetName:        fmt.Sprintf("%s-%s", name, "etcd"),
+		Namespace:              namespace,
+		ImageRepository:        imageRepository,
+		Version:                imageVersion,
+		EtcdClientService:      fmt.Sprintf("%s-%s", name, "etcd-client"),
+		CertsSecretName:        fmt.Sprintf("%s-%s", name, "etcd-cert"),
+		EtcdPeerServiceName:    fmt.Sprintf("%s-%s", name, "etcd"),
+		EtcdDataVolumeName:     constants.EtcdDataVolumeName,
+		InitialCluster:         strings.Join(initialClusters, ","),
+		EtcdCipherSuites:       strings.Join(flag.PreferredTLSCipherNames(), ","),
+		Replicas:               constants.EtcdReplicas,
+		EtcdListenClientPort:   constants.EtcdListenClientPort,
+		EtcdListenPeerPort:     constants.EtcdListenPeerPort,
+		ETCDStorageClass:       kubeNestConfiguration.KubeInKubeConfig.ETCDStorageClass,
+		ETCDStorageSize:        resourceQuantity.String(),
 		VirtualControllerLabel: vclabel,
 		IPV6First:              IPV6FirstFlag,
 	})