Skip to content

Commit da97b5e

Browse files
authored
feat: add argocd_values_file to CI/CD workflows for improved deployment configuration (#6)
1 parent 91e0d34 commit da97b5e

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

‎.github/workflows/dev-0-ci-cd.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ jobs:
3535
deployment_ref: ${{ vars.ARGOCD_REF || 'main' }}
3636
image_repository_path: ${{ vars.ARGOCD_IMAGE_REPOSITORY_PATH || '.image.repository' }}
3737
image_tag_path: ${{ vars.ARGOCD_IMAGE_TAG_PATH || '.image.tag' }}
38+
argocd_values_file: ${{ vars.ARGOCD_VALUES_FILE }}
3839
secrets:
3940
token: ${{ secrets.ARGOCD_GH_TOKEN }}

‎.github/workflows/dev-2-cd.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ jobs:
5151

5252
- name: Update image repository and tag
5353
env:
54-
VALUES_FILE: ${{ vars.ARGOCD_VALUES_FILE }}
54+
VALUES_FILE: ${{ vars.argocd_values_file }}
5555
IMAGE_REPOSITORY: ${{ inputs.image_repository }}
5656
IMAGE_TAG: ${{ inputs.image_tag }}
5757
IMAGE_REPOSITORY_PATH: ${{ inputs.image_repository_path }}
5858
IMAGE_TAG_PATH: ${{ inputs.image_tag_path }}
5959
run: |
60-
test -n "$VALUES_FILE"
61-
test -f "deployment-config/$VALUES_FILE"
6260
yq -i 'eval(strenv(IMAGE_REPOSITORY_PATH)) = strenv(IMAGE_REPOSITORY) | eval(strenv(IMAGE_TAG_PATH)) = strenv(IMAGE_TAG)' "deployment-config/$VALUES_FILE"
6361
6462
git -C deployment-config config user.email "github-actions[bot]@users.noreply.github.com"
@@ -69,4 +67,4 @@ jobs:
6967
else
7068
git -C deployment-config commit -m "Deploy dev image $IMAGE_TAG"
7169
git -C deployment-config push
72-
fi
70+
fi

‎.github/workflows/prod-0-ci-cd.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ jobs:
3737
deployment_ref: ${{ vars.ARGOCD_REF || 'main' }}
3838
image_repository_path: ${{ vars.ARGOCD_IMAGE_REPOSITORY_PATH || '.image.repository' }}
3939
image_tag_path: ${{ vars.ARGOCD_IMAGE_TAG_PATH || '.image.tag' }}
40+
argocd_values_file: ${{ vars.ARGOCD_VALUES_FILE }}
4041
secrets:
4142
token: ${{ secrets.ARGOCD_GH_TOKEN }}

‎.github/workflows/prod-2-cd.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ jobs:
5151

5252
- name: Update image repository and tag
5353
env:
54-
VALUES_FILE: ${{ vars.ARGOCD_VALUES_FILE }}
54+
VALUES_FILE: ${{ vars.argocd_values_file }}
5555
IMAGE_REPOSITORY: ${{ inputs.image_repository }}
5656
IMAGE_TAG: ${{ inputs.image_tag }}
5757
IMAGE_REPOSITORY_PATH: ${{ inputs.image_repository_path }}
5858
IMAGE_TAG_PATH: ${{ inputs.image_tag_path }}
5959
run: |
60-
test -n "$VALUES_FILE"
61-
test -f "deployment-config/$VALUES_FILE"
6260
yq -i 'eval(strenv(IMAGE_REPOSITORY_PATH)) = strenv(IMAGE_REPOSITORY) | eval(strenv(IMAGE_TAG_PATH)) = strenv(IMAGE_TAG)' "deployment-config/$VALUES_FILE"
6361
6462
git -C deployment-config config user.email "github-actions[bot]@users.noreply.github.com"
@@ -69,4 +67,4 @@ jobs:
6967
else
7068
git -C deployment-config commit -m "Deploy production image $IMAGE_TAG"
7169
git -C deployment-config push
72-
fi
70+
fi

0 commit comments

Comments
 (0)