CR-13036 sa name bug (#482)

* add replacement to kust

* wip

* bump

* remove line

* small fix

* small fix

Author: rotem-codefresh

Makefile

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

cmd/commands/cluster.go

@@ -35,6 +35,7 @@ import (
 	"github.com/juju/ansiterm"
 	"github.com/spf13/cobra"
 	kusttypes "sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/resid"
 )
 
 type (
@@ -59,7 +60,24 @@ type (
 	}
 )
 
-var minAddClusterSupportedVersion = semver.MustParse("0.0.283")
+var (
+	minAddClusterSupportedVersion = semver.MustParse("0.0.283")
+
+	serviceAccountGVK = resid.Gvk{
+		Version: "v1",
+		Kind:    "ServiceAccount",
+	}
+	jobGVK = resid.Gvk{
+		Group:   "batch",
+		Version: "v1",
+		Kind:    "Job",
+	}
+	clusterRoleBindinGVK = resid.Gvk{
+		Group:   "rbac.authorization.k8s.io",
+		Version: "v1",
+		Kind:    "ClusterRoleBinding",
+	}
+)
 
 func NewClusterCommand() *cobra.Command {
 	cmd := &cobra.Command{
@@ -283,6 +301,43 @@ func createAddClusterManifests(ingressUrl, contextName, server, csdpToken, versi
 			resourceUrl,
 		},
 		NameSuffix: nameSuffix,
+		Replacements: []kusttypes.ReplacementField{
+			{
+				Replacement: kusttypes.Replacement{
+					Source: &kusttypes.SourceSelector{
+						ResId: resid.ResId{
+							Gvk:  serviceAccountGVK,
+							Name: "argocd-manager",
+						},
+						FieldPath: "metadata.name",
+					},
+					Targets: []*kusttypes.TargetSelector{
+						{
+							Select: &kusttypes.Selector{
+								ResId: resid.ResId{
+									Gvk:  jobGVK,
+									Name: "csdp-add-cluster-job",
+								},
+							},
+							FieldPaths: []string{
+								"spec.template.spec.serviceAccount",
+							},
+						},
+						{
+							Select: &kusttypes.Selector{
+								ResId: resid.ResId{
+									Gvk:  clusterRoleBindinGVK,
+									Name: "argocd-manager-role-binding",
+								},
+							},
+							FieldPaths: []string{
+								"subjects.[name=argocd-manager].name",
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 	k.FixKustomizationPostUnmarshalling()
 	util.Die(k.FixKustomizationPreMarshalling())

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.427/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.428/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.427/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.428/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.427
+  version: 0.0.428
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events