fix deploy, update docs

stackrox · Oct 17, 2023 · 8b0dd55 · 8b0dd55
1 parent 7480faf
commit 8b0dd55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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: