Merge pull request #96 from ferryproxy/fix/cloud

Fix cloud
ferryproxy · Aug 2, 2022 · f1dd1e0 · f1dd1e0
2 parents 1dc5a98 + e71293c
commit f1dd1e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pkg/ferry-controller/controller/mapping/mapping_controller.go b/pkg/ferry-controller/controller/mapping/mapping_controller.go
@@ -89,6 +89,9 @@ type MappingController struct {
 }
 
 func (d *MappingController) Start(ctx context.Context) error {
+	d.mut.Lock()
+	defer d.mut.Unlock()
+
 	d.logger.Info("DataPlane controller started")
 	defer func() {
 		d.logger.Info("DataPlane controller stopped")

diff --git a/pkg/ferryctl/kubectl/kubectl.go b/pkg/ferryctl/kubectl/kubectl.go
@@ -168,17 +168,23 @@ func (c *Kubectl) GetSecretAuthorized(ctx context.Context) (string, error) {
 }
 
 func (c *Kubectl) GetApiserverAddress(ctx context.Context) (string, error) {
-	out, err := commandRun(ctx, "kubectl", "--kubeconfig="+vars.KubeconfigPath, "get", "cm", "-n", "kube-public", "cluster-info", "-o", "jsonpath={$.data.kubeconfig}")
-	if err != nil {
-		return "", err
-	}
 	take := struct {
 		Clusters []struct {
 			Cluster struct {
 				Server string `yaml:"server"`
 			} `yaml:"cluster"`
 		} `yaml:"clusters"`
 	}{}
+
+	out, err := commandRun(ctx, "kubectl", "--kubeconfig="+vars.KubeconfigPath, "get", "cm", "-n", "kube-public", "cluster-info", "-o", "jsonpath={$.data.kubeconfig}")
+	if err != nil {
+		data, err := os.ReadFile(vars.KubeconfigPath)
+		if err != nil {
+			return "", err
+		}
+		out = data
+	}
+
 	err = yaml.Unmarshal(out, &take)
 	if err != nil {
 		return "", err