From 8b0dd5596a8c8f701d1437e5d4c54f0c05192021 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Tue, 17 Oct 2023 12:53:08 +0200 Subject: [PATCH] fix deploy, update docs --- .github/workflows/deploy.yaml | 2 +- DEPLOYMENT.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1b2b130b0..96c3c3491 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -54,7 +54,7 @@ jobs: gcloud container clusters get-credentials infra-${{ inputs.environment }} \ --project stackrox-infra \ --region us-west2 - ENVIRONMENT=${{ inputs.environment }} make install-argo helm-deploy + ENVIRONMENT=${{ inputs.environment }} make install-argo clean-argo-config helm-deploy - name: Notify infra channel about new version env: diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 624ffa987..bd38c7c25 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -118,6 +118,9 @@ To install Argo workflow server, run: NOTE: This is a separate step and not a dependant chart for example to avoid too frequent Argo deployments. +Also note that if you plan to deploy `infra-server` to this cluster, you will need to remove the default Argo workflow controller ConfigMap with the `clean-argo-config` Make target. +This is required until [ROX-20269](https://issues.redhat.com/browse/ROX-20269) is resolved. + ### Manual deployment To render a copy of the charts (for inspection), run: