From afdf0741d6aa007422147ffe12ecddb65bc55210 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 16 Jan 2024 08:04:36 -0500 Subject: [PATCH 1/2] fix: bump makejinja and add force flag to Taskfile Signed-off-by: Devin Buhl --- Taskfile.yaml | 2 +- requirements.txt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Taskfile.yaml b/Taskfile.yaml index af22e1b73ff..c1bae05f93c 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -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" } diff --git a/requirements.txt b/requirements.txt index 0c1db730db6..900a36584b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From 2fa7235c82f3861576a479d0cea01e5a751351d8 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 16 Jan 2024 08:06:15 -0500 Subject: [PATCH 2/2] chore: Run configure again to ensure idempotency Signed-off-by: Devin Buhl --- .github/workflows/e2e.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 18f4176fd82..8f8fdf15d15 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -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