Skip to content

Commit 90afebf

Browse files
committed
fix integration test by replacing bitnami redis chart with actual location
1 parent f9126a0 commit 90afebf

File tree

11 files changed

+22
-22
lines changed

11 files changed

+22
-22
lines changed

docs/kubernetes.core.helm_pull_module.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,22 +354,22 @@ Examples
354354
- name: Download Chart using chart_name and repo_url
355355
kubernetes.core.helm_pull:
356356
chart_ref: redis
357-
repo_url: https://charts.bitnami.com/bitnami
357+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
358358
untar_chart: yes
359359
destination: /path/to/chart
360360
361361
- name: Download Chart (skip tls certificate check)
362362
kubernetes.core.helm_pull:
363363
chart_ref: redis
364-
repo_url: https://charts.bitnami.com/bitnami
364+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
365365
untar_chart: yes
366366
destination: /path/to/chart
367367
skip_tls_certs_check: yes
368368
369369
- name: Download Chart using chart registry credentials
370370
kubernetes.core.helm_pull:
371371
chart_ref: redis
372-
repo_url: https://charts.bitnami.com/bitnami
372+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
373373
untar_chart: yes
374374
destination: /path/to/chart
375375
username: myuser

docs/kubernetes.core.helm_repository_module.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ Common return values are documented `here <https://docs.ansible.com/ansible/late
339339
<div>Full `helm` command built by this module, in case you want to re-run the command outside the module or debug a problem.</div>
340340
<br/>
341341
<div style="font-size: smaller"><b>Sample:</b></div>
342-
<div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">/usr/local/bin/helm repo add bitnami https://charts.bitnami.com/bitnami</div>
342+
<div style="font-size: smaller; color: blue; word-wrap: break-word; word-break: break-all;">/usr/local/bin/helm repo add bitnami oci://registry-1.docker.io/bitnamicharts/redis</div>
343343
</td>
344344
</tr>
345345
<tr>

plugins/modules/helm_pull.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,22 +124,22 @@
124124
- name: Download Chart using chart_name and repo_url
125125
kubernetes.core.helm_pull:
126126
chart_ref: redis
127-
repo_url: https://charts.bitnami.com/bitnami
127+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
128128
untar_chart: yes
129129
destination: /path/to/chart
130130
131131
- name: Download Chart (skip tls certificate check)
132132
kubernetes.core.helm_pull:
133133
chart_ref: redis
134-
repo_url: https://charts.bitnami.com/bitnami
134+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
135135
untar_chart: yes
136136
destination: /path/to/chart
137137
skip_tls_certs_check: yes
138138
139139
- name: Download Chart using chart registry credentials
140140
kubernetes.core.helm_pull:
141141
chart_ref: redis
142-
repo_url: https://charts.bitnami.com/bitnami
142+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
143143
untar_chart: yes
144144
destination: /path/to/chart
145145
username: myuser

plugins/modules/helm_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
type: str
159159
description: Full `helm` command built by this module, in case you want to re-run the command outside the module or debug a problem.
160160
returned: always
161-
sample: '/usr/local/bin/helm repo add bitnami https://charts.bitnami.com/bitnami'
161+
sample: '/usr/local/bin/helm repo add bitnami oci://registry-1.docker.io/bitnamicharts/redis'
162162
msg:
163163
type: str
164164
description: Error message returned by `helm` command

tests/integration/targets/helm/tasks/test_helm_reuse_values.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
helm:
1919
binary_path: "{{ helm_binary }}"
2020
chart_ref: redis
21-
chart_repo_url: https://charts.bitnami.com/bitnami
21+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
2222
release_name: test-redis
2323
release_namespace: "{{ helm_namespace }}"
2424
create_namespace: true
@@ -43,7 +43,7 @@
4343
helm:
4444
binary_path: "{{ helm_binary }}"
4545
chart_ref: redis
46-
chart_repo_url: https://charts.bitnami.com/bitnami
46+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
4747
release_name: test-redis
4848
release_namespace: "{{ helm_namespace }}"
4949
reuse_values: true

tests/integration/targets/helm_diff/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
- name: Install Redis chart
220220
helm:
221221
binary_path: "{{ helm_binary }}"
222-
chart_repo_url: https://charts.bitnami.com/bitnami
222+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
223223
chart_ref: redis
224224
namespace: "{{ helm_namespace }}"
225225
name: redis-chart
@@ -229,7 +229,7 @@
229229
- name: Upgrade Redis chart
230230
helm:
231231
binary_path: "{{ helm_binary }}"
232-
chart_repo_url: https://charts.bitnami.com/bitnami
232+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
233233
chart_ref: redis
234234
namespace: "{{ helm_namespace }}"
235235
name: redis-chart
@@ -263,7 +263,7 @@
263263
- name: Upgrade Redis chart once again
264264
helm:
265265
binary_path: "{{ helm_binary }}"
266-
chart_repo_url: https://charts.bitnami.com/bitnami
266+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
267267
chart_ref: redis
268268
namespace: "{{ helm_namespace }}"
269269
name: redis-chart

tests/integration/targets/helm_kubeconfig/tasks/from_kubeconfig_with_cacert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
- name: Install Redis chart without ca_cert (should fail)
4141
helm:
4242
binary_path: "{{ helm_binary }}"
43-
chart_repo_url: https://charts.bitnami.com/bitnami
43+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
4444
chart_ref: redis
4545
namespace: "{{ helm_namespace }}"
4646
create_namespace: true

tests/integration/targets/helm_kubeconfig/tasks/from_kubeconfig_with_validate_certs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
- name: Install Redis chart without validate_certs=false (should fail)
3131
helm:
3232
binary_path: "{{ helm_binary }}"
33-
chart_repo_url: https://charts.bitnami.com/bitnami
33+
chart_repo_url: oci://registry-1.docker.io/bitnamicharts/redis
3434
chart_ref: redis
3535
namespace: "{{ helm_namespace }}"
3636
create_namespace: true

tests/integration/targets/helm_kubeconfig/tasks/tests_helm_auth.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
kubeconfig: "{{ test_kubeconfig | default(omit) }}"
6767
validate_certs: "{{ test_validate_certs | default(omit) }}"
6868
ca_cert: "{{ test_ca_cert | default(omit) }}"
69-
repo_url: https://charts.bitnami.com/bitnami
69+
repo_url: oci://registry-1.docker.io/bitnamicharts/redis
7070
register: repository
7171

7272
- name: Assert that repository was added

tests/integration/targets/helm_pull/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
provenance: true
161161
untar_chart: true
162162
skip_tls_certs_check: true
163-
repo_url: "https://charts.bitnami.com/bitnami"
163+
repo_url: "oci://registry-1.docker.io/bitnamicharts/redis"
164164
repo_username: ansible
165165
repo_password: testing123
166166
verify_chart_keyring: pubring.gpg
@@ -176,7 +176,7 @@
176176
- '"--prov" in _result.command'
177177
- '"--untar" in _result.command'
178178
- '"--insecure-skip-tls-verify" in _result.command'
179-
- '"--repo https://charts.bitnami.com/bitnami" in _result.command'
179+
- '"--repo oci://registry-1.docker.io/bitnamicharts/redis" in _result.command'
180180
- '"--username ansible" in _result.command'
181181
- '"--password ***" in _result.command'
182182
- '"--keyring pubring.gpg" in _result.command'
@@ -205,7 +205,7 @@
205205
binary_path: "{{ helm_path }}"
206206
chart_ref: redis
207207
destination: "{{ destination }}"
208-
repo_url: "https://charts.bitnami.com/bitnami"
208+
repo_url: "oci://registry-1.docker.io/bitnamicharts/redis"
209209
untar_chart: true
210210
register: _result
211211

0 commit comments

Comments
 (0)