From 4114d7f5eca8041f2532c73076263d8ebe4c70dd Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Fri, 14 Mar 2025 15:03:46 +0530 Subject: [PATCH 01/10] add eks deployment pipeline for conductor server --- .github/workflows/cd-server.yaml | 101 +++++++++++------------------- .github/workflows/ci-server-.yaml | 6 -- 2 files changed, 37 insertions(+), 70 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index 1b4bba94b4..e24aeeea1e 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -15,11 +15,15 @@ on: required: true type: string description: Provide tag (Eg:v3.14.0) - +permissions: + id-token: write + contents: write + packages: read + actions: read env: SERVICE_NAME: conductor-server AWS_REGION: "ap-south-1" - + HELM_CHART_NAME: "application-helm-chart" jobs: prepare-env: @@ -30,13 +34,12 @@ jobs: AWS_ROLE: ${{ steps.vars.outputs.AWS_ROLE }} ENV: ${{ steps.vars.outputs.ENV }} PROJECT_PREFIX: ${{ steps.vars.outputs.PROJECT_PREFIX }} - ECS_CLUSTER: ${{ steps.set_env.outputs.ECS_CLUSTER }} - ECS_SERVICE: ${{ steps.set_env.outputs.ECS_SERVICE }} - TASK_DEFINITION: ${{ steps.set_env.outputs.TASK_DEFINITION }} - CONTAINER_NAME: ${{ steps.set_env.outputs.CONTAINER_NAME }} + K8S_CLUSTER: ${{ steps.set_env.outputs.K8S_CLUSTER }} ECR_REPOSITORY: ${{ steps.set_env.outputs.ECR_REPOSITORY }} + ENVIRONMENT_BUCKET: ${{ steps.set_env.outputs.ENVIRONMENT_BUCKET }} SLACK_WEBHOOK_URL: ${{ steps.vars.outputs.SLACK_WEBHOOK_URL }} - + AWS_ACCOUNT_ID: ${{ steps.vars.outputs.AWS_ACCOUNT_ID}} + steps: - id: vars shell: bash @@ -67,17 +70,20 @@ jobs: then echo "AWS_ROLE=PRD_AWS_ROLE" >> $GITHUB_OUTPUT echo "PROJECT_PREFIX=sirn-prd-mb" >> $GITHUB_OUTPUT - echo "SLACK_WEBHOOK_URL=PRD_SLACK_WEBHOOK_URL" >> $GITHUB_OUTPUT + echo "SLACK_WEBHOOK_URL=PRD_SLACK_WEBHOOK_URL" >> $GITHUB_OUTPUT + echo "AWS_ACCOUNT_ID=PRD_AWS_ACCOUNT_ID" >> $GITHUB_OUTPUT elif [ $ENV == 'stg' ] then echo "AWS_ROLE=STG_AWS_ROLE" >> $GITHUB_OUTPUT echo "PROJECT_PREFIX=sirn-stg-mb" >> $GITHUB_OUTPUT - echo "SLACK_WEBHOOK_URL=DEV_SLACK_WEBHOOK_URL" >> $GITHUB_OUTPUT + echo "SLACK_WEBHOOK_URL=DEV_SLACK_WEBHOOK_URL" >> $GITHUB_OUTPUT + echo "AWS_ACCOUNT_ID=NON_PRD_AWS_ACCOUNT_ID" >> $GITHUB_OUTPUT elif [ $ENV == 'dev' ] then echo "AWS_ROLE=DEV_AWS_ROLE" >> $GITHUB_OUTPUT echo "PROJECT_PREFIX=sirn-dev-mb" >> $GITHUB_OUTPUT echo "SLACK_WEBHOOK_URL=DEV_SLACK_WEBHOOK_URL" >> $GITHUB_OUTPUT + echo "AWS_ACCOUNT_ID=NON_PRD_AWS_ACCOUNT_ID" >> $GITHUB_OUTPUT else echo "Branch not configured!" exit 1 @@ -89,68 +95,35 @@ jobs: id: set_env run: | PROJECT_PREFIX=${{ steps.vars.outputs.PROJECT_PREFIX }} - echo "ECR_REPOSITORY=$PROJECT_PREFIX-ecr-$SERVICE_NAME" >> $GITHUB_OUTPUT - echo "ECS_CLUSTER=$PROJECT_PREFIX-ecs-cluster" >> $GITHUB_OUTPUT - echo "ECS_SERVICE=$PROJECT_PREFIX-svc-$SERVICE_NAME" >> $GITHUB_OUTPUT - echo "TASK_DEFINITION=$PROJECT_PREFIX-td-$SERVICE_NAME" >> $GITHUB_OUTPUT - echo "CONTAINER_NAME=$PROJECT_PREFIX-cntr-$SERVICE_NAME" >> $GITHUB_OUTPUT + echo "K8S_CLUSTER=$PROJECT_PREFIX-prime" >> $GITHUB_OUTPUT echo ":seedling: Branch:${GITHUB_REF#refs/heads/}" >> $GITHUB_STEP_SUMMARY # Deploy Conductor UI Image to ECS - deploy-server-image: - name: Deploy Server Image - runs-on: 'ubuntu-latest' - timeout-minutes: 20 + deploy-to-k8s: + name: Deploy to k8s + runs-on: ubuntu-latest + container: + image: public.ecr.aws/kvsiren-dev/pipeline/helm-deploy:latest + timeout-minutes: 15 permissions: id-token: write pull-requests: write contents: read - needs: prepare-env + needs: + - prepare-env env: - AWS_ROLE: ${{ needs.prepare-env.outputs.AWS_ROLE }} - ENV: ${{ needs.prepare-env.outputs.ENV }} - PROJECT_PREFIX: ${{needs.prepare-env.outputs.PROJECT_PREFIX}} - ECR_REPOSITORY: ${{needs.prepare-env.outputs.ECR_REPOSITORY}} - IMAGE_TAG: ${{ github.event.inputs.tag }} - ECS_CLUSTER: ${{ needs.prepare-env.outputs.ECS_CLUSTER }} - ECS_SERVICE: ${{ needs.prepare-env.outputs.ECS_SERVICE }} - TASK_DEFINITION: ${{ needs.prepare-env.outputs.TASK_DEFINITION }} - CONTAINER_NAME: ${{ needs.prepare-env.outputs.CONTAINER_NAME }} - + AWS_ACCOUNT_ID: ${{ needs.prepare-env.outputs.AWS_ACCOUNT_ID }} steps: - - name: Checkout code from action - uses: actions/checkout@v2 - - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ secrets[env.AWS_ROLE] }} - aws-region: ${{ env.AWS_REGION }} - - - name: Amazon ECR Login - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1.7.0 - - - name: Check if image tag exists in ECR - id: check-image-existence - run: | - if aws ecr describe-images --repository-name "${{ env.ECR_REPOSITORY }}" --region "${{ env.AWS_REGION }}" --image-ids imageTag="${{ env.IMAGE_TAG }}" 2>&1 | grep -q "imageTag"; then - echo "Image tag $IMAGE_TAG exists in ECR" - else - echo "Error: Image tag $IMAGE_TAG does not exist in ECR" - exit 1 - fi - - - name: Deploy backend - id: deploy_backend - uses: ./.github/actions/deploy-ecs - env: - APP_IMAGE: ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} + - name: Deploy using composite action + uses: KeyvalueSoftwareSystems/siren-github-workflows/eks-deployment@main with: - aws-region : ${{ env.AWS_REGION }} - aws-role: ${{ secrets[env.AWS_ROLE] }} - task-definition: ${{ env.TASK_DEFINITION }} - container-name: ${{ env.CONTAINER_NAME }} - ecs-service: ${{ env.ECS_SERVICE }} - ecs-cluster: ${{ env.ECS_CLUSTER }} - image: ${{ env.APP_IMAGE }} \ No newline at end of file + AWS_ROLE: ${{ needs.prepare-env.outputs.AWS_ROLE }} + ENVIRONMENT_BUCKET: ${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }} + SERVICE_NAME: ${{ env.SERVICE_NAME }} + HELM_CHART_NAME: ${{ env.HELM_CHART_NAME }} + K8S_NAMESPACE: ${{ needs.prepare-env.outputs.ENV }} + K8S_CLUSTER: ${{ needs.prepare-env.outputs.K8S_CLUSTER }} + ECR_REPO: ${{ needs.prepare-env.outputs.ECR_REPOSITORY }} + IMAGE_TAG: ${{ github.event.inputs.tag }} + AWS_ACCOUNT_ID: ${{ vars[env.AWS_ACCOUNT_ID] }} + AWS_REGION: ${{ env.AWS_REGION }} diff --git a/.github/workflows/ci-server-.yaml b/.github/workflows/ci-server-.yaml index 52d570d7e0..4cce9dae38 100644 --- a/.github/workflows/ci-server-.yaml +++ b/.github/workflows/ci-server-.yaml @@ -29,7 +29,6 @@ jobs: AWS_ROLE: ${{ steps.vars.outputs.AWS_ROLE }} ENV: ${{ steps.vars.outputs.ENV }} PROJECT_PREFIX: ${{ steps.vars.outputs.PROJECT_PREFIX }} - ECS_CLUSTER: ${{ steps.set_env.outputs.ECS_CLUSTER }} ECR_REPOSITORY: ${{ steps.set_env.outputs.ECR_REPOSITORY }} ENVIRONMENT_BUCKET: ${{ steps.set_env.outputs.ENVIRONMENT_BUCKET }} SLACK_WEBHOOK_URL: ${{ steps.vars.outputs.SLACK_WEBHOOK_URL }} @@ -88,7 +87,6 @@ jobs: id: set_env run: | PROJECT_PREFIX=${{ steps.vars.outputs.PROJECT_PREFIX }} - echo "ECS_CLUSTER=$PROJECT_PREFIX-ecs-cluster" >> $GITHUB_OUTPUT echo "ECR_REPOSITORY=$PROJECT_PREFIX-ecr-$SERVICE_NAME" >> $GITHUB_OUTPUT echo "ENVIRONMENT_BUCKET=$PROJECT_PREFIX-s3-environment" >> $GITHUB_OUTPUT echo ":seedling: Branch:${GITHUB_REF#refs/heads/}" >> $GITHUB_STEP_SUMMARY @@ -133,10 +131,6 @@ jobs: role-to-assume: ${{ secrets[env.AWS_ROLE] }} aws-region: ${{ env.AWS_REGION }} - - name: Download S3 file - run: | - aws s3 cp s3://${PROJECT_PREFIX}-s3-environment/conductor-server/conductor-server.properties ./docker/server/config/conductor-server.properties - - name: Amazon ECR Login id: login-ecr uses: aws-actions/amazon-ecr-login@v1.7.0 From def166eb3e4df7f93b2151ee2ea9504faa4a75e1 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Fri, 14 Mar 2025 16:29:32 +0530 Subject: [PATCH 02/10] add eks deployment step seperately instead of composite actions --- .github/workflows/cd-server.yaml | 52 ++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index e24aeeea1e..bfb74e4951 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -114,16 +114,44 @@ jobs: env: AWS_ACCOUNT_ID: ${{ needs.prepare-env.outputs.AWS_ACCOUNT_ID }} steps: - - name: Deploy using composite action - uses: KeyvalueSoftwareSystems/siren-github-workflows/eks-deployment@main + - name: Checkout code from action + uses: actions/checkout@v2 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v4 with: - AWS_ROLE: ${{ needs.prepare-env.outputs.AWS_ROLE }} - ENVIRONMENT_BUCKET: ${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }} - SERVICE_NAME: ${{ env.SERVICE_NAME }} - HELM_CHART_NAME: ${{ env.HELM_CHART_NAME }} - K8S_NAMESPACE: ${{ needs.prepare-env.outputs.ENV }} - K8S_CLUSTER: ${{ needs.prepare-env.outputs.K8S_CLUSTER }} - ECR_REPO: ${{ needs.prepare-env.outputs.ECR_REPOSITORY }} - IMAGE_TAG: ${{ github.event.inputs.tag }} - AWS_ACCOUNT_ID: ${{ vars[env.AWS_ACCOUNT_ID] }} - AWS_REGION: ${{ env.AWS_REGION }} + role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/github-actions + aws-region: ${{ env.AWS_REGION }} + + - name: Amazon ECR Login + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1.7.0 + + - name: Check if image tag exists in ECR + id: check-image-existence + run: | + if aws ecr describe-images --repository-name "${{ needs.prepare-env.outputs.ECR_REPOSITORY }}" --region "${{ env.AWS_REGION }}" --image-ids imageTag="${{ github.event.inputs.tag }}" 2>&1 | grep -q "imageTag"; then + echo "Image tag $IMAGE_TAG exists in ECR" + else + echo "Error: Image tag $IMAGE_TAG does not exist in ECR" + exit 1 + fi + + - name: Deploy to Kubernetes + shell: bash + run: | + aws eks update-kubeconfig --name ${{ needs.prepare-env.outputs.K8S_CLUSTER }} + aws s3 cp s3://${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }}/helm/${{ env.SERVICE_NAME }}/values.yaml ./values.yaml + cat ./values.yaml + aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com + + # Construct base Helm command + HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ + --namespace ${{ needs.prepare-env.outputs.ENV }} \ + --values values.yaml \ + --set default.image.repository='${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ needs.prepare-env.outputs.ECR_REPOSITORY }}' \ + --set default.image.tag='${{ github.event.inputs.tag }}'" + + # Run the Helm command + echo "Running: $HELM_CMD" + eval $HELM_CMD From b83e9060b3664b38ef20cedbb80b9998911148d0 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Fri, 14 Mar 2025 16:39:32 +0530 Subject: [PATCH 03/10] fix in declaring account id variable --- .github/workflows/cd-server.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index bfb74e4951..eaf0d7d4f6 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -120,7 +120,7 @@ jobs: - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 with: - role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/github-actions + role-to-assume: arn:aws:iam::${{ vars[env.AWS_ACCOUNT_ID] }}:role/github-actions aws-region: ${{ env.AWS_REGION }} - name: Amazon ECR Login @@ -146,10 +146,10 @@ jobs: aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com # Construct base Helm command - HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ + HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ --namespace ${{ needs.prepare-env.outputs.ENV }} \ --values values.yaml \ - --set default.image.repository='${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ needs.prepare-env.outputs.ECR_REPOSITORY }}' \ + --set default.image.repository='${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ needs.prepare-env.outputs.ECR_REPOSITORY }}' \ --set default.image.tag='${{ github.event.inputs.tag }}'" # Run the Helm command From 7f300d84cdac20f343624ed1cb62e5ac29ffac69 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Fri, 14 Mar 2025 16:44:18 +0530 Subject: [PATCH 04/10] remove the steps for ecr login --- .github/workflows/cd-server.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index eaf0d7d4f6..b7aa48f96e 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -123,19 +123,6 @@ jobs: role-to-assume: arn:aws:iam::${{ vars[env.AWS_ACCOUNT_ID] }}:role/github-actions aws-region: ${{ env.AWS_REGION }} - - name: Amazon ECR Login - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1.7.0 - - - name: Check if image tag exists in ECR - id: check-image-existence - run: | - if aws ecr describe-images --repository-name "${{ needs.prepare-env.outputs.ECR_REPOSITORY }}" --region "${{ env.AWS_REGION }}" --image-ids imageTag="${{ github.event.inputs.tag }}" 2>&1 | grep -q "imageTag"; then - echo "Image tag $IMAGE_TAG exists in ECR" - else - echo "Error: Image tag $IMAGE_TAG does not exist in ECR" - exit 1 - fi - name: Deploy to Kubernetes shell: bash From 59ea1e98110eb1e44b29df4441272c2e5b0319d8 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Fri, 14 Mar 2025 16:52:03 +0530 Subject: [PATCH 05/10] made change in environemnt bucket format --- .github/workflows/cd-server.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index b7aa48f96e..a5e573a85e 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -96,6 +96,7 @@ jobs: run: | PROJECT_PREFIX=${{ steps.vars.outputs.PROJECT_PREFIX }} echo "K8S_CLUSTER=$PROJECT_PREFIX-prime" >> $GITHUB_OUTPUT + echo "ENVIRONMENT_BUCKET=$PROJECT_PREFIX-s3-environment" >> $GITHUB_OUTPUT echo ":seedling: Branch:${GITHUB_REF#refs/heads/}" >> $GITHUB_STEP_SUMMARY # Deploy Conductor UI Image to ECS @@ -130,7 +131,7 @@ jobs: aws eks update-kubeconfig --name ${{ needs.prepare-env.outputs.K8S_CLUSTER }} aws s3 cp s3://${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }}/helm/${{ env.SERVICE_NAME }}/values.yaml ./values.yaml cat ./values.yaml - aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com + aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com # Construct base Helm command HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ From 3b4c0afe7839c762e3c2e8faf8fa6e4eaa26386b Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Fri, 14 Mar 2025 16:58:14 +0530 Subject: [PATCH 06/10] made change in service name --- .github/workflows/cd-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index a5e573a85e..7df9cca1de 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -21,7 +21,7 @@ permissions: packages: read actions: read env: - SERVICE_NAME: conductor-server + SERVICE_NAME: conductor AWS_REGION: "ap-south-1" HELM_CHART_NAME: "application-helm-chart" From 1a47a9604c2ea1e77490f16c6b93fb1d219c67d8 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Mon, 17 Mar 2025 14:20:24 +0530 Subject: [PATCH 07/10] typo fix in ecr repository --- .github/workflows/cd-server.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index 7df9cca1de..7dce0565fd 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -114,6 +114,7 @@ jobs: - prepare-env env: AWS_ACCOUNT_ID: ${{ needs.prepare-env.outputs.AWS_ACCOUNT_ID }} + ECR_REPOSITORY: ${{ needs.prepare-env.outputs.ECR_REPOSITORY }} steps: - name: Checkout code from action uses: actions/checkout@v2 @@ -137,7 +138,7 @@ jobs: HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ --namespace ${{ needs.prepare-env.outputs.ENV }} \ --values values.yaml \ - --set default.image.repository='${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ needs.prepare-env.outputs.ECR_REPOSITORY }}' \ + --set default.image.repository='${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ ENV.ECR_REPOSITORY }}' \ --set default.image.tag='${{ github.event.inputs.tag }}'" # Run the Helm command From 9ea77b02d4ade0d64f0c656d22771ece0817f9ce Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Mon, 17 Mar 2025 14:22:36 +0530 Subject: [PATCH 08/10] correcting ecr repository format --- .github/workflows/cd-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index 7dce0565fd..7acc34f7c4 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -138,7 +138,7 @@ jobs: HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ --namespace ${{ needs.prepare-env.outputs.ENV }} \ --values values.yaml \ - --set default.image.repository='${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ ENV.ECR_REPOSITORY }}' \ + --set default.image.repository='${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}' \ --set default.image.tag='${{ github.event.inputs.tag }}'" # Run the Helm command From 6d0bf3b7871b46dd28151512d2f7a21e944a328e Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Mon, 17 Mar 2025 14:26:42 +0530 Subject: [PATCH 09/10] ecr repository was not properly passed from previous job output, fix --- .github/workflows/cd-server.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index 7acc34f7c4..4ddc606e7e 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -28,7 +28,7 @@ env: jobs: prepare-env: name: Prepare Env - runs-on: 'ubuntu-latest' + runs-on: "ubuntu-latest" timeout-minutes: 2 outputs: AWS_ROLE: ${{ steps.vars.outputs.AWS_ROLE }} @@ -48,7 +48,7 @@ jobs: ENV=${{ github.event.inputs.environment }} IMAGE_TAG=${{ github.event.inputs.tag }} echo $BRANCH - + if [ -z "$ENV" ] then case $BRANCH in @@ -98,7 +98,8 @@ jobs: echo "K8S_CLUSTER=$PROJECT_PREFIX-prime" >> $GITHUB_OUTPUT echo "ENVIRONMENT_BUCKET=$PROJECT_PREFIX-s3-environment" >> $GITHUB_OUTPUT echo ":seedling: Branch:${GITHUB_REF#refs/heads/}" >> $GITHUB_STEP_SUMMARY - + echo "ECR_REPOSITORY=$PROJECT_PREFIX-ecr-conductor-server" + # Deploy Conductor UI Image to ECS deploy-to-k8s: name: Deploy to k8s @@ -125,7 +126,6 @@ jobs: role-to-assume: arn:aws:iam::${{ vars[env.AWS_ACCOUNT_ID] }}:role/github-actions aws-region: ${{ env.AWS_REGION }} - - name: Deploy to Kubernetes shell: bash run: | @@ -133,14 +133,14 @@ jobs: aws s3 cp s3://${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }}/helm/${{ env.SERVICE_NAME }}/values.yaml ./values.yaml cat ./values.yaml aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com - + # Construct base Helm command HELM_CMD="helm upgrade --install ${{ env.SERVICE_NAME }} oci://${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.HELM_CHART_NAME }} \ --namespace ${{ needs.prepare-env.outputs.ENV }} \ --values values.yaml \ --set default.image.repository='${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}' \ --set default.image.tag='${{ github.event.inputs.tag }}'" - + # Run the Helm command echo "Running: $HELM_CMD" eval $HELM_CMD From 1b0c811bd80660578406328a41515c6a3c8b5118 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Mon, 17 Mar 2025 14:30:02 +0530 Subject: [PATCH 10/10] make ecr repository as github outputs --- .github/workflows/cd-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index 4ddc606e7e..295d3c4c47 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -98,7 +98,7 @@ jobs: echo "K8S_CLUSTER=$PROJECT_PREFIX-prime" >> $GITHUB_OUTPUT echo "ENVIRONMENT_BUCKET=$PROJECT_PREFIX-s3-environment" >> $GITHUB_OUTPUT echo ":seedling: Branch:${GITHUB_REF#refs/heads/}" >> $GITHUB_STEP_SUMMARY - echo "ECR_REPOSITORY=$PROJECT_PREFIX-ecr-conductor-server" + echo "ECR_REPOSITORY=$PROJECT_PREFIX-ecr-conductor-server" >> $GITHUB_OUTPUT # Deploy Conductor UI Image to ECS deploy-to-k8s: