Merge remote-tracking branch 'origin/development' into development

PandaTechAM · Dec 14, 2023 · 9cd7030 · 9cd7030
2 parents 48c6d24 + 900f6ed
commit 9cd7030
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 16 deletions.
diff --git a/.github/Templates/All in one/main.yml b/.github/Templates/All in one/main.yml
@@ -23,22 +23,18 @@ jobs:
       - name: Set Environment Variables
         run: |
           if [ "${{ github.ref }}" == "refs/heads/development" ]; then
-              echo "DEPLOYMENT_ENV=dev" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Development" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=dev" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=dev" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/qa" ]; then
-              echo "DEPLOYMENT_ENV=qa" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=QA" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=qa" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=qa" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/staging" ]; then
-              echo "DEPLOYMENT_ENV=staging" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Staging" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=staging" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=staging" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/main" ]; then
-              echo "DEPLOYMENT_ENV=prod" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Production" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=prod" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=prod" >> $GITHUB_ENV

diff --git a/.github/Templates/Seperate production/main.yml b/.github/Templates/Seperate production/main.yml
@@ -22,17 +22,14 @@ jobs:
       - name: Set Environment Variables
         run: |
           if [ "${{ github.ref }}" == "refs/heads/development" ]; then
-              echo "DEPLOYMENT_ENV=dev" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Development" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=dev" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=dev" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/qa" ]; then
-              echo "DEPLOYMENT_ENV=qa" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=QA" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=qa" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=qa" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/staging" ]; then
-              echo "DEPLOYMENT_ENV=staging" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Staging" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=staging" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=staging" >> $GITHUB_ENV

diff --git a/.github/Templates/Seperate production/prod.yml b/.github/Templates/Seperate production/prod.yml
@@ -14,7 +14,6 @@ env:
   DOCKER_REPO_BASE: "repopanda.pandatech.it/pandatech/repository/pandatech"
   DOCKER_REPO_PATH: "prod"
   K8S_NAMESPACE: "prod"
-  DEPLOYMENT_ENV: "prod"
   ASPNETCORE_ENVIRONMENT: "Production"
 
 jobs:

diff --git a/.github/Templates/Seperate/dev.yml b/.github/Templates/Seperate/dev.yml
@@ -14,7 +14,6 @@ env:
   DOCKER_REPO_BASE: "repopanda.pandatech.it/pandatech/repository/pandatech"
   DOCKER_REPO_PATH: "dev"
   K8S_NAMESPACE: "dev"
-  DEPLOYMENT_ENV: "dev"
   ASPNETCORE_ENVIRONMENT: "Development"
 
 jobs:

diff --git a/.github/Templates/Seperate/prod.yml b/.github/Templates/Seperate/prod.yml
@@ -14,7 +14,6 @@ env:
   DOCKER_REPO_BASE: "repopanda.pandatech.it/pandatech/repository/pandatech"
   DOCKER_REPO_PATH: "prod"
   K8S_NAMESPACE: "prod"
-  DEPLOYMENT_ENV: "prod"
   ASPNETCORE_ENVIRONMENT: "Production"
 
 jobs:

diff --git a/.github/Templates/Seperate/qa.yml b/.github/Templates/Seperate/qa.yml
@@ -14,7 +14,6 @@ env:
   DOCKER_REPO_BASE: "repopanda.pandatech.it/pandatech/repository/pandatech"
   DOCKER_REPO_PATH: "qa"
   K8S_NAMESPACE: "qa"
-  DEPLOYMENT_ENV: "qa"
   ASPNETCORE_ENVIRONMENT: "QA"
 
 jobs:

diff --git a/.github/Templates/Seperate/staging.yml b/.github/Templates/Seperate/staging.yml
@@ -14,7 +14,6 @@ env:
   DOCKER_REPO_BASE: "repopanda.pandatech.it/pandatech/repository/pandatech"
   DOCKER_REPO_PATH: "staging"
   K8S_NAMESPACE: "staging"
-  DEPLOYMENT_ENV: "staging"
   ASPNETCORE_ENVIRONMENT: "Staging"
 
 jobs:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,17 +22,14 @@ jobs:
       - name: Set Environment Variables
         run: |
           if [ "${{ github.ref }}" == "refs/heads/development" ]; then
-              echo "DEPLOYMENT_ENV=dev" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Development" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=dev" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=dev" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/qa" ]; then
-              echo "DEPLOYMENT_ENV=qa" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=QA" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=qa" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=qa" >> $GITHUB_ENV
           elif [ "${{ github.ref }}" == "refs/heads/staging" ]; then
-              echo "DEPLOYMENT_ENV=staging" >> $GITHUB_ENV
               echo "ASPNETCORE_ENVIRONMENT=Staging" >> $GITHUB_ENV
               echo "DOCKER_REPO_PATH=staging" >> $GITHUB_ENV
               echo "K8S_NAMESPACE=staging" >> $GITHUB_ENV

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -14,7 +14,6 @@ env:
   DOCKER_REPO_BASE: "repopanda.pandatech.it/pandatech/repository/pandatech"
   DOCKER_REPO_PATH: "prod"
   K8S_NAMESPACE: "prod"
-  DEPLOYMENT_ENV: "prod"
   ASPNETCORE_ENVIRONMENT: "Production"
 
 jobs: