Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🧑‍💻 Remove patch proxy CICD logic #979

Merged
merged 4 commits into from
Aug 14, 2024
Merged

🧑‍💻 Remove patch proxy CICD logic #979

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
882e9e5
Surgery
wdbasson Aug 13, 2024
6c7cd40
Override regression pytest helm command by setting state values
wdbasson Aug 13, 2024
85a9243
Start regression tests before clean tests because they take longer
wdbasson Aug 13, 2024
67b9adf
Update .github/workflows/continuous-deploy.yml
wdbasson Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 19 additions & 68 deletions .github/workflows/continuous-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,24 +387,6 @@ jobs:
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
version: ${{ env.TAILSCALE_VERSION }}

# - name: Helmfile Diff
# if: github.event.inputs.run-reset-deployments == 'true'
# uses: helmfile/[email protected]
# with:
# helmfile-args: |
# diff \
# --environment ${{ vars.ENVIRONMENT }} \
# -f ./charts/helmfiles/aries-cloudapi-python.yaml \
# --set image.tag=${{ env.IMAGE_TAG }} \
# --set image.registry=ghcr.io/${{ github.repository_owner }}
# helm-plugins: |
# https://github.com/databus23/helm-diff,
# https://github.com/jkroepke/helm-secrets
# helmfile-version: ${{ env.HELMFILE_VERSION }}
# helm-version: ${{ env.HELM_VERSION }}
# env:
# IMAGE_TAG: ${{ needs.build.outputs.image_version }}

- name: Helmfile Destroy
id: destroy_deployments
if: github.event.inputs.run-reset-deployments == 'true'
Expand Down Expand Up @@ -484,7 +466,7 @@ jobs:
env:
IMAGE_TAG: ${{ needs.build.outputs.image_version }}

- name: Helmfile Apply (Exclude Agents) # Always exclude agents and apply (zero diff if resetting deployments)
- name: Helmfile Apply (RDS Proxy)
if: github.event.inputs.run-reset-deployments != 'true'
uses: helmfile/[email protected]
with:
Expand All @@ -494,37 +476,7 @@ jobs:
-f ./charts/helmfiles/aries-cloudapi-python.yaml \
--state-values-set image.tag=${{ env.IMAGE_TAG }} \
--state-values-set image.registry=ghcr.io/${{ github.repository_owner }} \
--selector app!=governance-ga-agent,app!=governance-multitenant-agent
helm-plugins: |
https://github.com/databus23/helm-diff,
https://github.com/jkroepke/helm-secrets
helmfile-version: ${{ env.HELMFILE_VERSION }}
helm-version: ${{ env.HELM_VERSION }}
env:
IMAGE_TAG: ${{ needs.build.outputs.image_version }}

- name: Create values file
run: |
echo 'env:' > ./charts/helmfiles/acapy-wallet-storage-config.yaml
echo ' ACAPY_WALLET_STORAGE_CONFIG: |-' >> ./charts/helmfiles/acapy-wallet-storage-config.yaml
echo ' ${{ secrets.ACAPY_WALLET_STORAGE_CONFIG }}' >> ./charts/helmfiles/acapy-wallet-storage-config.yaml
pwd
ls -la

- name: Helmfile Patch Proxy # Always patch agents with proxy.
id: patch_proxy
uses: helmfile/[email protected]
with:
helmfile-args: |
apply \
--environment ${{ vars.ENVIRONMENT }} \
-f ./charts/helmfiles/aries-cloudapi-python.yaml \
--state-values-set image.tag=${{ env.IMAGE_TAG }} \
--state-values-set image.registry=ghcr.io/${{ github.repository_owner }} \
--selector app=governance-ga-agent \
--selector app=governance-multitenant-agent \
--set env.WALLET_DB_HOST=${{ secrets.DB_PROXY_HOST }} \
--values acapy-wallet-storage-config.yaml
--state-values-set rdsProxyEnabled=true
helm-plugins: |
https://github.com/databus23/helm-diff,
https://github.com/jkroepke/helm-secrets
Expand Down Expand Up @@ -615,9 +567,9 @@ jobs:
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
version: ${{ env.TAILSCALE_VERSION }}

- name: Helmfile run pytest
if: ${{ github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run-tests != 'false') }}
id: pytest
- name: Helmfile init regression pytest
if: github.event.inputs.run-reset-deployments == 'true' && github.event.inputs.run-regression-tests == 'true'
id: pytest-init-regression
uses: helmfile/[email protected]
with:
helmfile-args: |
Expand All @@ -627,8 +579,10 @@ jobs:
--set image.tag=${{ env.IMAGE_TAG }} \
--set image.registry=ghcr.io/${{ github.repository_owner }} \
--set completions=${{ env.PYTEST_COMPLETIONS }} \
--state-values-set release=cloudapi-pytest \
--set fullnameOverride=cloudapi-pytest
--state-values-set release=cloudapi-pytest-regression \
--set fullnameOverride=cloudapi-pytest-regression \
--set env.RUN_REGRESSION_TESTS="true" \
--state-values-set regressionEnabled=true
helm-plugins: |
https://github.com/databus23/helm-diff,
https://github.com/jkroepke/helm-secrets
Expand All @@ -637,9 +591,9 @@ jobs:
env:
IMAGE_TAG: ${{ needs.build.outputs.image_version }}

- name: Helmfile init regression pytest
if: github.event.inputs.run-reset-deployments == 'true' && github.event.inputs.run-regression-tests == 'true'
id: pytest-init-regression
- name: Helmfile run regression pytest
if: ${{ github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run-reset-deployments == 'false' && github.event.inputs.run-regression-tests == 'true') }}
id: pytest-run-regression
uses: helmfile/[email protected]
with:
helmfile-args: |
Expand All @@ -652,7 +606,8 @@ jobs:
--state-values-set release=cloudapi-pytest-regression \
--set fullnameOverride=cloudapi-pytest-regression \
--set env.RUN_REGRESSION_TESTS="true" \
--set command[2]=pytest
--set env.FAIL_ON_RECREATING_FIXTURES="true" \
--state-values-set regressionEnabled=true
helm-plugins: |
https://github.com/databus23/helm-diff,
https://github.com/jkroepke/helm-secrets
Expand All @@ -661,9 +616,9 @@ jobs:
env:
IMAGE_TAG: ${{ needs.build.outputs.image_version }}

- name: Helmfile run regression pytest
if: ${{ github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run-reset-deployments == 'false' && github.event.inputs.run-regression-tests == 'true') }}
id: pytest-run-regression
- name: Helmfile run pytest
if: ${{ github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run-tests != 'false') }}
id: pytest
uses: helmfile/[email protected]
with:
helmfile-args: |
Expand All @@ -673,12 +628,8 @@ jobs:
--set image.tag=${{ env.IMAGE_TAG }} \
--set image.registry=ghcr.io/${{ github.repository_owner }} \
--set completions=${{ env.PYTEST_COMPLETIONS }} \
--state-values-set release=cloudapi-pytest-regression \
--set fullnameOverride=cloudapi-pytest-regression \
--set env.RUN_REGRESSION_TESTS="true" \
--set env.FAIL_ON_RECREATING_FIXTURES="true" \
--set command[2]="pytest --junitxml="/mnt/test_output.xml" --cov-report=term-missing:skip-covered --cov=trustregistry --cov=app --cov=endorser --cov=webhooks | tee /mnt/test_coverage.txt"

--state-values-set release=cloudapi-pytest \
--set fullnameOverride=cloudapi-pytest
helm-plugins: |
https://github.com/databus23/helm-diff,
https://github.com/jkroepke/helm-secrets
Expand Down
Loading