Merge branch 'main' into T367415

toolforge · Aug 13, 2024 · 0e706fd · 0e706fd
2 parents aee1079 + edfb685
commit 0e706fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 29 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -22,6 +22,10 @@ source secrets.sh
 python3 -m venv .venv/deploy
 source .venv/deploy/bin/activate
 pip install ansible==8.1.0 kubernetes==26.1.0
+# install helm diff. Needed to keep helm module idempotent
+helm plugin install https://github.com/databus23/helm-diff || true
+# update kubernetes.core. This path will likely need updated with bastion os upgrades.
+ansible-galaxy collection install -U kubernetes.core -p ./.venv/deploy/lib/python3.11/site-packages/ansible_collections
 
 cd tofu
 AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu init

diff --git a/helm-quarry/values.yaml b/helm-quarry/values.yaml
@@ -4,4 +4,4 @@ web:
 
 worker:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-61 # worker tag managed by github actions
+  tag: pr-61 # worker tag managed by github actions
diff --git a/tofu/123.tf b/tofu/123.tf