Merge pull request #119 from layer5io/feature/annotation

changes for annotation injection

Author: leecalcote

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/sirupsen/logrus v1.7.0
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	google.golang.org/grpc v1.32.0
+	k8s.io/api v0.17.4
 	k8s.io/apiextensions-apiserver v0.17.4
 	k8s.io/apimachinery v0.17.4
 	k8s.io/client-go v0.17.4

go.sum

@@ -447,6 +447,8 @@ k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0
 k8s.io/apiserver v0.17.4/go.mod h1:5ZDQ6Xr5MNBxyi3iUZXS84QOhZl+W7Oq2us/29c0j9I=
 k8s.io/client-go v0.17.4 h1:VVdVbpTY70jiNHS1eiFkUt7ZIJX3txd29nDxxXH4en8=
 k8s.io/client-go v0.17.4/go.mod h1:ouF6o5pz3is8qU0/qYL2RnoxOPqgfuidYLowytyLJmc=
+k8s.io/client-go v1.5.1 h1:XaX/lo2/u3/pmFau8HN+sB5C/b4dc4Dmm2eXjBH4p1E=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
 k8s.io/code-generator v0.17.4/go.mod h1:l8BLVwASXQZTo2xamW5mQNFCe1XPiAesVq7Y1t7PiQQ=
 k8s.io/component-base v0.17.4/go.mod h1:5BRqHMbbQPm2kKu35v3G+CpVq4K0RJKC7TRioF0I9lE=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

linkerd/install.go

@@ -31,6 +31,8 @@ import (
 	"github.com/layer5io/meshery-linkerd/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -64,10 +66,42 @@ type Release struct {
 	Assets  []*Asset `json:"assets,omitempty"`
 }
 
+// AddAnnotation is used to mark namespaces for automatic sidecar injection (or not)
+func (iClient *Client) AddAnnotation(namespace string, remove bool) error{
+	ns, err := iClient.k8sClientset.CoreV1().Namespaces().Get(namespace, metav1.GetOptions{})
+	if err != nil {
+		_,err:=iClient.k8sClientset.CoreV1().Namespaces().Create(&corev1.Namespace{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: namespace,
+			}})
+		if err!=nil {
+			err = errors.Wrapf(err, "Unable to create namespace")
+			return err
+		}
+	}
+
+	if ns.ObjectMeta.Annotations == nil {
+		ns.ObjectMeta.Annotations = map[string]string{}
+	}
+	ns.ObjectMeta.Annotations["linkerd.io/inject"] = "enabled"
+
+	if remove {
+		delete(ns.ObjectMeta.Annotations, "linkerd.io/inject");
+	}
+
+	_, err = iClient.k8sClientset.CoreV1().Namespaces().Update(ns)
+	if err != nil {
+		err = errors.Wrapf(err, "Unable to update namespace with annotation")
+		return err
+	}
+	return nil
+}
+
+// getLatestRelease is to pull down the Linkerd packages
 func (iClient *Client) getLatestReleaseURL() error {
 
 	if iClient.linkerdReleaseDownloadURL == "" || time.Since(iClient.linkerdReleaseUpdatedAt) > cachePeriod {
-		logrus.Debugf("API info url: %s", repoURL)
+		logrus.Debugf("API info url: %s	", repoURL)
 		resp, err := http.Get(repoURL)
 		if err != nil {
 			err = errors.Wrapf(err, "error getting latest version info")
@@ -118,6 +152,7 @@ func (iClient *Client) getLatestReleaseURL() error {
 	return nil
 }
 
+// downloadFile pulls the release packages
 func (iClient *Client) downloadFile(urlToDownload, localFile string) error {
 	dFile, err := os.Create(localFile)
 	if err != nil {
@@ -159,6 +194,7 @@ func (iClient *Client) downloadFile(urlToDownload, localFile string) error {
 	return nil
 }
 
+// downloadLinkerd pull down packages 
 func (iClient *Client) downloadLinkerd() error {
 	logrus.Debug("preparing to download the latest linkerd release")
 	err := iClient.getLatestReleaseURL()
@@ -189,6 +225,7 @@ func (iClient *Client) downloadLinkerd() error {
 	return nil
 }
 
+// execute processes the command given to it
 func (iClient *Client) execute(command ...string) (string, string, error) {
 	err := iClient.downloadLinkerd()
 	if err != nil {
@@ -219,6 +256,7 @@ func (iClient *Client) execute(command ...string) (string, string, error) {
 	return outb.String(), errb.String(), nil
 }
 
+// getYAML retrieves remote yaml file
 func (iClient *Client) getYAML(remoteURL, localFile string) (string, error) {
 
 	proceedWithDownload := true

linkerd/linkerd.go

@@ -532,6 +532,14 @@ func (iClient *Client) ApplyOperation(ctx context.Context, arReq *meshes.ApplyRu
 		return &meshes.ApplyRuleResponse{
 			OperationId: arReq.OperationId,
 		}, nil
+	case injectLinkerd:
+		err := iClient.AddAnnotation(arReq.Namespace, arReq.DeleteOp)
+		if err != nil {
+			return nil,err
+		}
+		return &meshes.ApplyRuleResponse{
+			OperationId: arReq.OperationId,
+		}, nil
 	default:
 		// tmpl, err := template.ParseFiles(path.Join("linkerd", "config_templates", op.templateName))
 		// if err != nil {

linkerd/supported_ops.go

@@ -32,6 +32,7 @@ const (
 	installBooksAppCommand  = "install_booksapp"
 	installHTTPBinApp       = "install_http_bin"
 	installIstioBookInfoApp = "install_istio_book_info"
+	injectLinkerd="inject_linkerd"
 )
 
 var supportedOps = map[string]supportedOperation{
@@ -61,4 +62,8 @@ var supportedOps = map[string]supportedOperation{
 		templateName: "istiobookinfo.yaml",
 		opType:       meshes.OpCategory_SAMPLE_APPLICATION,
 	},
+	injectLinkerd: {
+		name:         "Inject Linkerd to monitor namespace",
+		opType:       meshes.OpCategory_CONFIGURE,
+	},
 }