fix: delete agent and dind secrets (#397)

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: 6.1.4
+version: 6.1.5
 keywords:
   - codefresh
   - runner
@@ -15,9 +15,7 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: fixed
-      description: Updated volumeProvisioner image to `1.34.0`
-    - kind: added
-      description: Add pod monitor for volumeProvisioner deployment
+      description: Fix delete agent and dind secrets
 dependencies:
   - name: cf-common
     repository: https://chartmuseum.codefresh.io/cf-common

charts/cf-runtime/README.md

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

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

@@ -1,10 +1,12 @@
 #!/bin/bash
 
 echo "-----"
-echo "API_HOST:         ${API_HOST}"
-echo "AGENT_NAME:       ${AGENT_NAME}"
-echo "RUNTIME_NAME:     ${RUNTIME_NAME}"
-echo "AGENT:            ${AGENT}"
+echo "API_HOST:           ${API_HOST}"
+echo "AGENT_NAME:         ${AGENT_NAME}"
+echo "RUNTIME_NAME:       ${RUNTIME_NAME}"
+echo "AGENT:              ${AGENT}"
+echo "AGENT_SECRET_NAME:  ${AGENT_SECRET_NAME}"
+echo "DIND_SECRET_NAME:   ${DIND_SECRET_NAME}"
 echo "-----"
 
 auth() {
@@ -23,11 +25,13 @@ remove_agent() {
   codefresh delete agent ${AGENT_NAME} || true
 }
 
-remove_finalizers() {
+remove_secrets() {
   kubectl patch secret $(kubectl get secret -l codefresh.io/internal=true | awk 'NR>1{print $1}' | xargs) -p '{"metadata":{"finalizers":null}}' --type=merge || true
+  kubectl delete secret $AGENT_SECRET_NAME || true
+  kubectl delete secret $DIND_SECRET_NAME || true
 }
 
 auth
 remove_runtime
 remove_agent
-remove_finalizers
+remove_secrets

charts/cf-runtime/templates/hooks/pre-delete/job-cleanup-resources.yaml

@@ -53,6 +53,10 @@ spec:
           {{- include "runtime.installation-token-env-var-value" . | indent 10}}
         - name: AGENT
           value: {{ .Values.runtime.agent | quote }}
+        - name: AGENT_SECRET_NAME
+          value: {{ include "runner.fullname" . }}
+        - name: DIND_SECRET_NAME
+          value: codefresh-certs-server
           {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $values.env "context" .) | nindent 8 }}
       {{- with $values.nodeSelector }}
       nodeSelector: