Skip to content

Commit da5667f

Browse files
authored
cosmetic changes (#11)
* cosmetic changes * add temp fix
1 parent 41d2e9b commit da5667f

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

codefresh/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ steps:
3838
stage: "Deploy"
3939
image: 'codefresh/cli:latest'
4040
environment:
41-
STAGE: master
41+
- STAGE=master
4242
commands:
43-
- 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}}
43+
- 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}
4444
when:
4545
branch:
4646
only:

codefresh/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ steps:
5151
working_directory: /build-harness
5252
environment:
5353
- PIPELINE_ENV=${{STAGE}}
54-
- CHART_NAME=monochart
54+
- CHART_NAME=${{CF_REPO_NAME}}
5555
- GIT_COMMIT_SHORT=${{CF_SHORT_REVISION}}
5656
- GIT_COMMIT_URL=${{CF_COMMIT_URL}}
5757
- GIT_COMMIT_MESSAGE=${{CF_COMMIT_MESSAGE}}

codefresh/preview.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ steps:
2626
- cf_export GIT_BRANCH=${{CF_BRANCH}}
2727
- cf_export PROJECT=${{CF_REPO_NAME}}
2828
- cf_export APP_NAME=${{CF_REPO_NAME}}
29-
- cf_export CHART_NAME=monochart
30-
- cf_export PIPELINE_ENV=integration
29+
- cf_export CHART_NAME=${{CF_REPO_NAME}}
30+
- cf_export PIPELINE_ENV=preview
3131
- cf_export NAMESPACE=pr-${{CF_PULL_REQUEST_NUMBER}}-${{CF_REPO_NAME}}
3232
- cf_export RELEASE_NAME=${{CF_REPO_NAME}}
3333
- cf_export APP_SCHEME=http
@@ -140,6 +140,8 @@ steps:
140140
# Downgrade to helm 3.1.3: https://github.com/helm/helm/issues/7956
141141
- "apk add --update curl make bash git kubectl@cloudposse helm@cloudposse=3.1.3-r0 helmfile@cloudposse"
142142
- "kubectl config use-context ${{KUBE_CONTEXT}}"
143+
# Temporary fix related to #7956 preventing us from upgrading to helm > 3.2.0
144+
- kubectl create namespace ${{NAMESPACE}} >/dev/null 2>&1 || true
143145
# Deploy chart to cluster in a dedicated namespace
144146
- "helmfile --namespace ${{NAMESPACE}} --selector preview=true sync"
145147
when:

0 commit comments

Comments
 (0)