diff --git a/.github/workflows/deploy-generic.yml b/.github/workflows/deploy-generic.yml index 8d8b398b..160d8e7c 100644 --- a/.github/workflows/deploy-generic.yml +++ b/.github/workflows/deploy-generic.yml @@ -7,14 +7,6 @@ on: description: "which environment to deploy to" required: true type: string - ecr_repository: - description: "ecr repo to hold container image" - required: true - type: string - ecr_region: - description: "ecr region to hold container image" - required: true - type: string secrets: kube_namespace: description: "the kubernetes namespace to deploy to" @@ -68,7 +60,7 @@ jobs: id: build-docker-image env: REGISTRY: ${{ steps.login-to-ecr.outputs.registry }} - REPOSITORY: ${{ inputs.ECR_REPOSITORY }} + REPOSITORY: ${{ vars.ECR_REPOSITORY }} IMAGE_TAG: ${{ github.sha }} run: docker build -t $REGISTRY/$REPOSITORY:$IMAGE_TAG . @@ -76,7 +68,7 @@ jobs: id: push-docker-image-to-ecr env: REGISTRY: ${{ steps.login-to-ecr.outputs.registry }} - REPOSITORY: ${{ inputs.ECR_REPOSITORY }} + REPOSITORY: ${{ vars.ECR_REPOSITORY }} IMAGE_TAG: ${{ github.sha }} run: docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG @@ -93,7 +85,7 @@ jobs: CATALOGUE_TOKEN: ${{ secrets.CATALOGUE_TOKEN }} IMAGE_TAG: ${{ github.sha }} REGISTRY: ${{ steps.login-to-ecr.outputs.registry }} - REPOSITORY: ${{ inputs.ECR_REPOSITORY }} + REPOSITORY: ${{ vars.ECR_REPOSITORY }} NAMESPACE: ${{ secrets.KUBE_NAMESPACE }} ENABLE_ANALYTICS: ${{ vars.ENABLE_ANALYTICS }} ANALYTICS_ID: ${{ vars.ANALYTICS_ID }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2bb75ee5..4e706361 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,8 +9,6 @@ jobs: uses: "./.github/workflows/deploy-generic.yml" with: env: "dev" - ecr_repository: ${{ vars.DEV_ECR_REPOSITORY }} - ecr_region: ${{ vars.DEV_ECR_REGION }} secrets: kube_namespace: ${{ secrets.KUBE_NAMESPACE }} kube_cert: ${{ secrets.KUBE_CERT }} @@ -28,8 +26,6 @@ jobs: needs: dev with: env: "test" - ecr_repository: ${{ vars.TEST_ECR_REPOSITORY }} - ecr_region: ${{ vars.TEST_ECR_REGION }} secrets: kube_namespace: ${{ secrets.KUBE_NAMESPACE }} kube_cert: ${{ secrets.KUBE_CERT }} @@ -46,8 +42,6 @@ jobs: needs: test with: env: "preprod" - ecr_repository: ${{ vars.PREPROD_ECR_REPOSITORY }} - ecr_region: ${{ vars.PREPROD_ECR_REGION }} secrets: kube_namespace: ${{ secrets.KUBE_NAMESPACE }} kube_cert: ${{ secrets.KUBE_CERT }} diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index c544bf3b..95cd380e 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -115,8 +115,6 @@ jobs: uses: "./.github/workflows/deploy-generic.yml" with: env: "dev" - ecr_repository: ${{ vars.DEV_ECR_REPOSITORY }} - ecr_region: ${{ vars.DEV_ECR_REGION }} secrets: kube_namespace: ${{ secrets.KUBE_NAMESPACE }} kube_cert: ${{ secrets.KUBE_CERT }}