Change Ansible group names

electrocucaracha · Jan 10, 2025 · 2286cb5 · 2286cb5
1 parent b581842
commit 2286cb5
Show file tree

Hide file tree

Showing 21 changed files with 88 additions and 88 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -37,13 +37,13 @@ File.open("#{File.dirname(__FILE__)}/inventory/hosts.ini", "w") do |inventory_fi
     inventory_file.puts("#{node['name']}\t\tansible_host=#{node['networks'][0]['ip']}\tip=#{node['networks'][0]['ip']}")
     etchosts_dict += "#{node['networks'][0]['ip']}-#{node['name']},"
   end
-  %w[kube-master kube-node etcd qat-node criu].each do |group|
+  %w[kube_control_plane kube_node etcd qat-node criu].each do |group|
     inventory_file.puts("\n[#{group}]")
     nodes.each do |node|
       inventory_file.puts(node["name"]) if node["roles"].include?(group.to_s)
     end
   end
-  inventory_file.puts("\n[k8s_cluster:children]\nkube-node\nkube-master")
+  inventory_file.puts("\n[k8s_cluster:children]\nkube_node\nkube_control_plane")
 end
 
 system("echo -e \"\n\n\n\" | ssh-keygen -f #{File.dirname(__FILE__)}/insecure_keys/key -t rsa -N ''") unless File.exist?("#{File.dirname(__FILE__)}/insecure_keys/key")
@@ -162,7 +162,7 @@ Vagrant.configure("2") do |config|
       nodeconfig.vm.box = vagrant_boxes[node["os"]["name"]][node["os"]["release"]]["name"]
       nodeconfig.vm.box_version = vagrant_boxes[node["os"]["name"]][node["os"]["release"]]["version"] if vagrant_boxes[node["os"]["name"]][node["os"]["release"]].key? "version"
       nodeconfig.vm.provider "virtualbox" do |v, _override|
-        v.customize ["modifyvm", :id, "--nested-hw-virt", "on"] if node["roles"].include?("kube-node")
+        v.customize ["modifyvm", :id, "--nested-hw-virt", "on"] if node["roles"].include?("kube_node")
         if node.key? "storage_controllers"
           node["storage_controllers"].each do |storage_controller|
             # Add VirtualBox storage controllers if they weren't added before
@@ -203,7 +203,7 @@ Vagrant.configure("2") do |config|
       end
       nodeconfig.vm.provider "libvirt" do |v, _override|
         v.disk_bus = "sata"
-        v.nested = true if node["roles"].include?("kube-node")
+        v.nested = true if node["roles"].include?("kube_node")
         v.loader = loader if node["os"] == "clearlinux"
         v.cpu_mode = "host-passthrough"
         if node.key? "volumes"

