CR-11438 friendly cluster name (#431)

* set cluster name

* wip

* validate cluster name

* wip

* name validation

* remove lines

* small fix

* bump version

* bump app-proxy

* lint

* bump appVersion and tag

Author: rotem-codefresh

Makefile

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

cmd/commands/cluster.go

@@ -37,6 +37,7 @@ import (
 type (
 	ClusterAddOptions struct {
 		runtimeName string
+		clusterName string
 		kubeContext string
 		kubeconfig  string
 		dryRun      bool
@@ -97,13 +98,21 @@ func newClusterAddCommand() *cobra.Command {
 			}
 
 			opts.kubeContext, err = ensureKubeContextName(cmd.Flag("context"), cmd.Flag("kubeconfig"))
+			if err != nil {
+				return err
+			}
+			
+			setClusterName(&opts)
+			err = validateClusterName(opts.clusterName)
+
 			return err
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runClusterAdd(cmd.Context(), &opts)
 		},
 	}
 
+	cmd.Flags().StringVar(&opts.clusterName, "name", "", "Name of the cluster. If omitted, will use the context name")
 	cmd.Flags().BoolVar(&opts.dryRun, "dry-run", false, "")
 	opts.kubeFactory = kube.AddFlags(cmd.Flags())
 
@@ -136,7 +145,7 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
 	}
 
 	csdpToken := cfConfig.GetCurrentContext().Token
-	k := createAddClusterKustomization(ingressUrl, opts.kubeContext, server, csdpToken, *runtime.RuntimeVersion)
+	k := createAddClusterKustomization(ingressUrl, opts.clusterName, server, csdpToken, *runtime.RuntimeVersion)
 
 	manifests, err := kustutil.BuildKustomization(k)
 	if err != nil {
@@ -156,6 +165,20 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
 	return kubeutil.WaitForJob(ctx, opts.kubeFactory, "kube-system", store.Get().AddClusterJobName)
 }
 
+func setClusterName(opts *ClusterAddOptions) {
+	if opts.clusterName != "" {
+		return
+	}
+	opts.clusterName = opts.kubeContext
+}
+
+func validateClusterName(name string) error {
+	if strings.ContainsAny(name, "%`") {
+		return fmt.Errorf("cluster name '%s' is invalid. '%%' and '`' are not allowed", name)
+	}
+	return nil
+}
+
 func createAddClusterKustomization(ingressUrl, contextName, server, csdpToken, version string) *kusttypes.Kustomization {
 	resourceUrl := store.AddClusterDefURL
 	if strings.HasPrefix(resourceUrl, "http") {

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.384/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.385/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.384/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.385/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/add-cluster/add-cluster.sh

@@ -27,10 +27,10 @@ BEARER_TOKEN=$(kubectl get secret ${SECRET_NAME} -n ${NAMESPACE} -o jsonpath='{.
 
 # write KUBE_COPNFIG_DATA to local file
 CLUSTER_NAME=$(echo ${SERVER} | sed s/'http[s]\?:\/\/'//)
-kubectl config set-cluster ${CLUSTER_NAME} --server=${SERVER} --certificate-authority=${CACERT}
+kubectl config set-cluster "${CLUSTER_NAME}" --server=${SERVER} --certificate-authority=${CACERT}
 kubectl config set-credentials ${SERVICE_ACCOUNT_NAME} --token ${BEARER_TOKEN}
-kubectl config set-context ${CONTEXT_NAME} --cluster=${CLUSTER_NAME} --user=${SERVICE_ACCOUNT_NAME}
-KUBE_CONFIG_B64=$(kubectl config view --minify --flatten --output json --context=${CONTEXT_NAME} | base64 -w 0)
+kubectl config set-context "${CONTEXT_NAME}" --cluster="${CLUSTER_NAME}" --user=${SERVICE_ACCOUNT_NAME}
+KUBE_CONFIG_B64=$(kubectl config view --minify --flatten --output json --context="${CONTEXT_NAME}" | base64 -w 0)
 
 STATUS_CODE=$(curl -X POST ${INGRESS_URL}/app-proxy/api/clusters \
   -H 'Content-Type: application/json' \

manifests/add-cluster/helm/Chart.yaml

@@ -6,4 +6,4 @@ type: application
 
 version: 0.2.0
 
-appVersion: 0.3.0
+appVersion: 0.3.1

manifests/add-cluster/kustomize/kustomization.yaml

@@ -4,7 +4,7 @@ namespace: kube-system
 
 images:
   - name: quay.io/codefresh/csdp-add-cluster
-    newTag: 0.3.0
+    newTag: 0.3.1
 
 resources:
   - configmap.yaml

manifests/app-proxy/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.1338.0
+    newTag: 1.1341.0
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml

manifests/runtime.yaml

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