CR-10413 add cluster labels/annotations (#432)

Author: rotem-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.461
+VERSION=v0.0.462
 
 
 OUT_DIR=dist

cmd/commands/cluster.go

@@ -29,6 +29,7 @@ import (
 	kubeutil "github.com/codefresh-io/cli-v2/pkg/util/kube"
 	kustutil "github.com/codefresh-io/cli-v2/pkg/util/kust"
 	"github.com/codefresh-io/go-sdk/pkg/codefresh/model"
+	"github.com/ghodss/yaml"
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/kube"
@@ -44,6 +45,9 @@ type (
 		clusterName string
 		kubeContext string
 		kubeconfig  string
+		annotations map[string]string
+		labels      map[string]string
+		tag         string
 		dryRun      bool
 		kubeFactory kube.Factory
 	}
@@ -62,6 +66,7 @@ type (
 
 var (
 	minAddClusterSupportedVersion = semver.MustParse("0.0.283")
+	minAddClusterLabelsSupportedVersion = semver.MustParse("0.0.462")
 
 	serviceAccountGVK = resid.Gvk{
 		Version: "v1",
@@ -100,7 +105,9 @@ func NewClusterCommand() *cobra.Command {
 }
 
 func newClusterAddCommand() *cobra.Command {
-	var opts ClusterAddOptions
+	var (
+		opts ClusterAddOptions
+	)
 
 	cmd := &cobra.Command{
 		Use:     "add [RUNTIME_NAME]",
@@ -122,17 +129,20 @@ func newClusterAddCommand() *cobra.Command {
 				return err
 			}
 
-			err = setClusterName(cmd.Context(), &opts)
-
-			return err
+			return setClusterName(cmd.Context(), &opts)
 		},
 		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().StringToStringVar(&opts.annotations, "annotations", nil, "Set metadata annotations (e.g. --annotation key=value)")
+	cmd.Flags().StringToStringVar(&opts.labels, "labels", nil, "Set metadata labels (e.g. --label key=value)")
 	cmd.Flags().BoolVar(&opts.dryRun, "dry-run", false, "")
+	cmd.Flags().StringVar(&opts.tag, "tag", "", "[dev only] - use a specific tag of the csdp-add-cluster image")
+
+	util.Die(cmd.Flags().MarkHidden("tag"))
 	opts.kubeFactory = kube.AddFlags(cmd.Flags())
 
 	return cmd
@@ -153,6 +163,10 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
 		return fmt.Errorf("runtime \"%s\" does not support this command. Minimal required version is %s", opts.runtimeName, minAddClusterSupportedVersion)
 	}
 
+	if (len(opts.annotations) > 0 || len(opts.labels) > 0) && version.LessThan(minAddClusterLabelsSupportedVersion) {
+		return fmt.Errorf("runtime \"%s\" does not support adding clusters with annotations or labels. Minimal required version is %s", opts.runtimeName, minAddClusterLabelsSupportedVersion)
+	}
+
 	if runtime.IngressHost == nil {
 		return fmt.Errorf("runtime \"%s\" is missing an ingress URL", opts.runtimeName)
 	}
@@ -166,7 +180,7 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
 	log.G(ctx).Info("Building \"add-cluster\" manifests")
 
 	csdpToken := cfConfig.GetCurrentContext().Token
-	manifests, nameSuffix, err := createAddClusterManifests(ingressUrl, opts.clusterName, server, csdpToken, *runtime.RuntimeVersion)
+	manifests, nameSuffix, err := createAddClusterManifests(opts, ingressUrl, server, csdpToken, version.String())
 	if err != nil {
 		return fmt.Errorf("failed getting add-cluster resources: %w", err)
 	}
@@ -278,11 +292,16 @@ func getSuffixToClusterName(clusters []model.Cluster, name string, tempName stri
 	return counter
 }
 
-func createAddClusterManifests(ingressUrl, contextName, server, csdpToken, version string) ([]byte, string, error) {
+func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdpToken, version string) ([]byte, string, error) {
 	nameSuffix := getClusterResourcesNameSuffix()
 	resourceUrl := store.AddClusterDefURL
-	if strings.HasPrefix(resourceUrl, "http") && !strings.Contains(resourceUrl, "?ref=") {
-		resourceUrl = fmt.Sprintf("%s?ref=%s", resourceUrl, version)
+	if strings.HasPrefix(resourceUrl, "http") {
+		ref := version
+		if opts.tag != "" {
+			ref = opts.tag
+		}
+
+		resourceUrl = fmt.Sprintf("%s?ref=%s", resourceUrl, ref)
 	}
 
 	k := &kusttypes.Kustomization{
@@ -295,7 +314,7 @@ func createAddClusterManifests(ingressUrl, contextName, server, csdpToken, versi
 					KvPairSources: kusttypes.KvPairSources{
 						LiteralSources: []string{
 							fmt.Sprintf("ingressUrl=" + ingressUrl),
-							fmt.Sprintf("contextName=" + contextName),
+							fmt.Sprintf("contextName=" + opts.clusterName),
 							fmt.Sprintf("server=" + server),
 						},
 					},
@@ -358,6 +377,34 @@ func createAddClusterManifests(ingressUrl, contextName, server, csdpToken, versi
 			},
 		},
 	}
+
+	if len(opts.annotations) > 0 {
+		annotationsStr, err := mapToYaml(opts.annotations)
+		if err != nil {
+			return nil, "", fmt.Errorf("failed encoding annotations: %w", err)
+		}
+
+		k.ConfigMapGenerator[0].KvPairSources.LiteralSources = append(k.ConfigMapGenerator[0].KvPairSources.LiteralSources, fmt.Sprintf("annotations=" + annotationsStr))
+	}
+
+	if len(opts.labels) > 0 {
+		labelsStr, err := mapToYaml(opts.labels)
+		if err != nil {
+			return nil, "", fmt.Errorf("failed encoding labels: %w", err)
+		}
+
+		k.ConfigMapGenerator[0].KvPairSources.LiteralSources = append(k.ConfigMapGenerator[0].KvPairSources.LiteralSources, fmt.Sprintf("labels=" + labelsStr))
+	}
+
+	if opts.tag != "" {
+		k.Images = []kusttypes.Image{
+			{
+				Name:   "quay.io/codefresh/csdp-add-cluster",
+				NewTag: opts.tag,
+			},
+		}
+	}
+
 	k.FixKustomizationPostUnmarshalling()
 	util.Die(k.FixKustomizationPreMarshalling())
 
@@ -574,3 +621,12 @@ func runCreateArgoRollouts(ctx context.Context, opts *ClusterCreateArgoRolloutsO
 
 	return nil
 }
+
+func mapToYaml(m map[string]string) (string, error) {
+	data, err := yaml.Marshal(m)
+	if err != nil {
+		return "", err
+	}
+
+	return string(data), nil
+}

docs/commands/cli-v2_cluster_add.md

@@ -15,12 +15,14 @@ cli-v2 cluster add my-runtime --context my-context
 ### Options
 
 ```
-      --context string      The name of the kubeconfig context to use
-      --dry-run             
-  -h, --help                help for add
-      --kubeconfig string   Path to the kubeconfig file to use for CLI requests.
-      --name string         Name of the cluster. If omitted, will use the context name
-  -n, --namespace string    If present, the namespace scope for this CLI request
+      --annotations stringToString   Set metadata annotations (e.g. --annotation key=value) (default [])
+      --context string               The name of the kubeconfig context to use
+      --dry-run                      
+  -h, --help                         help for add
+      --kubeconfig string            Path to the kubeconfig file to use for CLI requests.
+      --labels stringToString        Set metadata labels (e.g. --label key=value) (default [])
+      --name string                  Name of the cluster. If omitted, will use the context name
+  -n, --namespace string             If present, the namespace scope for this CLI request
 ```
 
 ### Options inherited from parent commands

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

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.1652.1
+    newTag: 1.1658.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.461
+  version: 0.0.462
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/store/store.go

@@ -35,6 +35,7 @@ var (
 	AddClusterDefURL         = "https://github.com/codefresh-io/csdp-official/add-cluster/kustomize"
 	FallbackAddClusterDefURL = "https://github.com/codefresh-io/cli-v2/manifests/add-cluster/kustomize"
 )
+
 type Version struct {
 	Version    *semver.Version
 	BuildDate  string