Add NewK8sProvider support for eks and CLI related changes to incorporate eks funcionalities

Signed-off-by: Drumil Patel <[email protected]>

Author: weastel

infra/infra.go

@@ -81,8 +81,8 @@ func main() {
 	k8sEKS := app.Command("eks", "Amazon Elastic Kubernetes Service - https://aws.amazon.com/eks").
 		Action(e.NewEKSClient)
 	k8sEKS.Flag("auth", "filename which consist eks credentials.").
-		PlaceHolder("service-account.json").
-		Short("a").
+		PlaceHolder("credentials").
+		Short('a').
 		StringVar(&e.AuthFilename)
 	k8sEKS.Flag("file", "yaml file or folder  that describes the parameters for the object that will be deployed.").
 		Required().
@@ -99,6 +99,35 @@ func main() {
 		Default("_").
 		StringVar(&e.Separator)
 
+	// EKS Cluster operations
+	k8sEKSCluster := k8sEKS.Command("cluster", "manage EKS clusters").
+		Action(e.EKSDeploymentParse)
+	k8sEKSCluster.Command("create", "eks cluster create -a credentials -f FileOrFolder").
+		Action(e.ClusterCreate)
+	k8sEKSCluster.Command("delete", "eks cluster delete -a credentials -f FileOrFolder").
+		Action(e.ClusterDelete)
+
+	// Cluster node-pool operations
+	k8sEKSNodeGroup := k8sEKS.Command("nodegroup", "manage EKS clusters nodegroups").
+		Action(e.EKSDeploymentParse)
+	k8sEKSNodeGroup.Command("create", "eks nodegroup create -a credentials -f FileOrFolder").
+		Action(e.NodeGroupCreate)
+	k8sEKSNodeGroup.Command("delete", "eks nodegroup delete -a credentials -f FileOrFolder").
+		Action(e.NodeGroupDelete)
+	k8sEKSNodeGroup.Command("check-running", "eks nodegroup check-running -a credentails -f FileOrFolder").
+		Action(e.AllNodeGroupsRunning)
+	k8sEKSNodeGroup.Command("check-deleted", "eks nodegroup check-deleted -a credentials -f FileOrFolder").
+		Action(e.AllNodeGroupsDeleted)
+
+	// K8s resource operations.
+	k8sEKSResource := k8sEKS.Command("resource", `Apply and delete different k8s resources - deployments, services, config maps etc.Required variables -v PROJECT_ID, -v ZONE: -west1-b -v CLUSTER_NAME`).
+		Action(e.NewK8sProvider).
+		Action(e.K8SDeploymentsParse)
+	k8sEKSResource.Command("apply", "eks resource apply -a credentials -f manifestsFileOrFolder -v PROJECT_ID:test -v ZONE:europe-west1-b -v CLUSTER_NAME:test -v hashStable:COMMIT1 -v hashTesting:COMMIT2").
+		Action(e.ResourceApply)
+	k8sEKSResource.Command("delete", "eks resource delete -a credentials -f manifestsFileOrFolder -v PROJECT_ID:test -v ZONE:europe-west1-b -v CLUSTER_NAME:test -v hashStable:COMMIT1 -v hashTesting:COMMIT2").
+		Action(e.ResourceDelete)
+
 	if _, err := app.Parse(os.Args[1:]); err != nil {
 		fmt.Fprintln(os.Stderr, errors.Wrapf(err, "Error parsing commandline arguments"))
 		app.Usage(os.Args[1:])

pkg/provider/eks/eks.go

@@ -14,6 +14,7 @@
 package eks
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"os"
@@ -33,6 +34,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
 type Resource = provider.Resource
@@ -214,7 +216,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
 			ClusterName: req.Cluster.Name,
 		}
 
-		for true {
+		for {
 			resL, err := c.clientEKS.ListNodegroups(reqL)
 			if err != nil {
 				log.Fatalf("listing nodepools err:%v", err)
@@ -455,7 +457,57 @@ func (c *EKS) AllNodeGroupsDeleted(*kingpin.ParseContext) error {
 // NewK8sProvider sets the k8s provider used for deploying k8s manifests
 func (c *EKS) NewK8sProvider(*kingpin.ParseContext) error {
 
-	// TODO: Complete this function
+	clusterName, ok := c.DeploymentVars["CLUSTER_NAME"]
+	if !ok {
+		return fmt.Errorf("missing required CLUSTER_NAME variable")
+	}
+	arnRole, ok := c.DeploymentVars["ROLE_ARN"]
+	if !ok {
+		return fmt.Errorf("missing required CLUSTER_NAME variable")
+	}
+
+	req := &eks.DescribeClusterInput{
+		Name: &clusterName,
+	}
+
+	rep, err := c.clientEKS.DescribeCluster(req)
+	if err != nil {
+		log.Fatalf("failed to get cluster details: %v", err)
+	}
+
+	cluster := clientcmdapi.NewCluster()
+	cluster.CertificateAuthorityData = []byte(rep.Cluster.CertificateAuthority.String())
+	cluster.Server = *rep.Cluster.Endpoint
+
+	clusterContext := clientcmdapi.NewContext()
+	clusterContext.Cluster = "kubernetes"
+	clusterContext.AuthInfo = "aws"
+
+	authInfo := clientcmdapi.NewAuthInfo()
+	authInfo.Exec = &clientcmdapi.ExecConfig{
+		APIVersion: "client.authentication.k8s.io/v1alpha1",
+		Command:    "aws",
+		Args:       []string{"eks", "get-token", "--cluster-name", clusterName, "--role", arnRole},
+		Env: []clientcmdapi.ExecEnvVar{
+			{
+				Name:  "AWS_PROFILE",
+				Value: "prombench",
+			},
+		},
+	}
+
+	config := clientcmdapi.NewConfig()
+	config.AuthInfos["aws"] = authInfo
+	config.Contexts["aws"] = clusterContext
+	config.Clusters["kubernetes"] = cluster
+	config.CurrentContext = "aws"
+	config.Kind = "Config"
+	config.APIVersion = "v1"
+
+	c.k8sProvider, err = k8sProvider.New(context.Background(), config)
+	if err != nil {
+		log.Fatal("k8s provider error", err)
+	}
 
 	return nil
 }

prombench/manifests/environment/eks/cluster.yaml

@@ -19,7 +19,7 @@ nodegroups:
       maxsize: 1
       minsize: 1
     labels:
-      node-type: main-node
+      node-name: main-node
 
 
 

prombench/manifests/environment/eks/nodegroups.yaml

@@ -12,7 +12,7 @@ nodegroups:
       minsize: 2
     labels:
       isolation: prometheus
-      node-type: prometheus-{{ .PR_NUMBER }}
+      node-name: prometheus-{{ .PR_NUMBER }}
   - nodegroupname: nodes-{{ .PR_NUMBER }}
     noderole: {{ .NODE_ROLE }}
     disksize: 100
@@ -24,6 +24,6 @@ nodegroups:
       minsize: 1
     labels:
       isolation: none
-      node-type: nodes-{{ .PR_NUMBER }}
+      node-name: nodes-{{ .PR_NUMBER }}