diff --git a/roles/helm-apps/README.md b/roles/helm_apps/README.md similarity index 88% rename from roles/helm-apps/README.md rename to roles/helm_apps/README.md index 8619688f2..818a6ce4b 100644 --- a/roles/helm-apps/README.md +++ b/roles/helm_apps/README.md @@ -22,7 +22,7 @@ Playbook example: - hosts: kube_control_plane[0] gather_facts: no roles: - - name: helm-apps + - name: helm_apps releases: - name: app namespace: app @@ -31,9 +31,9 @@ Playbook example: namespace: app chart_ref: simple-app/simple-app wait_timeout: "10m" # override the same option in `release_common_opts` - repositories: "{{ repos }}" + repositories: - name: simple-app url: "https://blog.leiwang.info/simple-app" - release_common_opts: "{{ helm_params }}" + release_common_opts: wait_timeout: "5m" ``` diff --git a/roles/helm-apps/meta/argument_specs.yml b/roles/helm_apps/meta/argument_specs.yml similarity index 100% rename from roles/helm-apps/meta/argument_specs.yml rename to roles/helm_apps/meta/argument_specs.yml diff --git a/roles/helm-apps/meta/main.yml b/roles/helm_apps/meta/main.yml similarity index 100% rename from roles/helm-apps/meta/main.yml rename to roles/helm_apps/meta/main.yml diff --git a/roles/helm-apps/tasks/main.yml b/roles/helm_apps/tasks/main.yml similarity index 100% rename from roles/helm-apps/tasks/main.yml rename to roles/helm_apps/tasks/main.yml diff --git a/roles/helm-apps/vars/main.yml b/roles/helm_apps/vars/main.yml similarity index 100% rename from roles/helm-apps/vars/main.yml rename to roles/helm_apps/vars/main.yml diff --git a/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml b/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml index a42089f35..ffa334f91 100644 --- a/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml +++ b/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml @@ -1,6 +1,6 @@ --- dependencies: - - role: helm-apps + - role: helm_apps when: - inventory_hostname == groups['kube_control_plane'][0] - kubelet_csr_approver_enabled diff --git a/roles/network_plugin/custom_cni/meta/main.yml b/roles/network_plugin/custom_cni/meta/main.yml index 6856aa993..c4da2d299 100644 --- a/roles/network_plugin/custom_cni/meta/main.yml +++ b/roles/network_plugin/custom_cni/meta/main.yml @@ -1,6 +1,6 @@ --- dependencies: - - role: helm-apps + - role: helm_apps when: - inventory_hostname == groups['kube_control_plane'][0] - custom_cni_chart_release_name | length > 0