Cr 6076 (#96)

pasha-codefresh · web-flow · commit 57fa12f873cd · 2021-09-07T15:23:12.000+03:00
* add argo-agent installation as part of v2 cli

* add argo-agent installation as part of v2 cli

* bump version

* fix linter

* trigger ci

* regenerate util

* replace gotmpl with kustomize
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.93
+VERSION=v0.0.95
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -26,6 +26,7 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/runtime"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
+	argodashboardutil "github.com/codefresh-io/cli-v2/pkg/util/argo-agent"
 	cdutil "github.com/codefresh-io/cli-v2/pkg/util/cd"
 	eventsutil "github.com/codefresh-io/cli-v2/pkg/util/events"
 	ingressutil "github.com/codefresh-io/cli-v2/pkg/util/ingress"
@@ -274,6 +275,10 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		}
 	}
 
+	if err = createCodefreshArgoAgentReporter(ctx, opts.insCloneOpts, opts, rt); err != nil {
+		return fmt.Errorf("failed to create argocd-agent-reporter: %w", err)
+	}
+
 	if err = createEventsReporter(ctx, opts.insCloneOpts, opts, rt); err != nil {
 		return fmt.Errorf("failed to create events-reporter: %w", err)
 	}
@@ -745,7 +750,12 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 		return fmt.Errorf("failed to create argocd token secret: %w", err)
 	}
 
-	if err = opts.KubeFactory.Apply(ctx, opts.RuntimeName, aputil.JoinManifests(runtimeTokenSecret, argoTokenSecret)); err != nil {
+	argoAgentCFTokenSecret, err := getArgoCDAgentTokenSecret(ctx, cfConfig.GetCurrentContext().Token, opts.RuntimeName)
+	if err != nil {
+		return fmt.Errorf("failed to create argocd token secret: %w", err)
+	}
+
+	if err = opts.KubeFactory.Apply(ctx, opts.RuntimeName, aputil.JoinManifests(runtimeTokenSecret, argoTokenSecret, argoAgentCFTokenSecret)); err != nil {
 		return fmt.Errorf("failed to create codefresh token: %w", err)
 	}
 
@@ -778,6 +788,41 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 	return err
 }
 
+func createCodefreshArgoAgentReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *RuntimeInstallOptions, rt *runtime.Runtime) error {
+	argoAgentCFTokenSecret, err := getArgoCDAgentTokenSecret(ctx, cfConfig.GetCurrentContext().Token, opts.RuntimeName)
+	if err != nil {
+		return fmt.Errorf("failed to create argocd token secret: %w", err)
+	}
+
+	if err = opts.KubeFactory.Apply(ctx, opts.RuntimeName, aputil.JoinManifests(argoAgentCFTokenSecret)); err != nil {
+		return fmt.Errorf("failed to create codefresh token: %w", err)
+	}
+
+	resPath := cloneOpts.FS.Join(apstore.Default.AppsDir, store.Get().ArgoCDAgentReporterName, opts.RuntimeName, "resources")
+	appDef := &runtime.AppDef{
+		Name: store.Get().ArgoCDAgentReporterName,
+		Type: application.AppTypeDirectory,
+		URL:  cloneOpts.URL() + "/" + resPath,
+	}
+	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType); err != nil {
+		return err
+	}
+
+	r, _, err := cloneOpts.GetRepo(ctx)
+	if err != nil {
+		return err
+	}
+
+	if err := createCodefreshArgoDashboardAgent(ctx, resPath, cloneOpts, rt); err != nil {
+		return err
+	}
+
+	_, err = r.Persist(ctx, &git.PushOptions{
+		CommitMsg: "Created ArgoCD Agent Reporter",
+	})
+	return err
+}
+
 func createWorkflowReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *RuntimeInstallOptions) error {
 	resPath := cloneOpts.FS.Join(apstore.Default.AppsDir, store.Get().WorkflowReporterName, opts.RuntimeName, "resources")
 	appDef := &runtime.AppDef{
@@ -875,6 +920,22 @@ func getArgoCDTokenSecret(ctx context.Context, namespace string, insecure bool)
 	})
 }
 
+func getArgoCDAgentTokenSecret(ctx context.Context, token string, namespace string) ([]byte, error) {
+	return yaml.Marshal(&v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Secret",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      store.Get().ArgoCDAgentCFTokenSecret,
+			Namespace: namespace,
+		},
+		Data: map[string][]byte{
+			store.Get().ArgoCDAgentCFTokenKey: []byte(token),
+		},
+	})
+}
+
 func createWorkflowReporterRBAC(repofs fs.FS, path, runtimeName string) error {
 	serviceAccount := &v1.ServiceAccount{
 		TypeMeta: metav1.TypeMeta{
@@ -982,3 +1043,22 @@ func createSensor(repofs fs.FS, name, path, namespace, eventSourceName, trigger,
 	})
 	return repofs.WriteYamls(repofs.Join(path, "sensor.yaml"), sensor)
 }
+
+func createCodefreshArgoDashboardAgent(ctx context.Context, path string, cloneOpts *git.CloneOptions, rt *runtime.Runtime) error {
+	_, fs, err := cloneOpts.GetRepo(ctx)
+	if err != nil {
+		return err
+	}
+	resource, err := argodashboardutil.CreateAgentResource()
+	if err != nil {
+		return err
+	}
+
+	kust := argodashboardutil.CreateAgentResourceKustomize(&argodashboardutil.CreateAgentOptions{Namespace: rt.Namespace, Name: rt.Name})
+
+	if err = kustutil.WriteKustomization(fs, &kust, path); err != nil {
+		return err
+	}
+
+	return billyUtils.WriteFile(fs, fs.Join(path, "argocd-agent.yaml"), resource, 0666)
+}
diff --git a/manifests/argo-agent/agent.yaml b/manifests/argo-agent/agent.yaml
@@ -0,0 +1,122 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: cf-argocd-agent
+  name: cf-argocd-agent
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app: cf-argocd-agent
+  name: cf-argocd-agent
+rules:
+  - apiGroups:
+      - argoproj.io
+    resources:
+      - applications
+      - appprojects
+    verbs:
+      - get
+      - list
+      - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app: cf-argocd-agent
+  name: cf-argocd-agent
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cf-argocd-agent
+subjects:
+  - kind: ServiceAccount
+    name: cf-argocd-agent
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-agent-cm
+data:
+  host: https://argocd-server
+  integration: argocd
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: cf-argocd-agent
+  name: cf-argocd-agent
+spec:
+  selector:
+    matchLabels:
+      app: cf-argocd-agent
+  replicas: 1
+  revisionHistoryLimit: 5
+  strategy:
+    rollingUpdate:
+      maxSurge: 50%
+      maxUnavailable: 50%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: cf-argocd-agent
+    spec:
+      serviceAccountName: cf-argocd-agent
+      containers:
+        - env:
+            - name: AGENT_VERSION
+              value: "1.72.3"
+            - name: ARGO_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: argocd-agent-cm
+                  key: host
+            - name: ARGO_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: argocd-token
+                  key: token
+            - name: ENV_NAME
+              value: kubernetes
+            - name: CODEFRESH_HOST
+              value: https://g.codefresh.io
+            - name: CODEFRESH_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: cf-argocd-agent
+                  key: token
+            - name: IN_CLUSTER
+              value: "true"
+            - name: CREATE_INTEGRATION_IF_NOT_EXIST
+              value: "true"
+            - name: MASTERURL
+              value: ""
+            - name: SYNC_MODE
+              value: "CONTINUE_SYNC"
+            - name: APPLICATIONS_FOR_SYNC
+              value: ""
+            - name: CODEFRESH_INTEGRATION
+              valueFrom:
+                configMapKeyRef:
+                  name: argocd-agent-cm
+                  key: integration
+            - name: CODEFRESH_GIT_INTEGRATION
+              value: github
+          image: codefresh/argocd-agent:stable
+          imagePullPolicy: Always
+          name: cf-argocd-agent
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "0.4"
+            limits:
+              memory: "512Mi"
+              cpu: "0.8"
+      restartPolicy: Always
+      nodeSelector:
+        kubernetes.io/arch: amd64
diff --git a/out.txt b/out.txt
diff --git a/pkg/store/store.go b/pkg/store/store.go
@@ -43,39 +43,43 @@ type Version struct {
 }
 
 type Store struct {
-	ArgoCDServerName       string
-	ArgoCDTokenKey         string
-	ArgoCDTokenSecret      string
-	ArgoWFServiceName      string
-	ArgoWFServicePort      int32
-	BinaryName             string
-	Codefresh              string
-	CFComponentType        string
-	CFGitSourceType        string
-	CFRuntimeDefType       string
-	CFRuntimeType          string
-	CFTokenSecret          string
-	CFTokenSecretKey       string
-	CodefreshCM            string
-	CodefreshSA            string
-	ComponentsReporterName string
-	ComponentsReporterSA   string
-	ComponentsReporterURL  string
-	DefaultAPI             string
-	EventBusName           string
-	EventReportingEndpoint string
-	EventsReporterName     string
-	GitSourceName          string
-	IngressName            string
-	IngressPath            string
-	LabelKeyCFType         string
-	MaxDefVersion          *semver.Version
-	RuntimeDefURL          string
-	RuntimeFilename        string
-	Version                Version
-	WaitTimeout            time.Duration
-	WorkflowName           string
-	WorkflowReporterName   string
+	ArgoCDServerName         string
+	ArgoCDTokenKey           string
+	ArgoCDTokenSecret        string
+	ArgoCDAgentCFTokenKey    string
+	ArgoCDAgentCFTokenSecret string
+	ArgoCDAgentSA            string
+	ArgoWFServiceName        string
+	ArgoWFServicePort        int32
+	BinaryName               string
+	Codefresh                string
+	CFComponentType          string
+	CFGitSourceType          string
+	CFRuntimeDefType         string
+	CFRuntimeType            string
+	CFTokenSecret            string
+	CFTokenSecretKey         string
+	CodefreshCM              string
+	CodefreshSA              string
+	ComponentsReporterName   string
+	ComponentsReporterSA     string
+	ComponentsReporterURL    string
+	DefaultAPI               string
+	EventBusName             string
+	EventReportingEndpoint   string
+	EventsReporterName       string
+	ArgoCDAgentReporterName  string
+	GitSourceName            string
+	IngressName              string
+	IngressPath              string
+	LabelKeyCFType           string
+	MaxDefVersion            *semver.Version
+	RuntimeDefURL            string
+	RuntimeFilename          string
+	Version                  Version
+	WaitTimeout              time.Duration
+	WorkflowName             string
+	WorkflowReporterName     string
 }
 
 // Get returns the global store
@@ -96,6 +100,10 @@ func init() {
 	s.CFRuntimeDefType = "runtimeDef"
 	s.CFRuntimeType = "runtime"
 	s.CFTokenSecret = "codefresh-token"
+	s.ArgoCDAgentCFTokenKey = "token"
+	s.ArgoCDAgentCFTokenSecret = "cf-argocd-agent"
+	s.ArgoCDAgentReporterName = "argocd-agent"
+	s.ArgoCDAgentSA = "argocd-agent"
 	s.CFTokenSecretKey = "token"
 	s.CodefreshCM = "codefresh-cm"
 	s.CodefreshSA = "codefresh-sa"
@@ -115,6 +123,7 @@ func init() {
 	s.WaitTimeout = 8 * time.Minute
 	s.WorkflowName = "workflow"
 	s.WorkflowReporterName = "workflow-reporter"
+
 	initVersion()
 }
 
diff --git a/pkg/util/argo-agent/util.go b/pkg/util/argo-agent/util.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.93`
	`1`	`+VERSION=v0.0.95`
`2`	`2`	`OUT_DIR=dist`
`3`	`3`	`YEAR?=$(shell date +"%Y")`
`4`	`4`