Skip to content

Commit a3e79fc

Browse files
committed
Few more fixes for pending release cleanup process
1 parent 89536a8 commit a3e79fc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cmd/ciReleaseCleanfailed.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var ciReleaseCleanfailedCmd = &cobra.Command{
8686
fmt.Printf("Deleting secret %s\n", secretName)
8787
err := clientset.CoreV1().Secrets(namespace).Delete(context.TODO(), secretName, v1.DeleteOptions{})
8888
if err != nil {
89-
log.Fatalf("Error deleting secret %s: %s", secretName, err)
89+
log.Printf("Error deleting secret %s: %s", secretName, err)
9090
}
9191
}
9292
}

cmd/ciReleaseValidate.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ var ciReleaseValidateCmd = &cobra.Command{
9393
pending_release=$(helm list -n "$NAMESPACE" --pending --filter="(\s|^)($RELEASE_NAME)(\s|$)"| tail -1 | cut -f1)
9494
9595
if [[ "$pending_release" == "$RELEASE_NAME" ]]; then
96-
upgrade_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-upgrade,name="$RELEASE_NAME" -n "$NAMESPACE" | awk '{print $1}' | grep -v NAME)
97-
install_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-install,name="$RELEASE_NAME" -n "$NAMESPACE" | awk '{print $1}' | grep -v NAME)
96+
upgrade_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-upgrade,name="$RELEASE_NAME" -n "$NAMESPACE" --no-headers | awk '{print $1}')
97+
install_secret_to_delete=$(kubectl get secret -l owner=helm,status=pending-install,name="$RELEASE_NAME" -n "$NAMESPACE" --no-headers | awk '{print $1}')
9898
9999
if [[ ! -z "$upgrade_secret_to_delete" ]] ; then
100-
kubectl delete secret -n "$NAMESPACE" "$upgrade_secret_to_delete"
100+
kubectl delete secret -n "$NAMESPACE" "$upgrade_secret_to_delete" || true
101101
fi
102102
if [[ ! -z "$install_secret_to_delete" ]] ; then
103-
kubectl delete secret -n "$NAMESPACE" "$install_secret_to_delete"
103+
kubectl delete secret -n "$NAMESPACE" "$install_secret_to_delete" || true
104104
fi
105105
fi
106106
`, namespace, releaseName)

0 commit comments

Comments
 (0)