From ba173ac76e068816d3c3f8dc1ea1a360430f6adb Mon Sep 17 00:00:00 2001 From: Calle Veale Date: Sun, 30 May 2021 08:11:42 +0200 Subject: [PATCH] Implemented push to ACI --- .github/workflows/ordering-api-deploy.yml | 34 +++++++------------ .../ordering-backgroundtasks-deploy.yml | 34 +++++++------------ .../workflows/ordering-signalrhub-deploy.yml | 34 +++++++------------ 3 files changed, 36 insertions(+), 66 deletions(-) diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 0ae9d28cb..c91b6a1a1 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -16,9 +16,8 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - deploy-to-k8s: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} - if: false + deploy-to-aci: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: @@ -28,23 +27,14 @@ jobs: with: creds: ${{ secrets.AZURE_CREDENTIALS }} - - uses: azure/aks-set-context@v1 - name: Set AKS context + - name: 'Deploy to Azure Container Instances' + uses: 'azure/aci-deploy@v1' with: - creds: '${{ secrets.AZURE_CREDENTIALS }}' - cluster-name: ${{ secrets.CLUSTER_NAME }} - resource-group: ${{ secrets.RESOURCE_GROUP }} - - - name: Set branch name as env variable - run: | - currentbranch=$(echo ${GITHUB_REF##*/}) - echo "running on $currentbranch" - echo "BRANCH=$currentbranch" >> $GITHUB_ENV - shell: bash - - - name: Deploy Chart - run: | - ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected - env: - TAG: ${{ env.BRANCH }} - working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file + resource-group: aci-test-rg + dns-name-label: aci-test-rg${{ github.run_number }} + image: ${{ secrets.REGISTRY_LOGIN_SERVER }}/variableclass/ordering.api:latest + registry-login-server: ghcr.io + registry-username: ${{ github.repository_owner }} + registry-password: ${{ secrets.GITHUB_TOKEN }} + name: aci-ordering.api-test + location: 'west us' \ No newline at end of file diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index 65eab8148..a683c50bb 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -16,9 +16,8 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - deploy-to-k8s: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} - if: false + deploy-to-aci: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: @@ -28,23 +27,14 @@ jobs: with: creds: ${{ secrets.AZURE_CREDENTIALS }} - - uses: azure/aks-set-context@v1 - name: Set AKS context + - name: 'Deploy to Azure Container Instances' + uses: 'azure/aci-deploy@v1' with: - creds: '${{ secrets.AZURE_CREDENTIALS }}' - cluster-name: ${{ secrets.CLUSTER_NAME }} - resource-group: ${{ secrets.RESOURCE_GROUP }} - - - name: Set branch name as env variable - run: | - currentbranch=$(echo ${GITHUB_REF##*/}) - echo "running on $currentbranch" - echo "BRANCH=$currentbranch" >> $GITHUB_ENV - shell: bash - - - name: Deploy Chart - run: | - ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected - env: - TAG: ${{ env.BRANCH }} - working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file + resource-group: aci-test-rg + dns-name-label: aci-test-rg${{ github.run_number }} + image: ${{ secrets.REGISTRY_LOGIN_SERVER }}/variableclass/ordering.backgroundtasks:latest + registry-login-server: ghcr.io + registry-username: ${{ github.repository_owner }} + registry-password: ${{ secrets.GITHUB_TOKEN }} + name: aci-ordering.backgroundtasks-test + location: 'west us' \ No newline at end of file diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index d7842a30f..a24052593 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -16,9 +16,8 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - deploy-to-k8s: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} - if: false + deploy-to-aci: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: @@ -28,23 +27,14 @@ jobs: with: creds: ${{ secrets.AZURE_CREDENTIALS }} - - uses: azure/aks-set-context@v1 - name: Set AKS context + - name: 'Deploy to Azure Container Instances' + uses: 'azure/aci-deploy@v1' with: - creds: '${{ secrets.AZURE_CREDENTIALS }}' - cluster-name: ${{ secrets.CLUSTER_NAME }} - resource-group: ${{ secrets.RESOURCE_GROUP }} - - - name: Set branch name as env variable - run: | - currentbranch=$(echo ${GITHUB_REF##*/}) - echo "running on $currentbranch" - echo "BRANCH=$currentbranch" >> $GITHUB_ENV - shell: bash - - - name: Deploy Chart - run: | - ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected - env: - TAG: ${{ env.BRANCH }} - working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file + resource-group: aci-test-rg + dns-name-label: aci-test-rg${{ github.run_number }} + image: ${{ secrets.REGISTRY_LOGIN_SERVER }}/variableclass/ordering.signalrhub:latest + registry-login-server: ghcr.io + registry-username: ${{ github.repository_owner }} + registry-password: ${{ secrets.GITHUB_TOKEN }} + name: aci-ordering.signalrhub-test + location: 'west us' \ No newline at end of file