deploy pipeline fixes

Author: osterman

codefresh/deploy.yaml

@@ -32,20 +32,15 @@ steps:
   deploy_helmfile:
     title: "Deploy with helmfile"
     stage: "Deploy"
-    image: "${{CF_DOCKER_REPO_URL}}/${{CF_REPO_NAME}}:${{CF_REVISION}}"
+    image: "${{IMAGE_NAME}}:${{IMAGE_TAG}}"
     working_directory: /deploy/
     commands:
     # Announce the release version
-    - "echo 'Preparing to deploy ${{CF_REPO_NAME}}:${{CF_RELEASE_TAG}}'"
+    - "echo 'Preparing to deploy ${{IMAGE_NAME}}:${{IMAGE_TAG}}'"
     - "apk add --update curl make bash git kubectl@cloudposse helm@cloudposse=3.1.3-r0 helmfile@cloudposse"
     - "kubectl config use-context ${{KUBE_CONTEXT}}"
     # Deploy chart to cluster in a dedicated namespace
     - "helmfile --namespace ${{NAMESPACE}} --selector preview=true sync"
-    when:
-      steps:
-      - name: ask_for_permission
-        on:
-        - approved
 
   send_slack_notification:
     title: Send notification to Slack channel

codefresh/release.yaml

@@ -47,6 +47,11 @@ steps:
       - STAGE=staging
     commands:
       - codefresh run ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}/deploy-${STAGE} -b=${{CF_BRANCH}} -v CF_RELEASE_TAG=${{CF_RELEASE_TAG}} -v CF_PRERELEASE_FLAG=${{CF_PRERELEASE_FLAG}} -v STAGE=${STAGE}
+    when:
+      steps:
+      - name: deploy_staging_confirmation
+        on:
+        - approved
 
   deploy_production_confirmation:
     type: pending-approval
@@ -60,4 +65,9 @@ steps:
     environment:
       - STAGE=prod
     commands:
-      - codefresh run ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}/deploy-${STAGE} -b=${{CF_BRANCH}} -v CF_RELEASE_TAG=${{CF_RELEASE_TAG}} -v CF_PRERELEASE_FLAG=${{CF_PRERELEASE_FLAG}} -v STAGE=${STAGE}
+      - codefresh run ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}/deploy-${STAGE} -b=${{CF_BRANCH}} -v CF_RELEASE_TAG=${{CF_RELEASE_TAG}} -v CF_PRERELEASE_FLAG=${{CF_PRERELEASE_FLAG}} -v STAGE=${STAGE}
+    when:
+      steps:
+      - name: deploy_production_confirmation
+        on:
+        - approved