fixed secret deletion at the end (#318)

* fixed secret deletion at the end

* updated version to 0.0.287

* updated to 0.0.288

* Update manifests/add-cluster/add-cluster.sh

Author: ATGardner

CHANGELOG.md

@@ -1,3 +1,3 @@
 # Changelog:
 
-* Added cluster commands
+* Fixed cluster-add script

Makefile

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

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.287/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.288/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.287/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.288/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

@@ -4,6 +4,7 @@
 # INGRESS_URL (cm)
 # CONTEXT_NAME (cm)
 # SERVER (cm)
+# CSDP_TOKEN_SECRET
 
 echo "ServiceAccount: ${SERVICE_ACCOUNT_NAME}"
 echo "Ingress URL: ${INGRESS_URL}"
@@ -31,18 +32,18 @@ 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)
 
-RESPONSE=$(curl -X POST ${INGRESS_URL}/app-proxy/api/clusters \
+STATUS_CODE=$(curl -X POST ${INGRESS_URL}/app-proxy/api/clusters \
   -H 'Content-Type: application/json' \
   -H 'Authorization: '${CSDP_TOKEN}'' \
-  -d '{ "name": "'${CONTEXT_NAME}'", "kubeConfig": "'${KUBE_CONFIG_B64}'" }')
-echo $RESPONSE
-
-STATUS_CODE=$(echo $RESPONSE | jq .statusCode)
+  -d '{ "name": "'${CONTEXT_NAME}'", "kubeConfig": "'${KUBE_CONFIG_B64}'" }' \
+  -s -o response -w "%{http_code}")
+cat response
+echo "STATUS_CODE: ${STATUS_CODE}"
 
 if [ $STATUS_CODE -ge 300 ]; then
   echo "error creating cluster in runtime"
   exit $STATUS_CODE
 fi
 
-echo "deleting token secret ${SECRET_NAME}"
-kubectl delete secret ${SECRET_NAME} -n ${NAMESPACE}
+echo "deleting token secret ${CSDP_TOKEN_SECRET}"
+kubectl delete secret ${CSDP_TOKEN_SECRET} -n ${NAMESPACE}

manifests/add-cluster/helm/Chart.yaml

@@ -4,6 +4,6 @@ description: This helm chart adds a remote cluster to an existing Codefresh runt
 
 type: application
 
-version: 0.1.0
+version: 0.2.0
 
-appVersion: 0.1.0
+appVersion: 0.2.0

manifests/add-cluster/helm/templates/job.yaml

@@ -46,6 +46,8 @@ spec:
                 configMapKeyRef:
                   name: {{ include "csdp-add-cluster.fullname" . }}-cm
                   key: server
+            - name: CSDP_TOKEN_SECRET
+              value: {{ include "csdp-add-cluster.fullname" . }}-secret
           resources:
             limits:
               memory: 512Mi

manifests/add-cluster/kustomize/job.yaml

@@ -43,6 +43,8 @@ spec:
                 configMapKeyRef:
                   name: csdp-add-cluster-cm
                   key: server
+            - name: CSDP_TOKEN_SECRET
+              value: $(CSDP_ADD_CLUSTER_SECRET)
           resources:
             limits:
               memory: 512Mi

manifests/add-cluster/kustomize/kustomization.yaml

@@ -4,7 +4,7 @@ namespace: kube-system
 
 images:
   - name: quay.io/codefresh/csdp-add-cluster
-    newTag: 0.1.0
+    newTag: 0.2.0
 
 resources:
   - configmap.yaml
@@ -13,3 +13,10 @@ resources:
   - job.yaml
   - secret.yaml
   - serviceaccount.yaml
+
+vars:
+  - name: CSDP_ADD_CLUSTER_SECRET
+    objref:
+      apiVersion: v1
+      kind: Secret
+      name: csdp-add-cluster-secret

manifests/runtime.yaml

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