diff --git a/_commons.sh b/_commons.sh
@@ -31,8 +31,8 @@ export galaxy_base_path=/tmp/galaxy/
 function _get_kube_version {
     if command -v kubectl >/dev/null && kubectl version >/dev/null 2>&1; then
         kubectl version -o yaml | grep gitVersion | awk 'FNR==2{ print $2}'
-    elif [ -f "$KRD_FOLDER/k8s-cluster.yml" ]; then
-        grep kube_version "$KRD_FOLDER/k8s-cluster.yml" | awk '{ print $2}'
+    elif [ -f "$KRD_FOLDER/k8s_cluster.yml" ]; then
+        grep kube_version "$KRD_FOLDER/k8s_cluster.yml" | awk '{ print $2}'
     elif [ -n "${KRD_KUBE_VERSION-}" ]; then
         echo "${KRD_KUBE_VERSION}"
     else
@@ -161,66 +161,66 @@ EOF
     fi
     export KRD_DOWNLOAD_LOCALHOST=$KRD_DOWNLOAD_RUN_ONCE
     export KUBESPRAY_ETCD_KUBELET_DEPLOYMENT_TYPE
-    envsubst <k8s-cluster.tpl >"$krd_inventory_folder/group_vars/k8s-cluster.yml"
+    envsubst <k8s-cluster.tpl >"$krd_inventory_folder/group_vars/k8s_cluster.yml"
     if [ -n "${KRD_KUBE_VERSION-}" ]; then
-        sed -i "s/^kube_version: .*$/kube_version: ${KRD_KUBE_VERSION}/" "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+        sed -i "s/^kube_version: .*$/kube_version: ${KRD_KUBE_VERSION}/" "$krd_inventory_folder/group_vars/k8s_cluster.yml"
     fi
     if [ -n "${KRD_MANUAL_DNS_SERVER-}" ]; then
-        sed -i "s/^manual_dns_server: .*$/manual_dns_server: $KRD_MANUAL_DNS_SERVER/" "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+        sed -i "s/^manual_dns_server: .*$/manual_dns_server: $KRD_MANUAL_DNS_SERVER/" "$krd_inventory_folder/group_vars/k8s_cluster.yml"
     fi
     if [ -n "${KRD_REGISTRY_MIRRORS_LIST-}" ] && [ "$KRD_CONTAINER_RUNTIME" != "containerd" ]; then
         if [ "$KRD_CONTAINER_RUNTIME" == "docker" ]; then
-            echo "docker_registry_mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+            echo "docker_registry_mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             for mirror in ${KRD_REGISTRY_MIRRORS_LIST//,/ }; do
-                echo "  - $mirror" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                echo "  - $mirror" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             done
         elif [ "$KRD_CONTAINER_RUNTIME" == "crio" ]; then
-            echo "crio_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+            echo "crio_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             if _vercmp "${kubespray_version#*v}" '<' "2.18"; then
                 for mirror in ${KRD_REGISTRY_MIRRORS_LIST//,/ }; do
-                    echo "  - ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                    echo "  - ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
                 done
             else
-                echo "  - location: registry-1.docker.io" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
-                echo "    unqualified: false" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
-                echo "    mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                echo "  - location: registry-1.docker.io" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
+                echo "    unqualified: false" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
+                echo "    mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
                 for mirror in ${KRD_REGISTRY_MIRRORS_LIST//,/ }; do
-                    echo "      - location: ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                    echo "      - location: ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
                     if [[ ${mirror#*//} == *"$KRD_INSECURE_REGISTRIES_LIST"* ]]; then
-                        echo "        insecure: true" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                        echo "        insecure: true" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
                     else
-                        echo "        insecure: false" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                        echo "        insecure: false" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
                     fi
                 done
             fi
         fi
     fi
     if [ -n "${KRD_INSECURE_REGISTRIES_LIST-}" ] && [ "$KRD_CONTAINER_RUNTIME" != "containerd" ]; then
         if [ "$KRD_CONTAINER_RUNTIME" == "docker" ]; then
-            echo "docker_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+            echo "docker_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             for registry in ${KRD_INSECURE_REGISTRIES_LIST//,/ }; do
-                echo "  - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                echo "  - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             done
         elif [ "$KRD_CONTAINER_RUNTIME" == "crio" ] && _vercmp "${kubespray_version#*v}" '<' "2.18"; then
-            echo "crio_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+            echo "crio_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             for registry in ${KRD_INSECURE_REGISTRIES_LIST//,/ }; do
-                echo "  - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+                echo "  - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
             done
         fi
     fi
     if [ -n "${KRD_DNS_ETCHOSTS_DICT-}" ]; then
-        echo "dns_etchosts: |" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+        echo "dns_etchosts: |" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
         for etchost_entry in ${KRD_DNS_ETCHOSTS_DICT//,/ }; do
-            echo "  ${etchost_entry%-*} ${etchost_entry#*-}" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+            echo "  ${etchost_entry%-*} ${etchost_entry#*-}" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
         done
     fi
     if [ "$KRD_NETWORK_PLUGIN" == "cilium" ] && [ "$KRD_CILIUM_TUNNEL_MODE" == "disabled" ]; then
-        echo "cilium_auto_direct_node_routes: true" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+        echo "cilium_auto_direct_node_routes: true" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
     fi
     if [ "$kubespray_version" != "master" ] && _vercmp "${kubespray_version#*v}" '>' "2.15" && [ "$KRD_METALLB_ENABLED" == "true" ] && [ -n "${KRD_METALLB_ADDRESS_POOLS_LIST-}" ]; then
-        echo "metallb_ip_range:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+        echo "metallb_ip_range:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
         for pool in ${KRD_METALLB_ADDRESS_POOLS_LIST//,/ }; do
-            echo "  - $pool" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+            echo "  - $pool" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
         done
     fi
 }

diff --git a/_functions.sh b/_functions.sh
@@ -45,7 +45,7 @@ function upgrade_k8s {
         $PIP_CMD -r ./requirements.txt
         popd
     fi
-    sed -i "s/^kube_version: .*\$/kube_version: $KRD_KUBE_VERSION/" "$krd_inventory_folder/group_vars/k8s-cluster.yml"
+    sed -i "s/^kube_version: .*\$/kube_version: $KRD_KUBE_VERSION/" "$krd_inventory_folder/group_vars/k8s_cluster.yml"
     _run_ansible_cmd "$kubespray_folder/upgrade-cluster.yml" "upgrade-cluster-kubernetes.log"
 
     sudo cp "$krd_inventory_folder/artifacts/admin.conf" "$HOME/.kube/config"

diff --git a/aio.sh b/aio.sh
@@ -82,18 +82,18 @@ if [[ $krd_actions_list == *k8s* ]]; then
 [all]
 $hostname
 
-[kube-master]
+[kube_control_plane]
 $hostname	ansible_host=$ip_address ip=$ip_address
 
-[kube-node]
+[kube_node]
 $hostname	ansible_host=$ip_address ip=$ip_address
 
 [etcd]
 $hostname	ansible_host=$ip_address ip=$ip_address
 
-[k8s-cluster:children]
-kube-node
-kube-master
+[k8s_cluster:children]
+kube_node
+kube_control_plane
 EOL
 fi
 

diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
@@ -81,9 +81,9 @@ if [[ ${TEST_MULTINODE:-false} == "false" ]]; then
       port: 4
       device: 0
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
-    - kube-node
+    - kube_node
     - qat-node
 EOL
     # editorconfig-checker-enable
@@ -112,7 +112,7 @@ else
       port: 1
       device: 0
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 EOL
     # editorconfig-checker-enable
@@ -141,7 +141,7 @@ EOL
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 EOL
         # editorconfig-checker-enable
     done

diff --git a/config/default.yml b/config/default.yml
@@ -17,7 +17,7 @@
   memory: 8192
   cpus: 2
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 - name: "controller02"
   os:
@@ -29,7 +29,7 @@
   memory: 8192
   cpus: 2
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 - name: "controller03"
   os:
@@ -41,7 +41,7 @@
   memory: 8192
   cpus: 2
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 - name: "compute01"
   os:
@@ -84,7 +84,7 @@
       port: 1
       device: 1
   roles:
-    - kube-node
+    - kube_node
     - qat-node
 - name: "compute02"
   os:
@@ -121,4 +121,4 @@
       port: 1
       device: 1
   roles:
-    - kube-node
+    - kube_node
diff --git a/config/samples/pdf.yml.distros b/config/samples/pdf.yml.distros
@@ -19,7 +19,7 @@
       port: 1
       device: 0
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 - name: ubuntu18
   os:
@@ -42,7 +42,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: ubuntu20
   os:
     name: ubuntu
@@ -64,7 +64,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: ubuntu22
   os:
     name: ubuntu
@@ -86,7 +86,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: opensuse15
   os:
     name: opensuse
@@ -108,7 +108,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: fedora37
   os:
     name: fedora
@@ -130,7 +130,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: fedora38
   os:
     name: fedora
@@ -152,7 +152,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: fedora39
   os:
     name: fedora39
@@ -174,7 +174,7 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
 - name: fedora40
   os:
     name: fedora
@@ -196,4 +196,4 @@
       port: 1
       device: 0
   roles:
-    - kube-node
+    - kube_node
diff --git a/config/samples/pdf.yml.intel_dpdk b/config/samples/pdf.yml.intel_dpdk
@@ -18,7 +18,7 @@
   memory: 8192
   cpus: 8
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 - name: "compute01"
   os:
@@ -60,7 +60,7 @@
       size: 50
       mount: /var/lib/docker/
   roles:
-    - kube-node
+    - kube_node
     - qat-node
 - name: "compute02"
   os:
@@ -102,7 +102,7 @@
       size: 50
       mount: /var/lib/docker/
   roles:
-    - kube-node
+    - kube_node
     - qat-node
 - name: "compute03"
   os:
@@ -144,5 +144,5 @@
       size: 50
       mount: /var/lib/docker/
   roles:
-    - kube-node
+    - kube_node
     - qat-node
diff --git a/config/samples/pdf.yml.intel_kernel b/config/samples/pdf.yml.intel_kernel
@@ -18,7 +18,7 @@
   memory: 8192
   cpus: 8
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
 - name: "compute01"
   os:
@@ -45,7 +45,7 @@
       size: 50
       mount: /var/lib/docker/
   roles:
-    - kube-node
+    - kube_node
     - qat-node
 - name: "compute02"
   os:
@@ -72,7 +72,7 @@
       size: 50
       mount: /var/lib/docker/
   roles:
-    - kube-node
+    - kube_node
     - qat-node
 - name: "compute03"
   os:
@@ -99,5 +99,5 @@
       size: 50
       mount: /var/lib/docker/
   roles:
-    - kube-node
+    - kube_node
     - qat-node
diff --git a/config/samples/pdf.yml.localai b/config/samples/pdf.yml.localai
@@ -37,6 +37,6 @@
       port: 4
       device: 0
   roles:
-    - kube-master
+    - kube_control_plane
     - etcd
-    - kube-node
+    - kube_node