From e2d4cff9529a99b94529f9c2aa80ff6d3b22c040 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Wed, 11 Nov 2020 00:43:09 +0530
Subject: [PATCH] Updated chart repo URLs (#297)

---
 molecule/default/roles/helm/defaults/main.yml         | 11 +++++++----
 .../roles/helm/tasks/tests_chart/from_local_path.yml  |  6 ++++--
 .../default/roles/helm/tasks/tests_chart/from_url.yml |  4 ++--
 plugins/modules/helm.py                               |  6 +++---
 plugins/modules/helm_repository.py                    |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/molecule/default/roles/helm/defaults/main.yml b/molecule/default/roles/helm/defaults/main.yml
index b5a2a31f..3ab42124 100644
--- a/molecule/default/roles/helm/defaults/main.yml
+++ b/molecule/default/roles/helm/defaults/main.yml
@@ -6,10 +6,13 @@ helm_namespace: helm
 tiller_namespace: tiller
 tiller_cluster_role: cluster-admin
 
-chart_test: "nginx-ingress"
-chart_test_version: 1.32.0
-chart_test_version_upgrade: 1.33.0
-chart_test_repo: "https://kubernetes-charts.storage.googleapis.com"
+chart_test: "ingress-nginx"
+chart_test_local_path: "nginx-ingress"
+chart_test_version: 3.8.0
+chart_test_version_local_path: 1.32.0
+chart_test_version_upgrade: 3.9.0
+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"
 chart_test_values:
   revisionHistoryLimit: 0
diff --git a/molecule/default/roles/helm/tasks/tests_chart/from_local_path.yml b/molecule/default/roles/helm/tasks/tests_chart/from_local_path.yml
index 58409809..5ba56137 100644
--- a/molecule/default/roles/helm/tasks/tests_chart/from_local_path.yml
+++ b/molecule/default/roles/helm/tasks/tests_chart/from_local_path.yml
@@ -15,8 +15,10 @@
   include_tasks: "../tests_chart.yml"
   vars:
     source: local_path
-    chart_source: "/tmp/helm_test_repo/stable/{{ chart_test }}/"
-    chart_source_upgrade: "/tmp/helm_test_repo_upgrade/stable/{{ chart_test }}/"
+    chart_source: "/tmp/helm_test_repo/stable/{{ chart_test_local_path }}/"
+    chart_source_upgrade: "/tmp/helm_test_repo_upgrade/stable/{{ chart_test_local_path }}/"
+    chart_test_version: "{{ chart_test_version_local_path }}"
+    chart_source_version_upgrade: "{{ chart_test_version_upgrade_local_path }}"
 
 - name: Test appVersion idempotence
   vars:
diff --git a/molecule/default/roles/helm/tasks/tests_chart/from_url.yml b/molecule/default/roles/helm/tasks/tests_chart/from_url.yml
index fd3f66c3..fe1ef4b6 100644
--- a/molecule/default/roles/helm/tasks/tests_chart/from_url.yml
+++ b/molecule/default/roles/helm/tasks/tests_chart/from_url.yml
@@ -3,5 +3,5 @@
   include_tasks: "../tests_chart.yml"
   vars:
     source: url
-    chart_source: "{{ chart_test_repo }}/{{ chart_test }}-{{ chart_test_version }}.tgz"
-    chart_source_upgrade: "{{ chart_test_repo }}/{{ chart_test }}-{{ chart_test_version_upgrade }}.tgz"
+    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"
diff --git a/plugins/modules/helm.py b/plugins/modules/helm.py
index 16d5d4d5..44ad64fd 100644
--- a/plugins/modules/helm.py
+++ b/plugins/modules/helm.py
@@ -149,7 +149,7 @@ EXAMPLES = r'''
 - name: Add stable chart repo
   community.kubernetes.helm_repository:
     name: stable
-    repo_url: "https://kubernetes-charts.storage.googleapis.com"
+    repo_url: "https://kubernetes.github.io/ingress-nginx"
 
 - name: Deploy latest version of Grafana chart inside monitoring namespace with values
   community.kubernetes.helm:
@@ -193,10 +193,10 @@ EXAMPLES = r'''
     release_namespace: monitoring
 
 # From url
-- name: Deploy Grafana chart on 5.0.12 from url
+- name: Deploy Grafana chart on 5.6.0 from url
   community.kubernetes.helm:
     name: test
-    chart_ref: "https://kubernetes-charts.storage.googleapis.com/grafana-5.0.12.tgz"
+    chart_ref: "https://github.com/grafana/helm-charts/releases/download/grafana-5.6.0/grafana-5.6.0.tgz"
     release_namespace: monitoring
 '''
 
diff --git a/plugins/modules/helm_repository.py b/plugins/modules/helm_repository.py
index 11105561..7e7b5260 100644
--- a/plugins/modules/helm_repository.py
+++ b/plugins/modules/helm_repository.py
@@ -67,10 +67,10 @@ options:
 '''
 
 EXAMPLES = r'''
-- name: Add default repository
+- name: Add a repository
   community.kubernetes.helm_repository:
     name: stable
-    repo_url: https://kubernetes-charts.storage.googleapis.com
+    repo_url: https://kubernetes.github.io/ingress-nginx
 
 - name: Add Red Hat Helm charts repository
   community.kubernetes.helm_repository: