From 0c601553f34ec75090b5a0dc34f97293445f426b Mon Sep 17 00:00:00 2001
From: Erik Osterman <erik@cloudposse.com>
Date: Tue, 16 Jun 2020 02:48:06 -0700
Subject: [PATCH 1/2] cosmetic changes

---
 codefresh/build.yaml   | 4 ++--
 codefresh/deploy.yaml  | 2 +-
 codefresh/preview.yaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/codefresh/build.yaml b/codefresh/build.yaml
index b024d46..7f5f961 100644
--- a/codefresh/build.yaml
+++ b/codefresh/build.yaml
@@ -38,9 +38,9 @@ steps:
     stage: "Deploy"
     image: 'codefresh/cli:latest'
     environment:
-      STAGE: master
+    - STAGE=master
     commands:
-      - codefresh run ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}/deploy-${{STAGE}} -d -b=${{CF_BRANCH}} -v CF_RELEASE_TAG=${{CF_REVISION}} -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 CF_SHORT_REVISION=${{CF_SHORT_REVISION}} -v CF_COMMIT_URL=${{CF_COMMIT_URL}} -v CF_COMMIT_MESSAGE="Release ${{CF_RELEASE_TAG}}" -v CF_COMMIT_AUTHOR=${{CF_COMMIT_AUTHOR}} -v CF_BRANCH_TAG_NORMALIZED=${{CF_BRANCH_TAG_NORMALIZED}} -v STAGE=${STAGE}
     when:
       branch:
         only:
diff --git a/codefresh/deploy.yaml b/codefresh/deploy.yaml
index 2427d2c..acf8bf5 100644
--- a/codefresh/deploy.yaml
+++ b/codefresh/deploy.yaml
@@ -51,7 +51,7 @@ steps:
     working_directory: /build-harness
     environment:
       - PIPELINE_ENV=${{STAGE}}
-      - CHART_NAME=monochart
+      - CHART_NAME=${{CF_REPO_NAME}}
       - GIT_COMMIT_SHORT=${{CF_SHORT_REVISION}}
       - GIT_COMMIT_URL=${{CF_COMMIT_URL}}
       - GIT_COMMIT_MESSAGE=${{CF_COMMIT_MESSAGE}}
diff --git a/codefresh/preview.yaml b/codefresh/preview.yaml
index d00fe96..de095da 100644
--- a/codefresh/preview.yaml
+++ b/codefresh/preview.yaml
@@ -26,8 +26,8 @@ steps:
     - cf_export GIT_BRANCH=${{CF_BRANCH}}
     - cf_export PROJECT=${{CF_REPO_NAME}}
     - cf_export APP_NAME=${{CF_REPO_NAME}}
-    - cf_export CHART_NAME=monochart
-    - cf_export PIPELINE_ENV=integration
+    - cf_export CHART_NAME=${{CF_REPO_NAME}}
+    - cf_export PIPELINE_ENV=preview
     - cf_export NAMESPACE=pr-${{CF_PULL_REQUEST_NUMBER}}-${{CF_REPO_NAME}}
     - cf_export RELEASE_NAME=${{CF_REPO_NAME}}
     - cf_export APP_SCHEME=http

From 1277aba3628d016e5bc6d1b738e9bb9bbecdb878 Mon Sep 17 00:00:00 2001
From: Erik Osterman <erik@cloudposse.com>
Date: Tue, 16 Jun 2020 02:54:51 -0700
Subject: [PATCH 2/2] add temp fix

---
 codefresh/preview.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/codefresh/preview.yaml b/codefresh/preview.yaml
index de095da..653d69a 100644
--- a/codefresh/preview.yaml
+++ b/codefresh/preview.yaml
@@ -140,6 +140,8 @@ steps:
     # Downgrade to helm 3.1.3: https://github.com/helm/helm/issues/7956
     - "apk add --update curl make bash git kubectl@cloudposse helm@cloudposse=3.1.3-r0 helmfile@cloudposse"
     - "kubectl config use-context ${{KUBE_CONTEXT}}"
+    # Temporary fix related to #7956 preventing us from upgrading to helm > 3.2.0
+    - kubectl create namespace ${{NAMESPACE}} >/dev/null 2>&1 || true
     # Deploy chart to cluster in a dedicated namespace
     - "helmfile --namespace ${{NAMESPACE}} --selector preview=true sync"
     when: