Skip to content

Commit

Permalink
Remedy warning in collections install (#65)
Browse files Browse the repository at this point in the history
* Remedy warning in collections install

Bug: T372884

* auto update of  tag

---------

Co-authored-by: Github Action <[email protected]>
  • Loading branch information
vivian-rook and Github Action authored Aug 20, 2024
1 parent 7ef0644 commit 2d5368f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ config.yaml
terraform.tfstate*
.terraform*
tofu/kube.config
ansible/collections/*
3 changes: 2 additions & 1 deletion ansible/ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[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

Expand Down
5 changes: 3 additions & 2 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions helm-quarry/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
web:
repository: 'quay.io/wikimedia-quarry/quarry'
tag: pr-64 # web tag managed by github actions
tag: pr-65 # web tag managed by github actions

worker:
repository: 'quay.io/wikimedia-quarry/quarry'
tag: pr-64 # worker tag managed by github actions
tag: pr-65 # worker tag managed by github actions

0 comments on commit 2d5368f

Please sign in to comment.