From c36114403db4bab8aa496a7e6a895ac2c32f7444 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Tue, 8 Apr 2025 16:45:26 +0530 Subject: [PATCH 1/3] fetch values from infra repo --- .github/workflows/cd-server.yaml | 18 ++++++++++++++++-- .github/workflows/cd-ui.yaml | 18 ++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index ebcced8dc0..41e9387dec 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -122,6 +122,22 @@ jobs: - name: Checkout code from action uses: actions/checkout@v2 + - name: Checkout values.yaml from siren-infra + uses: actions/checkout@v4 + with: + repository: KeyvalueSoftwareSystems/siren-infra + ref: main + token: ${{inputs.PAT}} + sparse-checkout: | + k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml + sparse-checkout-cone-mode: false + + - name: Rename values.yaml for Helm + shell: bash + run: | + cp k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml ./values.yaml + cat ./values.yaml + - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -132,8 +148,6 @@ jobs: 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 ${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com # Construct base Helm command diff --git a/.github/workflows/cd-ui.yaml b/.github/workflows/cd-ui.yaml index 7877ad6c2f..f99b20c87e 100644 --- a/.github/workflows/cd-ui.yaml +++ b/.github/workflows/cd-ui.yaml @@ -122,6 +122,22 @@ jobs: - name: Checkout code from action uses: actions/checkout@v2 + - name: Checkout values.yaml from siren-infra + uses: actions/checkout@v4 + with: + repository: KeyvalueSoftwareSystems/siren-infra + ref: main + token: ${{inputs.PAT}} + sparse-checkout: | + k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml + sparse-checkout-cone-mode: false + + - name: Rename values.yaml for Helm + shell: bash + run: | + cp k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml ./values.yaml + cat ./values.yaml + - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -132,8 +148,6 @@ jobs: 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 ${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com # Construct base Helm command From 9a084ad4c389c6e533b0d082a0304f53f7510f01 Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Tue, 8 Apr 2025 16:55:52 +0530 Subject: [PATCH 2/3] fix in fetching variables --- .github/workflows/cd-server.yaml | 6 +++--- .github/workflows/cd-ui.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml index 41e9387dec..14895943f4 100644 --- a/.github/workflows/cd-server.yaml +++ b/.github/workflows/cd-server.yaml @@ -127,15 +127,15 @@ jobs: with: repository: KeyvalueSoftwareSystems/siren-infra ref: main - token: ${{inputs.PAT}} + token: ${{secrets.SIREN_PAT}} sparse-checkout: | - k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml + k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml sparse-checkout-cone-mode: false - name: Rename values.yaml for Helm shell: bash run: | - cp k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml ./values.yaml + cp k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml ./values.yaml cat ./values.yaml - name: Configure AWS credentials diff --git a/.github/workflows/cd-ui.yaml b/.github/workflows/cd-ui.yaml index f99b20c87e..dcae81a6ee 100644 --- a/.github/workflows/cd-ui.yaml +++ b/.github/workflows/cd-ui.yaml @@ -127,15 +127,15 @@ jobs: with: repository: KeyvalueSoftwareSystems/siren-infra ref: main - token: ${{inputs.PAT}} + token: ${{secrets.SIREN_PAT}} sparse-checkout: | - k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml + k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml sparse-checkout-cone-mode: false - name: Rename values.yaml for Helm shell: bash run: | - cp k8s/siren-services/${{ inputs.SERVICE_NAME }}/${{ inputs.K8S_NAMESPACE }}-values.yaml ./values.yaml + cp k8s/siren-services/${{ env.SERVICE_NAME }}${{ needs.prepare-env.outputs.ENV }}-values.yaml ./values.yaml cat ./values.yaml - name: Configure AWS credentials From 89cacf84c303d4a7914072c69ebef84c64280f4c Mon Sep 17 00:00:00 2001 From: Gayathridevi S Date: Tue, 8 Apr 2025 17:09:28 +0530 Subject: [PATCH 3/3] typo fix in values path --- .github/workflows/cd-ui.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-ui.yaml b/.github/workflows/cd-ui.yaml index dcae81a6ee..c5d84fc2eb 100644 --- a/.github/workflows/cd-ui.yaml +++ b/.github/workflows/cd-ui.yaml @@ -135,7 +135,7 @@ jobs: - name: Rename values.yaml for Helm shell: bash run: | - cp k8s/siren-services/${{ env.SERVICE_NAME }}${{ needs.prepare-env.outputs.ENV }}-values.yaml ./values.yaml + cp k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml ./values.yaml cat ./values.yaml - name: Configure AWS credentials