Fix agent installation (#98)

* fix path

* fix agent installation

Author: pasha-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.96
+VERSION=v0.0.97
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 

cmd/commands/runtime.go

@@ -798,15 +798,7 @@ func createCodefreshArgoAgentReporter(ctx context.Context, cloneOpts *git.CloneO
 		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
-	}
+	resPath := cloneOpts.FS.Join(apstore.Default.AppsDir, store.Get().ArgoCDAgentReporterName, "base")
 
 	r, _, err := cloneOpts.GetRepo(ctx)
 	if err != nil {
@@ -1049,16 +1041,12 @@ func createCodefreshArgoDashboardAgent(ctx context.Context, path string, cloneOp
 	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)
+	return nil
 }

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.93
+  version: 0.0.97
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
@@ -18,3 +18,6 @@ spec:
     - name: workflows
       type: kustomize
       url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
+    - name: argocd-agent
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-agent

pkg/util/argo-agent/util.go

@@ -16,8 +16,6 @@ package util
 
 import (
 	"fmt"
-	"github.com/codefresh-io/cli-v2/pkg/store"
-	"io/ioutil"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -32,14 +30,6 @@ type (
 	}
 )
 
-func CreateAgentResource() ([]byte, error) {
-	yamlFile, err := ioutil.ReadFile(store.ArgoAgentURL)
-	if err != nil {
-		return nil, err
-	}
-	return []byte(yamlFile), err
-}
-
 func addPatch(patches []kusttypes.Patch, gvk kustid.Gvk, patch string) []kusttypes.Patch {
 	return append(patches, kusttypes.Patch{
 		Target: &kusttypes.Selector{
@@ -61,6 +51,10 @@ func CreateAgentResourceKustomize(options *CreateAgentOptions) kusttypes.Kustomi
 
 	namespaceReplacement := fmt.Sprintf(`- op: replace
   path: /metadata/namespace
+  value: %s`, options.Namespace)
+
+	crbNamespaceReplacement := fmt.Sprintf(`- op: replace
+  path: /subjects/0/namespace
   value: %s`, options.Namespace)
 
 	hostReplacement := fmt.Sprintf(`- op: replace
@@ -71,7 +65,7 @@ func CreateAgentResourceKustomize(options *CreateAgentOptions) kusttypes.Kustomi
   path: /data/integration
   value: argocd-%s`, options.Name)
 
-	kust.Resources = append(kust.Resources, "./argocd-agent.yaml")
+	kust.Resources = append(kust.Resources, "https://raw.githubusercontent.com/codefresh-io/cli-v2/main/manifests/argo-agent/agent.yaml")
 
 	kust.Patches = addPatch(kust.Patches, kustid.Gvk{
 		Group:   appsv1.SchemeGroupVersion.Group,
@@ -88,7 +82,7 @@ func CreateAgentResourceKustomize(options *CreateAgentOptions) kusttypes.Kustomi
 		Group:   rbacv1.SchemeGroupVersion.Group,
 		Version: v1.SchemeGroupVersion.Version,
 		Kind:    "ClusterRoleBinding",
-	}, namespaceReplacement)
+	}, crbNamespaceReplacement)
 
 	kust.Patches = addPatch(kust.Patches, kustid.Gvk{
 		Version: v1.SchemeGroupVersion.Version,