bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-12 14:23:18 +00:00
Code Issues Releases Wiki Activity

Change QA deploy SP & Re-enable feature branch deploy (#1358)

Browse Source
This commit is contained in:
Joseph Flinn
2021-12-23 06:14:10 -08:00
committed by GitHub
parent bc82ae961e
commit a71ce448f4
3 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build.yml vendored
View File

@@ -304,21 +304,21 @@ jobs:
docker --version docker --version
docker build -t bitwardenqa.azurecr.io/web . docker build -t bitwardenqa.azurecr.io/web .
# - name: Get image tag - name: Get image tag
# id: image-tag id: image-tag
# run: | run: |
# IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}') IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
# TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }} TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }}
# if [[ $TAG_EXTENSION ]]; then if [[ $TAG_EXTENSION ]]; then
# IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION
# fi fi
# echo "::set-output name=value::$IMAGE_TAG" echo "::set-output name=value::$IMAGE_TAG"
# - name: Tag image - name: Tag image
# env: env:
# IMAGE_TAG: ${{ steps.image-tag.outputs.value }} IMAGE_TAG: ${{ steps.image-tag.outputs.value }}
# run: docker tag bitwardenqa.azurecr.io/web "bitwardenqa.azurecr.io/web:$IMAGE_TAG" run: docker tag bitwardenqa.azurecr.io/web "bitwardenqa.azurecr.io/web:$IMAGE_TAG"
- name: Tag dev - name: Tag dev
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
@@ -327,10 +327,10 @@ jobs:
- name: List Docker images - name: List Docker images
run: docker images run: docker images
# - name: Push image - name: Push image
# env: env:
# IMAGE_TAG: ${{ steps.image-tag.outputs.value }} IMAGE_TAG: ${{ steps.image-tag.outputs.value }}
# run: docker push "bitwardenqa.azurecr.io/web:$IMAGE_TAG" run: docker push "bitwardenqa.azurecr.io/web:$IMAGE_TAG"
- name: Push dev images - name: Push dev images
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'

35
.github/workflows/qa-deploy.yml vendored
View File

@@ -9,8 +9,8 @@ on:
required: false required: false
env: env:
_QA_CLUSTER_RESOURCE_GROUP: "bitwarden-devops" _QA_CLUSTER_RESOURCE_GROUP: "bw-env-qa"
_QA_CLUSTER_NAME: "dev-aks" _QA_CLUSTER_NAME: "bw-aks-qa"
_QA_K8S_NAMESPACE: "bw-qa" _QA_K8S_NAMESPACE: "bw-qa"
_QA_K8S_APP_NAME: "bw-web" _QA_K8S_APP_NAME: "bw-web"
@@ -35,37 +35,36 @@ jobs:
uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403 uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
with: with:
keyvault: "bitwarden-qa-kv" keyvault: "bitwarden-qa-kv"
secrets: "dev-aks-kubectl-credentials" secrets: "qa-aks-kubectl-credentials"
- name: Login to dev-aks-kubectl SP - name: Login with qa-aks-kubectl-credentials SP
uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
with: with:
creds: ${{ env.dev-aks-kubectl-credentials }} creds: ${{ env.qa-aks-kubectl-credentials }}
- name: Setup AKS access - name: Setup AKS access
env: #env:
USER_ID: ${{ env.qa-kubectl-managed-identity-clientId }} # USER_ID: ${{ env.qa-kubectl-managed-identity-clientId }}
run: | run: |
echo "---az install---" echo "---az install---"
az aks install-cli --install-location ./kubectl --kubelogin-install-location ./kubelogin az aks install-cli --install-location ./kubectl --kubelogin-install-location ./kubelogin
echo "---az get-creds---" echo "---az get-creds---"
az aks get-credentials -n $_QA_CLUSTER_NAME -g $_QA_CLUSTER_RESOURCE_GROUP az aks get-credentials -n $_QA_CLUSTER_NAME -g $_QA_CLUSTER_RESOURCE_GROUP
# - name: Get image tag - name: Get image tag
# id: image_tag id: image_tag
# run: | run: |
# IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}') IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
# TAG_EXTENSION=${{ github.event.inputs.image_extension }} TAG_EXTENSION=${{ github.event.inputs.image_extension }}
# if [[ $TAG_EXTENSION ]]; then if [[ $TAG_EXTENSION ]]; then
# IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION
# fi fi
# echo "::set-output name=value::$IMAGE_TAG" echo "::set-output name=value::$IMAGE_TAG"
- name: Deploy Web image - name: Deploy Web image
env: env:
# IMAGE_TAG: ${{ steps.image_tag.outputs.value }} IMAGE_TAG: ${{ steps.image_tag.outputs.value }}
IMAGE_TAG: dev
run: | run: |
kubectl set image -n $_QA_K8S_NAMESPACE deployment/web web=bitwardenqa.azurecr.io/web:$IMAGE_TAG --record kubectl set image -n $_QA_K8S_NAMESPACE deployment/web web=bitwardenqa.azurecr.io/web:$IMAGE_TAG --record
kubectl rollout restart -n $_QA_K8S_NAMESPACE deployment/web kubectl rollout restart -n $_QA_K8S_NAMESPACE deployment/web