From 7e018d2b52f3126437262711b08b0f095683d828 Mon Sep 17 00:00:00 2001 From: Baligh Mehrez Date: Thu, 8 Jun 2023 18:34:12 +0300 Subject: [PATCH] modify github actions --- .dockerignore | 4 -- .github/workflows/TheArchitectsVault-WF.yaml | 65 ------------------- .github/workflows/basket-api-deploy.yml | 1 - .github/workflows/basket-api.yml | 4 +- .github/workflows/catalog-api-deploy.yml | 1 - .github/workflows/catalog-api.yml | 4 +- .../composite/deploy-helm/action.yml | 10 ++- .github/workflows/identity-api-deploy.yml | 1 - .github/workflows/identity-api.yml | 4 +- .../workflows/mobileshoppingagg-deploy.yml | 1 - .github/workflows/mobileshoppingagg.yml | 4 +- .github/workflows/ordering-api-deploy.yml | 1 - .github/workflows/ordering-api.yml | 4 +- .../ordering-backgroundtasks-deploy.yml | 1 - .../workflows/ordering-backgroundtasks.yml | 4 +- .../workflows/ordering-signalrhub-deploy.yml | 1 - .github/workflows/ordering-signalrhub.yml | 4 +- .github/workflows/payment-api-deploy.yml | 1 - .github/workflows/payment-api.yml | 4 +- .github/workflows/webhooks-api-deploy.yml | 1 - .github/workflows/webhooks-api.yml | 4 +- .github/workflows/webhooks-client.yml | 4 +- .github/workflows/webmvc-deploy.yml | 5 +- .github/workflows/webmvc.yml | 4 +- .github/workflows/webshoppingagg-deploy.yml | 1 - .github/workflows/webshoppingagg.yml | 4 +- .github/workflows/webspa-deploy.yml | 1 - .github/workflows/webspa.yml | 4 +- .github/workflows/webstatus-deploy.yml | 1 - .github/workflows/webstatus.yml | 4 +- Dockerfile | 21 ------ manifests/deployment.yaml | 22 ------- manifests/service.yaml | 13 ---- 33 files changed, 35 insertions(+), 173 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .github/workflows/TheArchitectsVault-WF.yaml delete mode 100644 Dockerfile delete mode 100644 manifests/deployment.yaml delete mode 100644 manifests/service.yaml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index ac690088e..000000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -Dockerfile -charts/ -bin/ -obj/ diff --git a/.github/workflows/TheArchitectsVault-WF.yaml b/.github/workflows/TheArchitectsVault-WF.yaml deleted file mode 100644 index 44e222ae6..000000000 --- a/.github/workflows/TheArchitectsVault-WF.yaml +++ /dev/null @@ -1,65 +0,0 @@ -name: TheArchitectsVault-WF -"on": - push: - branches: - - dev - workflow_dispatch: {} -env: - ACR_RESOURCE_GROUP: TheArchitectsVault_group - AZURE_CONTAINER_REGISTRY: acrworkflow1686232508452 - CLUSTER_NAME: TheArchitectsVault - CLUSTER_RESOURCE_GROUP: TheArchitectsVault_group - CONTAINER_NAME: image-workflow-1686232508452 - DEPLOYMENT_MANIFEST_PATH: | - manifests/deployment.yaml - manifests/service.yaml -jobs: - buildImage: - permissions: - contents: read - id-token: write - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 - name: Azure login - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - - name: Build and push image to ACR - run: az acr build --image ${{ env.CONTAINER_NAME }}:${{ github.sha }} --registry ${{ env.AZURE_CONTAINER_REGISTRY }} -g ${{ env.ACR_RESOURCE_GROUP }} -f Dockerfile ./ - deploy: - permissions: - actions: read - contents: read - id-token: write - runs-on: ubuntu-latest - needs: - - buildImage - steps: - - uses: actions/checkout@v3 - - uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 - name: Azure login - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - - uses: azure/use-kubelogin@v1 - name: Set up kubelogin for non-interactive login - with: - kubelogin-version: v0.0.25 - - uses: azure/aks-set-context@v3 - name: Get K8s context - with: - admin: "false" - cluster-name: ${{ env.CLUSTER_NAME }} - resource-group: ${{ env.CLUSTER_RESOURCE_GROUP }} - use-kubelogin: "true" - - uses: Azure/k8s-deploy@v4 - name: Deploys application - with: - action: deploy - images: ${{ env.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ env.CONTAINER_NAME }}:${{ github.sha }} - manifests: ${{ env.DEPLOYMENT_MANIFEST_PATH }} - namespace: namespace-workflow-1686232508452 diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 38c16ed2e..61fd6155c 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index d8b19993b..89014ea3b 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index 804469296..bd546b088 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/catalog-api.yml b/.github/workflows/catalog-api.yml index 6def653d0..1f47dbeb5 100644 --- a/.github/workflows/catalog-api.yml +++ b/.github/workflows/catalog-api.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-test with: @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/composite/deploy-helm/action.yml b/.github/workflows/composite/deploy-helm/action.yml index 5bcb4ea16..1d0980875 100644 --- a/.github/workflows/composite/deploy-helm/action.yml +++ b/.github/workflows/composite/deploy-helm/action.yml @@ -2,9 +2,6 @@ name: "Deploy Helm to AKS" description: "Deploys a helm chart to AKS" inputs: - azure_credentials: - description: "Credentials to connect to AKS" - required: true cluster_name: description: "Name of AKS cluster" required: true @@ -29,12 +26,13 @@ runs: steps: - uses: azure/login@v1 with: - creds: ${{ inputs.azure_credentials }} + client-id: ${{ secrets.AZURE_CLIENT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} - - uses: azure/aks-set-context@v1 + - uses: azure/aks-set-context@v3 name: Set AKS context with: - creds: '${{ inputs.azure_credentials }}' cluster-name: ${{ inputs.cluster_name }} resource-group: ${{ inputs.resource_group }} diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index c2c0df936..88a84bae8 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/identity-api.yml b/.github/workflows/identity-api.yml index 71dc79948..eaec5b79c 100644 --- a/.github/workflows/identity-api.yml +++ b/.github/workflows/identity-api.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index bfe6fa967..2f078ed7f 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/mobileshoppingagg.yml b/.github/workflows/mobileshoppingagg.yml index f05e5e299..14723245a 100644 --- a/.github/workflows/mobileshoppingagg.yml +++ b/.github/workflows/mobileshoppingagg.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index e689d06a4..3af0c3ac9 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/ordering-api.yml b/.github/workflows/ordering-api.yml index 617fba8d7..808c08e24 100644 --- a/.github/workflows/ordering-api.yml +++ b/.github/workflows/ordering-api.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-test with: @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index 1b3b7245e..6eaff1e03 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/ordering-backgroundtasks.yml b/.github/workflows/ordering-backgroundtasks.yml index 0f5a535d8..c80664651 100644 --- a/.github/workflows/ordering-backgroundtasks.yml +++ b/.github/workflows/ordering-backgroundtasks.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 455cf7f1d..ccf896248 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/ordering-signalrhub.yml b/.github/workflows/ordering-signalrhub.yml index 37d910e53..5cef47857 100644 --- a/.github/workflows/ordering-signalrhub.yml +++ b/.github/workflows/ordering-signalrhub.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index 2f37988ed..b14e2c8f6 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/payment-api.yml b/.github/workflows/payment-api.yml index 66c941152..0f6306d98 100644 --- a/.github/workflows/payment-api.yml +++ b/.github/workflows/payment-api.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index 4d74a38e6..502daca9a 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/webhooks-api.yml b/.github/workflows/webhooks-api.yml index bee7b76b3..df29fab20 100644 --- a/.github/workflows/webhooks-api.yml +++ b/.github/workflows/webhooks-api.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/webhooks-client.yml b/.github/workflows/webhooks-client.yml index 1c49a8a5d..3c44cca17 100644 --- a/.github/workflows/webhooks-client.yml +++ b/.github/workflows/webhooks-client.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index e70cefed2..4c96f5548 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -26,11 +26,12 @@ jobs: - uses: azure/login@v1 with: - creds: ${{ secrets.AZURE_CREDENTIALS }} + client-id: ${{ secrets.AZURE_CLIENT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/webmvc.yml b/.github/workflows/webmvc.yml index 66fcf06bc..d83161c5e 100644 --- a/.github/workflows/webmvc.yml +++ b/.github/workflows/webmvc.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 2b4bcaf12..7a88bdabf 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/webshoppingagg.yml b/.github/workflows/webshoppingagg.yml index 93bc05e09..f08cf3ae6 100644 --- a/.github/workflows/webshoppingagg.yml +++ b/.github/workflows/webshoppingagg.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 2851f6962..2de721ad4 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/webspa.yml b/.github/workflows/webspa.yml index 769a6bdcf..386aed136 100644 --- a/.github/workflows/webspa.yml +++ b/.github/workflows/webspa.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index 866a46a5f..2c3e5d0eb 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -26,7 +26,6 @@ jobs: - uses: ./.github/workflows/composite/deploy-helm with: - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} cluster_name: ${{ secrets.CLUSTER_NAME }} resource_group: ${{ secrets.RESOURCE_GROUP }} registry_host: ${{ secrets.REGISTRY_HOST }} diff --git a/.github/workflows/webstatus.yml b/.github/workflows/webstatus.yml index 0cbb89c6a..aae4d660f 100644 --- a/.github/workflows/webstatus.yml +++ b/.github/workflows/webstatus.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build with: @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} steps: - - name: Checkout code + - name: Checkout source code uses: actions/checkout@v2 - uses: ./.github/workflows/composite/build-push with: diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0008a88a7..000000000 --- a/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder -WORKDIR /app - -# caches restore result by copying csproj file separately -COPY *.csproj . -RUN dotnet restore - -COPY . . -RUN dotnet publish --output /app/ --configuration Release --no-restore -RUN sed -n 's:.*\(.*\).*:\1:p' *.csproj > __assemblyname -RUN if [ ! -s __assemblyname ]; then filename=$(ls *.csproj); echo ${filename%.*} > __assemblyname; fi - -# Stage 2 -FROM mcr.microsoft.com/dotnet/aspnet:7.0 -WORKDIR /app -COPY --from=builder /app . - -ENV PORT 5000 -EXPOSE 5000 - -ENTRYPOINT dotnet $(cat /app/__assemblyname).dll --urls "http://*:5000" diff --git a/manifests/deployment.yaml b/manifests/deployment.yaml deleted file mode 100644 index e09453583..000000000 --- a/manifests/deployment.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: TheArchitectsVault-WF - labels: - app: TheArchitectsVault-WF - namespace: namespace-workflow-1686232508452 -spec: - replicas: 1 - selector: - matchLabels: - app: TheArchitectsVault-WF - template: - metadata: - labels: - app: TheArchitectsVault-WF - spec: - containers: - - name: TheArchitectsVault-WF - image: acrworkflow1686232508452.azurecr.io/image-workflow-1686232508452:latest - ports: - - containerPort: 5000 \ No newline at end of file diff --git a/manifests/service.yaml b/manifests/service.yaml deleted file mode 100644 index 69ec8c3f3..000000000 --- a/manifests/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: TheArchitectsVault-WF - namespace: namespace-workflow-1686232508452 -spec: - type: LoadBalancer - selector: - app: TheArchitectsVault-WF - ports: - - protocol: TCP - port: 5000 - targetPort: 5000 \ No newline at end of file