Rename kubeConfig -> kubeConfigFile (#171)

config-syncer · Jan 5, 2018 · 81ed0ac · 81ed0ac
1 parent aab58c7
commit 81ed0ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -28,7 +28,7 @@ type ClusterConfig struct {
 	NotifierSecretName string              `json:"notifierSecretName,omitempty"`
 	Janitors           []JanitorSpec       `json:"janitors,omitempty"`
 	APIServer          APIServerSpec       `json:"apiServer,omitempty"`
-	KubeConfig         string              `json:"kubeConfig,omitempty"`
+	KubeConfigFile     string              `json:"kubeConfigFile,omitempty"`
 }
 
 type APIServerSpec struct {

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -131,23 +131,23 @@ func (op *Operator) Setup() error {
 		}
 
 		// Parse external kubeconfig file, assume that it doesn't include source cluster
-		if op.Config.KubeConfig != "" {
-			kConfig, err := clientcmd.LoadFromFile(op.Config.KubeConfig)
+		if op.Config.KubeConfigFile != "" {
+			kConfig, err := clientcmd.LoadFromFile(op.Config.KubeConfigFile)
 			if err != nil {
 				return fmt.Errorf("failed to parse context list. Reason: %v", err)
 			}
 
 			for contextName := range kConfig.Contexts {
 				ctx := syncer.ClusterContext{}
 
-				cfg, err := clientcmd_util.BuildConfigFromContext(op.Config.KubeConfig, contextName)
+				cfg, err := clientcmd_util.BuildConfigFromContext(op.Config.KubeConfigFile, contextName)
 				if err != nil {
 					continue
 				}
 				if ctx.Client, err = kubernetes.NewForConfig(cfg); err != nil {
 					continue
 				}
-				if ctx.Namespace, err = clientcmd_util.NamespaceFromContext(op.Config.KubeConfig, contextName); err != nil {
+				if ctx.Namespace, err = clientcmd_util.NamespaceFromContext(op.Config.KubeConfigFile, contextName); err != nil {
 					continue
 				}