Update makefile & update kubeconfig accessing

shadow/Makefile

@@ -20,7 +20,7 @@ TARGET = ${MKFILE_DIR}/bin/easemesh-shadowservice-controller
 build: vet ${TARGET}
 ${TARGET}: ${ALL_FILES}
 	@cd ${MKFILE_DIR} && \
-	go build ${GO_BUILD_FLAGS}\
+	CGO_ENABLED=0 go build ${GO_BUILD_FLAGS}\
   	-o ${TARGET} ${MKFILE_DIR}/cmd/main
 
 

shadow/cmd/main/ss_controller.go

@@ -15,54 +15,35 @@
  * limitations under the License.
  */
 
-
 package main
 
 import (
 	"flag"
 	"log"
 	"time"
 
-	"github.com/megaease/easemesh/mesh-shadow/pkg/common"
 	"github.com/megaease/easemesh/mesh-shadow/pkg/controller"
-	"github.com/megaease/easemeshctl/cmd/client/command/rcfile"
-
 	// load all auth plugins
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 
+const (
+	DefaultMeshServer = "easemesh-controlplane-svc.easemesh:2381"
+)
+
 var (
-	meshServer = flag.String("mesh-server", "", "An address to access the EaseMesh control plane")
+	meshServer = flag.String("mesh-server", DefaultMeshServer, "An address to access the EaseMesh control plane")
 )
 
 func easemeshOption(config *controller.Config) error {
 	config.MeshServer = *meshServer
-	if config.MeshServer == "" {
-		config.MeshServer = GetServerAddress()
-	}
 	config.RequestTimeout = 10 * time.Second
 	config.PullInterval = 1 * time.Minute
 	return nil
 }
 
-func GetServerAddress() string {
-	rc, err := rcfile.New()
-	if err != nil {
-		return ""
-	}
-
-	err = rc.Unmarshal()
-	if err != nil {
-		common.OutputErrorf("unmarshal rcfile failed: %v", err)
-		return ""
-	}
-	return rc.Server
-}
-
 func main() {
-
 	flag.Parse()
-
 	controller, err := controller.NewShadowServiceController(easemeshOption)
 	if err != nil {
 		log.Fatalf("new collector service error: %s", err)

shadow/pkg/utils/k8sutils.go

@@ -19,7 +19,6 @@ package utils
 
 import (
 	"context"
-	"path"
 
 	"github.com/megaease/easemesh/mesh-shadow/pkg/object/v1beta1"
 	appsV1 "k8s.io/api/apps/v1"
@@ -31,29 +30,17 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/util/homedir"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-)
-
-const (
-	DefaultKubeDir          = ".kube"
-	DefaultKubernetesConfig = "config"
-)
-
-var (
-	DefaultKubernetesConfigDir  = path.Join(homedir.HomeDir(), DefaultKubeDir)
-	DefaultKubernetesConfigPath = path.Join(DefaultKubernetesConfigDir, DefaultKubernetesConfig)
 )
 
 func NewKubernetesClient() (*kubernetes.Clientset, error) {
-	kubeConfig, err := clientcmd.BuildConfigFromFlags("", DefaultKubernetesConfigPath)
+	kubeConfig, err := ctrl.GetConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -66,7 +53,7 @@ func NewKubernetesClient() (*kubernetes.Clientset, error) {
 }
 
 func NewKubernetesAPIExtensionsClient() (*apiextensions.Clientset, error) {
-	kubeConfig, err := clientcmd.BuildConfigFromFlags("", DefaultKubernetesConfigPath)
+	kubeConfig, err := ctrl.GetConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -91,8 +78,7 @@ func NewRuntimeClient() (client.Client, error) {
 }
 
 func NewCRDRestClient() (*rest.RESTClient, error) {
-
-	k8sConfig, err := clientcmd.BuildConfigFromFlags("", DefaultKubernetesConfigPath)
+	kubeConfig, err := ctrl.GetConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -101,7 +87,7 @@ func NewCRDRestClient() (*rest.RESTClient, error) {
 		return nil, err
 	}
 
-	crdConfig := *k8sConfig
+	crdConfig := *kubeConfig
 	crdConfig.ContentConfig.GroupVersion = &schema.GroupVersion{Group: v1beta1.GroupVersion.Group, Version: v1beta1.GroupVersion.Version}
 	crdConfig.APIPath = "/apis"
 	crdConfig.NegotiatedSerializer = serializer.NewCodecFactory(scheme.Scheme)

shadow/rootfs/Dockerfile

@@ -3,7 +3,7 @@ FROM alpine:3.13
 WORKDIR /opt/easemesh-shadowservice
 
 ADD easemesh-shadowservice-controller /opt/easemesh-shadowservice/bin/
-COPY entrypoint.sh /
+COPY rootfs/entrypoint.sh /
 
 RUN apk --no-cache add tini tzdata && \
         chmod +x /entrypoint.sh /opt/easemesh-shadowservice/bin/*