From 7db2aa1cbadf45364d4f0fa8c372c14b4439dd7f Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Sat, 10 May 2025 10:04:37 +0200 Subject: [PATCH] Rename kubespray-defaults to kubespray_defaults Role names in ansible collection should not contains hyphens. --- contrib/offline/README.md | 2 +- contrib/offline/generate_list.sh | 4 ++-- contrib/offline/generate_list.yml | 2 +- docs/advanced/proxy.md | 2 +- docs/ansible/vars.md | 2 +- docs/operating_systems/bootstrap-os.md | 2 +- docs/operations/offline-environment.md | 2 +- .../migrate_openstack_provider.yml | 2 +- extra_playbooks/upgrade-only-k8s.yml | 12 +++++------ inventory/sample/group_vars/all/all.yml | 2 +- playbooks/boilerplate.yml | 2 +- playbooks/cluster.yml | 16 +++++++-------- playbooks/install_etcd.yml | 4 ++-- playbooks/recover_control_plane.yml | 6 +++--- playbooks/remove_node.yml | 4 ++-- playbooks/reset.yml | 2 +- playbooks/scale.yml | 12 +++++------ playbooks/upgrade_cluster.yml | 20 +++++++++---------- roles/bootstrap-os/meta/main.yml | 2 +- .../containerd/molecule/default/converge.yml | 2 +- .../containerd/molecule/default/prepare.yml | 4 ++-- .../cri-dockerd/molecule/default/converge.yml | 2 +- .../cri-dockerd/molecule/default/prepare.yml | 4 ++-- .../cri-o/molecule/default/converge.yml | 2 +- .../cri-o/molecule/default/prepare.yml | 4 ++-- .../gvisor/molecule/default/converge.yml | 2 +- .../gvisor/molecule/default/prepare.yml | 4 ++-- .../molecule/default/converge.yml | 2 +- .../molecule/default/prepare.yml | 4 ++-- .../youki/molecule/default/converge.yml | 2 +- .../youki/molecule/default/prepare.yml | 4 ++-- .../defaults/main/checksums.yml | 0 .../defaults/main/download.yml | 0 .../defaults/main/main.yml | 0 .../vars/main.yml | 0 roles/network_facts/meta/main.yml | 2 +- roles/validate_inventory/meta/main.yml | 2 +- roles/validate_inventory/tasks/main.yml | 4 ++-- scripts/assert-sorted-checksums.yml | 4 ++-- .../src/component_hash_update/download.py | 4 ++-- scripts/propagate_ansible_variables.yml | 6 +++--- tests/testcases/030_check-network.yml | 4 ++-- 42 files changed, 81 insertions(+), 81 deletions(-) rename roles/{kubespray-defaults => kubespray_defaults}/defaults/main/checksums.yml (100%) rename roles/{kubespray-defaults => kubespray_defaults}/defaults/main/download.yml (100%) rename roles/{kubespray-defaults => kubespray_defaults}/defaults/main/main.yml (100%) rename roles/{kubespray-defaults => kubespray_defaults}/vars/main.yml (100%) diff --git a/contrib/offline/README.md b/contrib/offline/README.md index 227a8c941..2fda91b30 100644 --- a/contrib/offline/README.md +++ b/contrib/offline/README.md @@ -31,7 +31,7 @@ manage-offline-container-images.sh register ## generate_list.sh -This script generates the list of downloaded files and the list of container images by `roles/kubespray-defaults/defaults/main/download.yml` file. +This script generates the list of downloaded files and the list of container images by `roles/kubespray_defaults/defaults/main/download.yml` file. Run this script will execute `generate_list.yml` playbook in kubespray root directory and generate four files, all downloaded files url in files.list, all container images in images.list, jinja2 templates in *.template. diff --git a/contrib/offline/generate_list.sh b/contrib/offline/generate_list.sh index 8cfcde5e2..6472044b2 100755 --- a/contrib/offline/generate_list.sh +++ b/contrib/offline/generate_list.sh @@ -5,7 +5,7 @@ CURRENT_DIR=$(cd $(dirname $0); pwd) TEMP_DIR="${CURRENT_DIR}/temp" REPO_ROOT_DIR="${CURRENT_DIR%/contrib/offline}" -: ${DOWNLOAD_YML:="roles/kubespray-defaults/defaults/main/download.yml"} +: ${DOWNLOAD_YML:="roles/kubespray_defaults/defaults/main/download.yml"} mkdir -p ${TEMP_DIR} @@ -19,7 +19,7 @@ sed -n '/^downloads:/,/download_defaults:/p' ${REPO_ROOT_DIR}/${DOWNLOAD_YML} \ | sed 'N;s#\n# #g' | tr ' ' ':' | sed 's/\"//g' > ${TEMP_DIR}/images.list.template # add kube-* images to images list template -# Those container images are downloaded by kubeadm, then roles/kubespray-defaults/defaults/main/download.yml +# Those container images are downloaded by kubeadm, then roles/kubespray_defaults/defaults/main/download.yml # doesn't contain those images. That is reason why here needs to put those images into the # list separately. KUBE_IMAGES="kube-apiserver kube-controller-manager kube-scheduler kube-proxy" diff --git a/contrib/offline/generate_list.yml b/contrib/offline/generate_list.yml index f103d031f..7560b3c38 100644 --- a/contrib/offline/generate_list.yml +++ b/contrib/offline/generate_list.yml @@ -5,7 +5,7 @@ roles: # Just load default variables from roles. - - role: kubespray-defaults + - role: kubespray_defaults when: false - role: download when: false diff --git a/docs/advanced/proxy.md b/docs/advanced/proxy.md index aea84c182..41883080e 100644 --- a/docs/advanced/proxy.md +++ b/docs/advanced/proxy.md @@ -1,6 +1,6 @@ # Setting up Environment Proxy -If you set http and https proxy, all nodes and loadbalancer will be excluded from proxy with generating no_proxy variable in `roles/kubespray-defaults/tasks/no_proxy.yml`, if you have additional resources for exclude add them to `additional_no_proxy` variable. If you want fully override your `no_proxy` setting, then fill in just `no_proxy` and no nodes or loadbalancer addresses will be added to no_proxy. +If you set http and https proxy, all nodes and loadbalancer will be excluded from proxy with generating no_proxy variable in `roles/kubespray_defaults/tasks/no_proxy.yml`, if you have additional resources for exclude add them to `additional_no_proxy` variable. If you want fully override your `no_proxy` setting, then fill in just `no_proxy` and no nodes or loadbalancer addresses will be added to no_proxy. ## Set proxy for http and https diff --git a/docs/ansible/vars.md b/docs/ansible/vars.md index 9419b1092..759e446ae 100644 --- a/docs/ansible/vars.md +++ b/docs/ansible/vars.md @@ -180,7 +180,7 @@ and ``kube_pods_subnet``, for example from the ``172.18.0.0/16``. IPv4 stack enable by *ipv4_stack* is set to ``true``, by default. IPv6 stack enable by *ipv6_stack* is set to ``false`` by default. -This will use the default IPv4 and IPv6 subnets specified in the defaults file in the ``kubespray-defaults`` role, unless overridden of course. The default config will give you room for up to 256 nodes with 126 pods per node, and up to 4096 services. +This will use the default IPv4 and IPv6 subnets specified in the defaults file in the ``kubespray_defaults`` role, unless overridden of course. The default config will give you room for up to 256 nodes with 126 pods per node, and up to 4096 services. Set both variables to ``true`` for Dual Stack mode. IPv4 has higher priority in Dual Stack mode(e.g. in variables `main_ip`, `main_access_ip` and other). You can also make IPv6 only clusters with ``false`` in *ipv4_stack*. diff --git a/docs/operating_systems/bootstrap-os.md b/docs/operating_systems/bootstrap-os.md index 5c779ff4b..fdda9eac6 100644 --- a/docs/operating_systems/bootstrap-os.md +++ b/docs/operating_systems/bootstrap-os.md @@ -48,7 +48,7 @@ Remember to disable fact gathering since Python might not be present on hosts. - hosts: all gather_facts: false # not all hosts might be able to run modules yet roles: - - kubespray-defaults + - kubespray_defaults - bootstrap-os ``` diff --git a/docs/operations/offline-environment.md b/docs/operations/offline-environment.md index 1d1e791e4..5a5137a53 100644 --- a/docs/operations/offline-environment.md +++ b/docs/operations/offline-environment.md @@ -136,7 +136,7 @@ If you use the settings like the one above, you'll need to define in your invent * `registry_host`: Container image registry. If you _don't_ use the same repository path for the container images that the ones defined - in [kubesprays-defaults's role defaults](https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray-defaults/defaults/main/download.yml) + in [kubesprays-defaults's role defaults](https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray_defaults/defaults/main/download.yml) , you need to override the `*_image_repo` for these container images. If you want to make your life easier, use the same repository path, you won't have to override anything else. * `registry_addr`: Container image registry, but only have [domain or ip]:[port]. diff --git a/extra_playbooks/migrate_openstack_provider.yml b/extra_playbooks/migrate_openstack_provider.yml index 002fa7155..92a3bffa2 100644 --- a/extra_playbooks/migrate_openstack_provider.yml +++ b/extra_playbooks/migrate_openstack_provider.yml @@ -12,7 +12,7 @@ hosts: kube_control_plane[0] tasks: - name: Include kubespray-default variables - include_vars: ../roles/kubespray-defaults/defaults/main/main.yml + include_vars: ../roles/kubespray_defaults/defaults/main/main.yml - name: Copy get_cinder_pvs.sh to first control plane node copy: src: get_cinder_pvs.sh diff --git a/extra_playbooks/upgrade-only-k8s.yml b/extra_playbooks/upgrade-only-k8s.yml index 5556f2674..1316cee10 100644 --- a/extra_playbooks/upgrade-only-k8s.yml +++ b/extra_playbooks/upgrade-only-k8s.yml @@ -14,7 +14,7 @@ hosts: localhost gather_facts: false roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: bastion-ssh-config, tags: ["localhost", "bastion"]} - name: Bootstrap hosts OS for Ansible @@ -26,14 +26,14 @@ # fail. bootstrap-os fixes this on these systems, so in later plays it can be enabled. ansible_ssh_pipelining: false roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: bootstrap-os, tags: bootstrap-os} - name: Preinstall hosts: k8s_cluster:etcd:calico_rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: kubernetes/preinstall, tags: preinstall } - name: Handle upgrades to control plane components first to maintain backwards compat. @@ -41,7 +41,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" serial: 1 roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: upgrade/pre-upgrade, tags: pre-upgrade } - { role: kubernetes/node, tags: node } - { role: kubernetes/control-plane, tags: master, upgrade_cluster_setup: true } @@ -54,8 +54,8 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" serial: "{{ serial | default('20%') }}" roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: upgrade/pre-upgrade, tags: pre-upgrade } - { role: kubernetes/node, tags: node } - { role: upgrade/post-upgrade, tags: post-upgrade } - - { role: kubespray-defaults} + - { role: kubespray_defaults} diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml index afaf861cc..0d624bfcc 100644 --- a/inventory/sample/group_vars/all/all.yml +++ b/inventory/sample/group_vars/all/all.yml @@ -57,7 +57,7 @@ loadbalancer_apiserver_healthcheck_port: 8081 # https_proxy: "" # https_proxy_cert_file: "" -## Refer to roles/kubespray-defaults/defaults/main/main.yml before modifying no_proxy +## Refer to roles/kubespray_defaults/defaults/main/main.yml before modifying no_proxy # no_proxy: "" ## Some problems may occur when downloading files over https proxy due to ansible bug diff --git a/playbooks/boilerplate.yml b/playbooks/boilerplate.yml index 789384773..b9dce71b0 100644 --- a/playbooks/boilerplate.yml +++ b/playbooks/boilerplate.yml @@ -42,5 +42,5 @@ gather_facts: false environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: bastion-ssh-config, tags: ["localhost", "bastion"] } diff --git a/playbooks/cluster.yml b/playbooks/cluster.yml index b3de2b736..bf9bc98f8 100644 --- a/playbooks/cluster.yml +++ b/playbooks/cluster.yml @@ -11,7 +11,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/preinstall, tags: preinstall } - { role: "container-engine", tags: "container-engine", when: deploy_container_engine } - { role: download, tags: download, when: "not skip_downloads" } @@ -28,7 +28,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/node, tags: node } - name: Install the control plane @@ -37,7 +37,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/control-plane, tags: master } - { role: kubernetes/client, tags: client } - { role: kubernetes-apps/cluster_roles, tags: cluster-roles } @@ -48,7 +48,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/kubeadm, tags: kubeadm} - { role: kubernetes/node-label, tags: node-label } - { role: kubernetes/node-taint, tags: node-taint } @@ -65,7 +65,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: network_plugin/calico/rr, tags: ['network', 'calico_rr'] } - name: Patch Kubernetes for Windows @@ -74,7 +74,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: win_nodes/kubernetes_patch, tags: ["master", "win_nodes"] } - name: Install Kubernetes apps @@ -83,7 +83,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes-apps/external_cloud_controller, tags: external-cloud-controller } - { role: kubernetes-apps/network_plugin, tags: network } - { role: kubernetes-apps/policy_controller, tags: policy-controller } @@ -97,5 +97,5 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_late: true } diff --git a/playbooks/install_etcd.yml b/playbooks/install_etcd.yml index eaf21254d..c40394144 100644 --- a/playbooks/install_etcd.yml +++ b/playbooks/install_etcd.yml @@ -2,7 +2,7 @@ - name: Add worker nodes to the etcd play if needed hosts: kube_node roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } tasks: - name: Check if nodes needs etcd client certs (depends on network_plugin) group_by: @@ -20,7 +20,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - role: etcd tags: etcd when: etcd_deployment_type != "kubeadm" diff --git a/playbooks/recover_control_plane.yml b/playbooks/recover_control_plane.yml index 35ed2c276..b380fc1f7 100644 --- a/playbooks/recover_control_plane.yml +++ b/playbooks/recover_control_plane.yml @@ -6,7 +6,7 @@ hosts: etcd[0] environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - role: recover_control_plane/etcd when: etcd_deployment_type != "kubeadm" @@ -14,7 +14,7 @@ hosts: kube_control_plane[0] environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: recover_control_plane/control-plane } - name: Apply whole cluster install @@ -24,5 +24,5 @@ hosts: kube_control_plane environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: recover_control_plane/post-recover } diff --git a/playbooks/remove_node.yml b/playbooks/remove_node.yml index 9fa2c550a..f4a3a1613 100644 --- a/playbooks/remove_node.yml +++ b/playbooks/remove_node.yml @@ -42,7 +42,7 @@ service_facts: when: reset_nodes | default(True) | bool roles: - - { role: kubespray-defaults, when: reset_nodes | default(True) | bool } + - { role: kubespray_defaults, when: reset_nodes | default(True) | bool } - { role: remove-node/pre-remove, tags: pre-remove } - role: remove-node/remove-etcd-node when: "'etcd' in group_names" @@ -54,5 +54,5 @@ gather_facts: false environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults, when: reset_nodes | default(True) | bool } + - { role: kubespray_defaults, when: reset_nodes | default(True) | bool } - { role: remove-node/post-remove, tags: post-remove } diff --git a/playbooks/reset.yml b/playbooks/reset.yml index 6fa18c0ac..3a1f7fd4f 100644 --- a/playbooks/reset.yml +++ b/playbooks/reset.yml @@ -30,6 +30,6 @@ environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults} + - { role: kubespray_defaults} - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_early: true } - { role: reset, tags: reset } diff --git a/playbooks/scale.yml b/playbooks/scale.yml index 374f31417..1d0e2424f 100644 --- a/playbooks/scale.yml +++ b/playbooks/scale.yml @@ -17,7 +17,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults, when: "not skip_downloads and download_run_once and not download_localhost" } + - { role: kubespray_defaults, when: "not skip_downloads and download_run_once and not download_localhost" } - { role: kubernetes/preinstall, tags: preinstall, when: "not skip_downloads and download_run_once and not download_localhost" } - { role: download, tags: download, when: "not skip_downloads and download_run_once and not download_localhost" } @@ -27,7 +27,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/preinstall, tags: preinstall } - { role: container-engine, tags: "container-engine", when: deploy_container_engine } - { role: download, tags: download, when: "not skip_downloads" } @@ -46,7 +46,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/node, tags: node } - name: Upload control plane certs and retrieve encryption key @@ -55,7 +55,7 @@ gather_facts: false tags: kubeadm roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } tasks: - name: Upload control plane certificates command: >- @@ -77,7 +77,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/kubeadm, tags: kubeadm } - { role: kubernetes/node-label, tags: node-label } - { role: kubernetes/node-taint, tags: node-taint } @@ -89,5 +89,5 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_late: true } diff --git a/playbooks/upgrade_cluster.yml b/playbooks/upgrade_cluster.yml index 26f080939..b0b3a0886 100644 --- a/playbooks/upgrade_cluster.yml +++ b/playbooks/upgrade_cluster.yml @@ -11,7 +11,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults, when: "not skip_downloads and download_run_once and not download_localhost"} + - { role: kubespray_defaults, when: "not skip_downloads and download_run_once and not download_localhost"} - { role: kubernetes/preinstall, tags: preinstall, when: "not skip_downloads and download_run_once and not download_localhost" } - { role: download, tags: download, when: "not skip_downloads and download_run_once and not download_localhost" } @@ -21,7 +21,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/preinstall, tags: preinstall } - { role: download, tags: download, when: "not skip_downloads" } @@ -32,7 +32,7 @@ environment: "{{ proxy_disable_env }}" serial: "{{ serial | default('20%') }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: container-engine, tags: "container-engine", when: deploy_container_engine } - name: Install etcd @@ -48,7 +48,7 @@ environment: "{{ proxy_disable_env }}" serial: 1 roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: upgrade/pre-upgrade, tags: pre-upgrade } - { role: upgrade/system-upgrade, tags: system-upgrade } - { role: download, tags: download, when: "system_upgrade and system_upgrade_reboot != 'never' and not skip_downloads" } @@ -70,7 +70,7 @@ serial: "{{ serial | default('20%') }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes-apps/external_cloud_controller, tags: external-cloud-controller } - { role: network_plugin, tags: network } - { role: kubernetes-apps/network_plugin, tags: network } @@ -83,7 +83,7 @@ environment: "{{ proxy_disable_env }}" serial: "{{ serial | default('20%') }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: upgrade/pre-upgrade, tags: pre-upgrade } - { role: upgrade/system-upgrade, tags: system-upgrade } - { role: download, tags: download, when: "system_upgrade and system_upgrade_reboot != 'never' and not skip_downloads" } @@ -100,7 +100,7 @@ any_errors_fatal: true environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: win_nodes/kubernetes_patch, tags: ["master", "win_nodes"] } - name: Install Calico Route Reflector @@ -109,7 +109,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: network_plugin/calico/rr, tags: network } - name: Install Kubernetes apps @@ -118,7 +118,7 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes-apps/ingress_controller, tags: ingress-controller } - { role: kubernetes-apps/external_provisioner, tags: external-provisioner } - { role: kubernetes-apps, tags: apps } @@ -129,5 +129,5 @@ any_errors_fatal: "{{ any_errors_fatal | default(true) }}" environment: "{{ proxy_disable_env }}" roles: - - { role: kubespray-defaults } + - { role: kubespray_defaults } - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_late: true } diff --git a/roles/bootstrap-os/meta/main.yml b/roles/bootstrap-os/meta/main.yml index a877a820e..5b1432e4a 100644 --- a/roles/bootstrap-os/meta/main.yml +++ b/roles/bootstrap-os/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - role: kubespray-defaults + - role: kubespray_defaults diff --git a/roles/container-engine/containerd/molecule/default/converge.yml b/roles/container-engine/containerd/molecule/default/converge.yml index 7847871e2..2a061fcb3 100644 --- a/roles/container-engine/containerd/molecule/default/converge.yml +++ b/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 diff --git a/roles/container-engine/containerd/molecule/default/prepare.yml b/roles/container-engine/containerd/molecule/default/prepare.yml index d70452edf..ae7e54e08 100644 --- a/roles/container-engine/containerd/molecule/default/prepare.yml +++ b/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 diff --git a/roles/container-engine/cri-dockerd/molecule/default/converge.yml b/roles/container-engine/cri-dockerd/molecule/default/converge.yml index be6fa3812..050537343 100644 --- a/roles/container-engine/cri-dockerd/molecule/default/converge.yml +++ b/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 diff --git a/roles/container-engine/cri-dockerd/molecule/default/prepare.yml b/roles/container-engine/cri-dockerd/molecule/default/prepare.yml index b5328422a..a82f0e4d6 100644 --- a/roles/container-engine/cri-dockerd/molecule/default/prepare.yml +++ b/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 diff --git a/roles/container-engine/cri-o/molecule/default/converge.yml b/roles/container-engine/cri-o/molecule/default/converge.yml index 376f07c45..85361b439 100644 --- a/roles/container-engine/cri-o/molecule/default/converge.yml +++ b/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 diff --git a/roles/container-engine/cri-o/molecule/default/prepare.yml b/roles/container-engine/cri-o/molecule/default/prepare.yml index 8b11dff53..13120878d 100644 --- a/roles/container-engine/cri-o/molecule/default/prepare.yml +++ b/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 diff --git a/roles/container-engine/gvisor/molecule/default/converge.yml b/roles/container-engine/gvisor/molecule/default/converge.yml index b14d078a1..552a88889 100644 --- a/roles/container-engine/gvisor/molecule/default/converge.yml +++ b/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 diff --git a/roles/container-engine/gvisor/molecule/default/prepare.yml b/roles/container-engine/gvisor/molecule/default/prepare.yml index 57c21f2dd..3b8c64427 100644 --- a/roles/container-engine/gvisor/molecule/default/prepare.yml +++ b/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: diff --git a/roles/container-engine/kata-containers/molecule/default/converge.yml b/roles/container-engine/kata-containers/molecule/default/converge.yml index a6fdf812a..9a7922e9f 100644 --- a/roles/container-engine/kata-containers/molecule/default/converge.yml +++ b/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 diff --git a/roles/container-engine/kata-containers/molecule/default/prepare.yml b/roles/container-engine/kata-containers/molecule/default/prepare.yml index a5abd27bb..4c45d0225 100644 --- a/roles/container-engine/kata-containers/molecule/default/prepare.yml +++ b/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: diff --git a/roles/container-engine/youki/molecule/default/converge.yml b/roles/container-engine/youki/molecule/default/converge.yml index 11ef8f6bf..caa617655 100644 --- a/roles/container-engine/youki/molecule/default/converge.yml +++ b/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 diff --git a/roles/container-engine/youki/molecule/default/prepare.yml b/roles/container-engine/youki/molecule/default/prepare.yml index a72bdad7f..be6c7faa5 100644 --- a/roles/container-engine/youki/molecule/default/prepare.yml +++ b/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: diff --git a/roles/kubespray-defaults/defaults/main/checksums.yml b/roles/kubespray_defaults/defaults/main/checksums.yml similarity index 100% rename from roles/kubespray-defaults/defaults/main/checksums.yml rename to roles/kubespray_defaults/defaults/main/checksums.yml diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray_defaults/defaults/main/download.yml similarity index 100% rename from roles/kubespray-defaults/defaults/main/download.yml rename to roles/kubespray_defaults/defaults/main/download.yml diff --git a/roles/kubespray-defaults/defaults/main/main.yml b/roles/kubespray_defaults/defaults/main/main.yml similarity index 100% rename from roles/kubespray-defaults/defaults/main/main.yml rename to roles/kubespray_defaults/defaults/main/main.yml diff --git a/roles/kubespray-defaults/vars/main.yml b/roles/kubespray_defaults/vars/main.yml similarity index 100% rename from roles/kubespray-defaults/vars/main.yml rename to roles/kubespray_defaults/vars/main.yml diff --git a/roles/network_facts/meta/main.yml b/roles/network_facts/meta/main.yml index a877a820e..5b1432e4a 100644 --- a/roles/network_facts/meta/main.yml +++ b/roles/network_facts/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - role: kubespray-defaults + - role: kubespray_defaults diff --git a/roles/validate_inventory/meta/main.yml b/roles/validate_inventory/meta/main.yml index a877a820e..5b1432e4a 100644 --- a/roles/validate_inventory/meta/main.yml +++ b/roles/validate_inventory/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - role: kubespray-defaults + - role: kubespray_defaults diff --git a/roles/validate_inventory/tasks/main.yml b/roles/validate_inventory/tasks/main.yml index 4168aefe8..f75cd95a5 100644 --- a/roles/validate_inventory/tasks/main.yml +++ b/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'. diff --git a/scripts/assert-sorted-checksums.yml b/scripts/assert-sorted-checksums.yml index 9cf80eb6d..897938bb5 100755 --- a/scripts/assert-sorted-checksums.yml +++ b/scripts/assert-sorted-checksums.yml @@ -5,13 +5,13 @@ connection: local gather_facts: false vars: - fallback_ip: 'bypass tasks in kubespray-defaults' + fallback_ip: 'bypass tasks in kubespray_defaults' _keys: "{{ query('ansible.builtin.varnames', '^.+_checksums$') }}" _values: "{{ query('ansible.builtin.vars', *_keys) | map('dict2items') }}" _components_archs_values: "{{ _keys | zip(_values) | community.general.dict | dict2items | subelements('value') }}" _minimal_data_needed: "{{ _components_archs_values | map(attribute='0.key') | zip(_components_archs_values | map(attribute='1')) }}" roles: - - kubespray-defaults + - kubespray_defaults tasks: - name: Check all versions are strings assert: diff --git a/scripts/component_hash_update/src/component_hash_update/download.py b/scripts/component_hash_update/src/component_hash_update/download.py index 843a2f8ed..21d2bfb1e 100644 --- a/scripts/component_hash_update/src/component_hash_update/download.py +++ b/scripts/component_hash_update/src/component_hash_update/download.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # After a new version of Kubernetes has been released, -# run this script to update roles/kubespray-defaults/defaults/main/download.yml +# run this script to update roles/kubespray_defaults/defaults/main/download.yml # with new hashes. import sys @@ -25,7 +25,7 @@ from typing import Optional, Any from . import components -CHECKSUMS_YML = Path("roles/kubespray-defaults/defaults/main/checksums.yml") +CHECKSUMS_YML = Path("roles/kubespray_defaults/defaults/main/checksums.yml") logger = logging.getLogger(__name__) diff --git a/scripts/propagate_ansible_variables.yml b/scripts/propagate_ansible_variables.yml index 745c80ce2..1316572f2 100755 --- a/scripts/propagate_ansible_variables.yml +++ b/scripts/propagate_ansible_variables.yml @@ -5,11 +5,11 @@ connection: local gather_facts: false vars: - fallback_ip: 'bypass tasks in kubespray-defaults' + fallback_ip: 'bypass tasks in kubespray_defaults' roles: - - kubespray-defaults + - kubespray_defaults tasks: - - name: Include versions not in kubespray-defaults + - name: Include versions not in kubespray_defaults include_vars: "{{ item }}" loop: - ../roles/container-engine/docker/defaults/main.yml diff --git a/tests/testcases/030_check-network.yml b/tests/testcases/030_check-network.yml index 1ee69164e..e3e5a9b80 100644 --- a/tests/testcases/030_check-network.yml +++ b/tests/testcases/030_check-network.yml @@ -4,8 +4,8 @@ vars: test_image_repo: registry.k8s.io/e2e-test-images/agnhost test_image_tag: "2.40" - # TODO: source those from kubespray-defaults instead. - # Needs kubespray-defaults to be decoupled from no-proxy stuff + # TODO: source those from kubespray_defaults instead. + # Needs kubespray_defaults to be decoupled from no-proxy stuff bin_dir: "/usr/local/bin" kube_pods_subnet: "{{ 'fd85:ee78:d8a6:8607::1:0000/112' if not (ipv4_stack | default(true)) else '10.233.64.0/18' }}"