Remove unused manifests (#638)

* remove unused manifests and scripts

* bump

Author: danielm-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.1.4
+VERSION=v0.1.5
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
@@ -9,7 +9,6 @@ IMAGE_NAMESPACE?=codefresh
 
 RUNTIME_DEF_URL="https://raw.githubusercontent.com/codefresh-io/csdp-official/stable/csdp/hybrid/basic/runtime.yaml"
 ADD_CLUSTER_DEF_URL="https://github.com/codefresh-io/csdp-official/add-cluster/kustomize"
-FALLBACK_ADD_CLUSTER_DEF_URL="https://github.com/codefresh-io/cli-v2/manifests/add-cluster/kustomize"
 
 # when developing, point this to your local clone of csdp-official
 DEV_RUNTIME_DEF_URL="https://raw.githubusercontent.com/codefresh-io/csdp-official/stable/csdp/hybrid/basic/runtime.yaml"
@@ -106,7 +105,6 @@ $(OUT_DIR)/$(CLI_NAME)-%: $(CLI_SRCS)
 	GIT_COMMIT=$(GIT_COMMIT) \
 	RUNTIME_DEF_URL=$(RUNTIME_DEF_URL) \
 	ADD_CLUSTER_DEF_URL=$(ADD_CLUSTER_DEF_URL) \
-	FALLBACK_ADD_CLUSTER_DEF_URL=$(FALLBACK_ADD_CLUSTER_DEF_URL) \
 	SEGMENT_WRITE_KEY=$(SEGMENT_WRITE_KEY) \
 	DEV_MODE=$(DEV_MODE) \
 	OUT_FILE=$(OUT_DIR)/$(CLI_NAME)-$* \

build/add-cluster-script.yaml

@@ -65,7 +65,7 @@ type (
 )
 
 var (
-	minAddClusterSupportedVersion = semver.MustParse("0.0.283")
+	minAddClusterSupportedVersion       = semver.MustParse("0.0.283")
 	minAddClusterLabelsSupportedVersion = semver.MustParse("0.0.462")
 
 	serviceAccountGVK = resid.Gvk{
@@ -384,7 +384,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
 			return nil, "", fmt.Errorf("failed encoding annotations: %w", err)
 		}
 
-		k.ConfigMapGenerator[0].KvPairSources.LiteralSources = append(k.ConfigMapGenerator[0].KvPairSources.LiteralSources, fmt.Sprintf("annotations=" + annotationsStr))
+		k.ConfigMapGenerator[0].KvPairSources.LiteralSources = append(k.ConfigMapGenerator[0].KvPairSources.LiteralSources, fmt.Sprintf("annotations="+annotationsStr))
 	}
 
 	if len(opts.labels) > 0 {
@@ -393,7 +393,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
 			return nil, "", fmt.Errorf("failed encoding labels: %w", err)
 		}
 
-		k.ConfigMapGenerator[0].KvPairSources.LiteralSources = append(k.ConfigMapGenerator[0].KvPairSources.LiteralSources, fmt.Sprintf("labels=" + labelsStr))
+		k.ConfigMapGenerator[0].KvPairSources.LiteralSources = append(k.ConfigMapGenerator[0].KvPairSources.LiteralSources, fmt.Sprintf("labels="+labelsStr))
 	}
 
 	if opts.tag != "" {
@@ -410,17 +410,7 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
 
 	manifests, err := kustutil.BuildKustomization(k)
 	if err != nil {
-		// go to fallback add-cluster manifests
-		// remove this once all manifests has been moved official-csdp repo.
-		// once we are sure no one will be looking for those manifests in cli-v2 we can remove this.
-		fallbackResourceUrl := fmt.Sprintf("%s?ref=v%s", store.FallbackAddClusterDefURL, version)
-		k.Resources[0] = fallbackResourceUrl
-		log.G().Warnf("Failed to get \"add-cluster\" manifests from %s, using fallback of %s", resourceUrl, fallbackResourceUrl)
-
-		manifests, err = kustutil.BuildKustomization(k)
-		if err != nil {
-			return nil, "", fmt.Errorf("failed to build kustomization: %w", err)
-		}
+		return nil, "", fmt.Errorf("failed to build kustomization: %w", err)
 	}
 
 	return manifests, nameSuffix, nil

cmd/commands/cluster.go

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