Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: bump makejinja and add force flag to Taskfile #1166

Merged
merged 2 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ jobs:
shell: bash
run: task configure --yes

- name: Run configure again to ensure idempotency
shell: bash
run: task configure --yes

- name: Run kubeconform
shell: bash
run: ./.github/scripts/kubeconform.sh ./kubernetes
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ tasks:
.template:
internal: true
cmds:
- ./.venv/bin/makejinja
- ./.venv/bin/makejinja --force
- task: sops:encrypt:all
preconditions:
- { msg: "bootstrap addons file not found", sh: "test -f {{.BOOTSTRAP_DIR}}/vars/addons.yaml" }
Expand Down
7 changes: 3 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
ansible==9.1.0
ansible-lint==6.22.1
# https://github.com/pyca/bcrypt/issues/684
bcrypt==4.1.2
ansible==9.1.0
bcrypt==4.1.2 # https://github.com/pyca/bcrypt/issues/684
jmespath==1.0.1
makejinja==2.3.4
makejinja==2.3.5
netaddr==0.10.1
openshift==0.13.2
passlib==1.7.4