Merge pull request #12202 from VannTen/cleanup/rename_kubespray_defaults

Rename kubespray-defaults to kubespray_defaults

roles/bootstrap-os/meta/main.yml

@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: kubespray-defaults
+  - role: kubespray_defaults

roles/container-engine/containerd/molecule/default/converge.yml

@@ -5,5 +5,5 @@
   vars:
     container_manager: containerd
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: container-engine/containerd

roles/container-engine/containerd/molecule/default/prepare.yml

@@ -6,7 +6,7 @@
   vars:
     ignore_assert_errors: true
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: bootstrap-os
     - role: network_facts
     - role: kubernetes/preinstall
@@ -26,5 +26,5 @@
     ignore_assert_errors: true
     kube_network_plugin: cni
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: network_plugin/cni

roles/container-engine/cri-dockerd/molecule/default/converge.yml

@@ -5,5 +5,5 @@
   vars:
     container_manager: docker
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: container-engine/cri-dockerd

roles/container-engine/cri-dockerd/molecule/default/prepare.yml

@@ -3,7 +3,7 @@
   hosts: all
   become: true
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: bootstrap-os
     - role: adduser
       user: "{{ addusers.kube }}"
@@ -20,7 +20,7 @@
     container_manager: containerd
     kube_network_plugin: cni
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: network_plugin/cni
   tasks:
     - name: Copy test container files

roles/container-engine/cri-o/molecule/default/converge.yml

@@ -5,5 +5,5 @@
   vars:
     container_manager: crio
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: container-engine/cri-o

roles/container-engine/cri-o/molecule/default/prepare.yml

@@ -6,7 +6,7 @@
   vars:
     ignore_assert_errors: true
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: bootstrap-os
     - role: network_facts
     - role: kubernetes/preinstall
@@ -26,7 +26,7 @@
     ignore_assert_errors: true
     kube_network_plugin: cni
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: network_plugin/cni
   tasks:
     - name: Copy test container files

roles/container-engine/gvisor/molecule/default/converge.yml

@@ -6,6 +6,6 @@
     gvisor_enabled: true
     container_manager: containerd
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: container-engine/containerd
     - role: container-engine/gvisor

roles/container-engine/gvisor/molecule/default/prepare.yml

@@ -3,7 +3,7 @@
   hosts: all
   become: true
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: bootstrap-os
     - role: adduser
       user: "{{ addusers.kube }}"
@@ -20,7 +20,7 @@
     container_manager: containerd
     kube_network_plugin: cni
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: network_plugin/cni
     - role: container-engine/crictl
   tasks:

roles/container-engine/kata-containers/molecule/default/converge.yml

@@ -6,6 +6,6 @@
     kata_containers_enabled: true
     container_manager: containerd
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: container-engine/containerd
     - role: container-engine/kata-containers

roles/container-engine/kata-containers/molecule/default/prepare.yml

@@ -3,7 +3,7 @@
   hosts: all
   become: true
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: bootstrap-os
     - role: adduser
       user: "{{ addusers.kube }}"
@@ -20,7 +20,7 @@
     container_manager: containerd
     kube_network_plugin: cni
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: network_plugin/cni
     - role: container-engine/crictl
   tasks:

roles/container-engine/youki/molecule/default/converge.yml

@@ -6,6 +6,6 @@
     youki_enabled: true
     container_manager: crio
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: container-engine/cri-o
     - role: container-engine/youki

roles/container-engine/youki/molecule/default/prepare.yml

@@ -3,7 +3,7 @@
   hosts: all
   become: true
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: bootstrap-os
     - role: adduser
       user: "{{ addusers.kube }}"
@@ -20,7 +20,7 @@
     container_manager: crio
     kube_network_plugin: cni
   roles:
-    - role: kubespray-defaults
+    - role: kubespray_defaults
     - role: network_plugin/cni
     - role: container-engine/crictl
   tasks:

roles/kubespray-defaults/tasks/main.yml

@@ -0,0 +1,10 @@
+---
+- name: Warn for usage of deprecated role
+  fail:
+    msg: kubespray-defaults is deprecated, switch to kubespray_defaults
+  ignore_errors: true # noqa ignore-errors
+  run_once: true
+
+- name: Compat for direct role import
+  import_role:
+    name: kubespray_defaults

roles/network_facts/meta/main.yml

@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: kubespray-defaults
+  - role: kubespray_defaults

roles/validate_inventory/meta/main.yml

@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: kubespray-defaults
+  - role: kubespray_defaults

roles/validate_inventory/tasks/main.yml

@@ -5,7 +5,7 @@
 - name: Stop if some versions have a 'v' left at the start
   # TODO: drop this task after 2.28.0 is released
   # The 'not defined' tests are exception for applications which version in not defined
-  # in kubespray-defaults, only in their own roles.
+  # in kubespray_defaults, only in their own roles.
   assert:
     msg: |
       All version string used in kubespray have been normalized to not use a leading 'v'.
@@ -46,7 +46,7 @@
 - name: Stop if some derived versions have a 'v' left at the start
   # TODO: drop this task after 2.28.0 is released
   # The 'not defined' tests are exception for applications which version in not defined
-  # in kubespray-defaults, only in their own roles.
+  # in kubespray_defaults, only in their own roles.
   assert:
     msg: |
       All version string used in kubespray have been normalized to not use a leading 'v'.