From 5737f7cc904b8feccd47de79821ac2212a097c93 Mon Sep 17 00:00:00 2001 From: Jim Grady Date: Fri, 1 Jul 2022 09:45:22 -0400 Subject: [PATCH 1/5] Update image_repo references Replace references to input.image_repo with the new input names: - image_registry, and - image_registry_alias --- .github/actions/combine-deploy-update/action.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/actions/combine-deploy-update/action.yml b/.github/actions/combine-deploy-update/action.yml index 646b52b7a5..3754f167b9 100644 --- a/.github/actions/combine-deploy-update/action.yml +++ b/.github/actions/combine-deploy-update/action.yml @@ -1,9 +1,13 @@ name: "Combine Deploy Updates" description: "Deploy updated images for The Combine to the Kubernetes cluster" inputs: - image_repo: + image_registry: description: "Docker Image Repository" required: true + image_registry_alias: + description: "Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries." + required: false + default: "" image_tag: description: "Image Tag for docker images" required: true @@ -29,22 +33,22 @@ runs: - name: Update frontend run: kubectl --context ${{ inputs.kube_context }} set image deployment/frontend - frontend="${{ inputs.image_repo }}/combine_frontend:${{ inputs.image_tag }}" + frontend="${{ inputs.image_registry }}${{ inputs.image_registry_alias}}/combine_frontend:${{ inputs.image_tag }}" shell: bash - name: Update backend run: kubectl --context ${{ inputs.kube_context }} set image deployment/backend - backend="${{ inputs.image_repo }}/combine_backend:${{ inputs.image_tag }}" + backend="${{ inputs.image_registry }}${{ inputs.image_registry_alias}}/combine_backend:${{ inputs.image_tag }}" shell: bash - name: Update maintenance run: kubectl --context ${{ inputs.kube_context }} set image deployment/maintenance - maintenance="${{ inputs.image_repo }}/combine_maint:${{ inputs.image_tag }}" + maintenance="${{ inputs.image_registry }}${{ inputs.image_registry_alias}}/combine_maint:${{ inputs.image_tag }}" shell: bash - name: Update Cert Proxy Server if: ${{ inputs.update_cert_proxy == 'true' }} run: kubectl --context ${{ inputs.kube_context }} --namespace combine-cert-proxy set image deployment/combine-cert-proxy - combine-cert-proxy="${{ inputs.image_repo }}/combine_maint:${{ inputs.image_tag }}" + combine-cert-proxy="${{ inputs.image_registry }}/combine_maint:${{ inputs.image_tag }}" shell: bash From 7e8e18105c7e9918c1a980d8fedd6c9599c6daab Mon Sep 17 00:00:00 2001 From: Jim Grady Date: Fri, 1 Jul 2022 11:37:42 -0400 Subject: [PATCH 2/5] Deploy to QA when pushed to this branch (temporary) This is to test the change. --- .github/workflows/deploy_qa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml index 2ee9fcb61e..7ef0169c7a 100644 --- a/.github/workflows/deploy_qa.yml +++ b/.github/workflows/deploy_qa.yml @@ -2,7 +2,7 @@ name: "Deploy Update to QA Server" on: push: - branches: [master] + branches: [master, fix-ci-cd-repo-names] jobs: build: From 33950dada18e8686b6dbbee1911050ca14f6a7ca Mon Sep 17 00:00:00 2001 From: Jim Grady Date: Fri, 1 Jul 2022 11:51:34 -0400 Subject: [PATCH 3/5] Remove testing build --- .github/workflows/deploy_qa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml index 7ef0169c7a..2ee9fcb61e 100644 --- a/.github/workflows/deploy_qa.yml +++ b/.github/workflows/deploy_qa.yml @@ -2,7 +2,7 @@ name: "Deploy Update to QA Server" on: push: - branches: [master, fix-ci-cd-repo-names] + branches: [master] jobs: build: From 78ee21b3b0644244c6617a7f115b356b06bf47e3 Mon Sep 17 00:00:00 2001 From: Jim Grady Date: Fri, 1 Jul 2022 12:27:23 -0400 Subject: [PATCH 4/5] Fix comment --- .github/actions/combine-deploy-update/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/combine-deploy-update/action.yml b/.github/actions/combine-deploy-update/action.yml index 3754f167b9..2c978e7684 100644 --- a/.github/actions/combine-deploy-update/action.yml +++ b/.github/actions/combine-deploy-update/action.yml @@ -2,7 +2,7 @@ name: "Combine Deploy Updates" description: "Deploy updated images for The Combine to the Kubernetes cluster" inputs: image_registry: - description: "Docker Image Repository" + description: "Docker Image Registry" required: true image_registry_alias: description: "Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries." From 614fb685fb1537f5fd4c21b6c631a6cd46f13e49 Mon Sep 17 00:00:00 2001 From: Jim Grady Date: Fri, 1 Jul 2022 12:55:45 -0400 Subject: [PATCH 5/5] Update description for image_registry_alias --- .github/actions/combine-build/action.yml | 5 ++++- .github/actions/combine-deploy-update/action.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/actions/combine-build/action.yml b/.github/actions/combine-build/action.yml index 6f2af8e988..b67f8f875a 100644 --- a/.github/actions/combine-build/action.yml +++ b/.github/actions/combine-build/action.yml @@ -5,7 +5,10 @@ inputs: description: "Docker Image Registry" required: true image_registry_alias: - description: "Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries." + description: > + Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries. + If the image_registry_alias is specified, include the '/' at the beginning of the string, + e.g. /thecombine required: false default: "" aws_access_key_id: diff --git a/.github/actions/combine-deploy-update/action.yml b/.github/actions/combine-deploy-update/action.yml index 2c978e7684..0f3c381598 100644 --- a/.github/actions/combine-deploy-update/action.yml +++ b/.github/actions/combine-deploy-update/action.yml @@ -5,7 +5,10 @@ inputs: description: "Docker Image Registry" required: true image_registry_alias: - description: "Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries." + description: > + Custom or default alias for AWS Public ECR registries. Blank for AWS ECR Private registries. + If the image_registry_alias is specified, include the '/' at the beginning of the string, + e.g. /thecombine required: false default: "" image_tag: