Merge branch 'main' into T367415

.gitignore

@@ -19,3 +19,4 @@ config.yaml
 terraform.tfstate*
 .terraform*
 tofu/kube.config
+ansible/collections/*

ansible/ansible.cfg

@@ -1,5 +1,13 @@
 [defaults]
-
 # Better error output
 stdout_callback=debug
 stderr_callback=debug
+
+collections_path=./collections/ansible_collections
+
+# we're only using localhost, no need for the warning.
+localhost_warning=False
+
+[inventory]
+# Only using localhost, so no inventory
+inventory_unparsed_warning=False

deploy.sh

@@ -24,15 +24,16 @@ 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
 AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu apply # -auto-approve
 export KUBECONFIG=$(pwd)/kube.config
 
 cd ../ansible
+# install collections here to take advantage of ansible.cfg configs
+ansible-galaxy collection install -U kubernetes.core -p ./collections
+
 ansible-playbook quarry.yaml
 #kubectl create namespace quarry --dry-run=client -o yaml | kubectl apply -f -
 #helm -n quarry upgrade --install quarry helm-quarry -f helm-quarry/prod-env.yaml