From 43ad31d9367098d3d4bc4084c050bb04dadd9a57 Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Mon, 3 Oct 2022 11:00:39 -0400 Subject: [PATCH] Fix helm test suite (#522) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix helm test suite SUMMARY The old version of the nginx ingress controller that was being used for helm testing is incompatible with the recent upgrade to k8s 1.25 in CI. This upgrades the version used for testing and fixes a few other related issues. ISSUE TYPE COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Gonéri Le Bouder --- changelogs/fragments/522-fix-helm-tests.yml | 3 +++ tests/integration/targets/helm/defaults/main.yml | 4 ++-- tests/integration/targets/helm/tasks/main.yml | 2 +- tests/integration/targets/helm/tasks/tests_chart.yml | 7 +++++++ .../targets/helm/tasks/tests_chart/from_repository.yml | 2 +- .../targets/helm/tasks/tests_chart/from_url.yml | 4 ++-- 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/522-fix-helm-tests.yml diff --git a/changelogs/fragments/522-fix-helm-tests.yml b/changelogs/fragments/522-fix-helm-tests.yml new file mode 100644 index 00000000..808509a6 --- /dev/null +++ b/changelogs/fragments/522-fix-helm-tests.yml @@ -0,0 +1,3 @@ +--- +trivial: + - fix helm test suite (https://github.com/ansible-collections/kubernetes.core/pull/522). diff --git a/tests/integration/targets/helm/defaults/main.yml b/tests/integration/targets/helm/defaults/main.yml index 60a68664..a29cd260 100644 --- a/tests/integration/targets/helm/defaults/main.yml +++ b/tests/integration/targets/helm/defaults/main.yml @@ -4,9 +4,9 @@ helm_binary: "/tmp/helm/{{ ansible_system | lower }}-amd64/helm" chart_test: "ingress-nginx" chart_test_local_path: "nginx-ingress" -chart_test_version: 3.8.0 +chart_test_version: 4.2.4 chart_test_version_local_path: 1.32.0 -chart_test_version_upgrade: 3.9.0 +chart_test_version_upgrade: 4.2.5 chart_test_version_upgrade_local_path: 1.33.0 chart_test_repo: "https://kubernetes.github.io/ingress-nginx" chart_test_git_repo: "http://github.com/helm/charts.git" diff --git a/tests/integration/targets/helm/tasks/main.yml b/tests/integration/targets/helm/tasks/main.yml index e86d33df..9d8dda3e 100644 --- a/tests/integration/targets/helm/tasks/main.yml +++ b/tests/integration/targets/helm/tasks/main.yml @@ -4,4 +4,4 @@ loop_control: loop_var: helm_version with_items: - - "v3.2.4" + - "v3.7.0" diff --git a/tests/integration/targets/helm/tasks/tests_chart.yml b/tests/integration/targets/helm/tasks/tests_chart.yml index cd0d6b22..a0227215 100644 --- a/tests/integration/targets/helm/tasks/tests_chart.yml +++ b/tests/integration/targets/helm/tasks/tests_chart.yml @@ -335,6 +335,13 @@ that: - not (install is changed) + - name: "Remove {{ chart_release_name }} release" + helm: + binary_path: "{{ helm_binary }}" + name: "{{ chart_release_name }}" + namespace: "{{ helm_namespace }}" + state: absent + - name: Render templates helm_template: binary_path: "{{ helm_binary }}" diff --git a/tests/integration/targets/helm/tasks/tests_chart/from_repository.yml b/tests/integration/targets/helm/tasks/tests_chart/from_repository.yml index 7187bf28..d00599a6 100644 --- a/tests/integration/targets/helm/tasks/tests_chart/from_repository.yml +++ b/tests/integration/targets/helm/tasks/tests_chart/from_repository.yml @@ -14,7 +14,7 @@ chart_source_version_upgrade: "{{ chart_test_version_upgrade }}" helm_namespace: "{{ test_namespace[6] }}" -- name: Add chart repo +- name: Remove chart repo helm_repository: binary_path: "{{ helm_binary }}" name: test_helm diff --git a/tests/integration/targets/helm/tasks/tests_chart/from_url.yml b/tests/integration/targets/helm/tasks/tests_chart/from_url.yml index 1286b401..0d4922eb 100644 --- a/tests/integration/targets/helm/tasks/tests_chart/from_url.yml +++ b/tests/integration/targets/helm/tasks/tests_chart/from_url.yml @@ -3,6 +3,6 @@ include_tasks: "../tests_chart.yml" vars: source: url - chart_source: "https://github.com/kubernetes/ingress-nginx/releases/download/{{ chart_test }}-{{ chart_test_version }}/{{ chart_test }}-{{ chart_test_version }}.tgz" - chart_source_upgrade: "https://github.com/kubernetes/ingress-nginx/releases/download/{{ chart_test }}-{{ chart_test_version_upgrade }}/{{ chart_test }}-{{ chart_test_version_upgrade }}.tgz" + chart_source: "https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-{{ chart_test_version }}/{{ chart_test }}-{{ chart_test_version }}.tgz" + chart_source_upgrade: "https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-{{ chart_test_version_upgrade }}/{{ chart_test }}-{{ chart_test_version_upgrade }}.tgz" helm_namespace: "{{ test_namespace[5] }}"