fix: attach runtime to agent when existing agent token is provided (#594)

Author: mikhail-klimko

charts/cf-runtime/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 7.9.3
+version: 7.9.4
 keywords:
   - codefresh
   - runner
@@ -17,10 +17,8 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "true"
   # Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
   artifacthub.io/changes: |
-    - kind: security
-      description: "Bump venona with security fixes"
-    - kind: security
-      description: "Bump k8s-agent with security fixes"
+    - kind: fixed
+      description: "Attach runtime to agent when existing agent token is provided."
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts

charts/cf-runtime/README.md

@@ -1,6 +1,6 @@
 ## Codefresh Runner
 
-![Version: 7.9.3](https://img.shields.io/badge/Version-7.9.3-informational?style=flat-square)
+![Version: 7.9.4](https://img.shields.io/badge/Version-7.9.4-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
 

charts/cf-runtime/files/init-runtime.sh

@@ -34,19 +34,38 @@ EOF
 
 }
 
+create_auth_context() {
+  codefresh auth create-context --api-key ${USER_CODEFRESH_TOKEN} --url ${API_HOST}
+}
+
+attach_runtime() {
+  (set -x; codefresh attach runtime \
+    --runtime-name ${RUNTIME_NAME} \
+    --agent-name ${AGENT_NAME} \
+    --platform-only)
+}
+
 OWNER_UID=$(kubectl get deploy ${OWNER_NAME} --namespace ${KUBE_NAMESPACE} -o jsonpath='{.metadata.uid}')
 echo "got owner uid: ${OWNER_UID}"
 
 if [ ! -z "${AGENT_CODEFRESH_TOKEN}" ]; then
     echo "-----"
     echo "runtime and agent are already initialized"
     echo "-----"
+
+    create_auth_context
+    attach_runtime
+
     exit 0
 fi
 
 if [ ! -z "${EXISTING_AGENT_CODEFRESH_TOKEN}" ]; then
     echo "using existing agentToken value"
     create_agent_secret $EXISTING_AGENT_CODEFRESH_TOKEN
+
+    create_auth_context
+    attach_runtime
+
     exit 0
 fi
 
@@ -57,7 +76,7 @@ if [ -z "${USER_CODEFRESH_TOKEN}" ]; then
     exit 1
 fi
 
-codefresh auth create-context --api-key ${USER_CODEFRESH_TOKEN} --url ${API_HOST}
+create_auth_context
 
 # AGENT_TOKEN might be empty, in which case it will be returned by the call
 RES=$(codefresh install agent \