From 2286cb56a9de579366f58d57c2b055ede74cb3eb Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Thu, 9 Jan 2025 16:00:52 -0800 Subject: [PATCH] Change Ansible group names --- Vagrantfile | 8 ++--- _commons.sh | 48 +++++++++++++------------- _functions.sh | 2 +- aio.sh | 10 +++--- ci/bootstrap.sh | 8 ++--- config/default.yml | 10 +++--- config/samples/pdf.yml.distros | 18 +++++----- config/samples/pdf.yml.intel_dpdk | 8 ++--- config/samples/pdf.yml.intel_kernel | 8 ++--- config/samples/pdf.yml.localai | 4 +-- config/samples/pdf.yml.mini | 6 ++-- config/samples/pdf.yml.storage | 12 +++---- diagram.py | 4 +-- docs/src/architecture.rst | 2 +- docs/src/bare_metal_provisioning.rst | 8 ++--- docs/src/benchmark_ingress.rst | 6 ++-- docs/src/benchmark_network.rst | 6 ++-- playbooks/configure-addons.yml | 2 +- playbooks/configure-virtlet.yml | 2 +- playbooks/roles/virtlet/tasks/main.yml | 2 +- tests/configure-envoy.yml | 2 +- 21 files changed, 88 insertions(+), 88 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 39eac6a1..54860fa9 100644 --- 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 index 6540268b..8d7e1f05 100755 --- 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,35 +161,35 @@ EOF fi export KRD_DOWNLOAD_LOCALHOST=$KRD_DOWNLOAD_RUN_ONCE export KUBESPRAY_ETCD_KUBELET_DEPLOYMENT_TYPE - envsubst "$krd_inventory_folder/group_vars/k8s-cluster.yml" + envsubst "$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 @@ -197,30 +197,30 @@ EOF 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 index 780e9123..fbe1aa4a 100755 --- 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 index 28a65744..6f058649 100755 --- 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 index 55df97c9..47e05ec1 100755 --- 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 index 184726a6..9bd1e9b4 100644 --- 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 index 6eae4c10..cfa00d10 100644 --- 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 index 47d82765..6fb81944 100644 --- 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 index eba620b5..19b6c604 100644 --- 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 index 5e0a67ff..c96510c2 100644 --- 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 diff --git a/config/samples/pdf.yml.mini b/config/samples/pdf.yml.mini index d3e5d67c..3a17c2d0 100644 --- a/config/samples/pdf.yml.mini +++ b/config/samples/pdf.yml.mini @@ -18,7 +18,7 @@ memory: 4096 cpus: 1 roles: - - kube-master + - kube_control_plane - etcd - name: minion01 os: @@ -30,7 +30,7 @@ memory: 4096 cpus: 1 roles: - - kube-node + - kube_node - name: minion02 os: name: ubuntu @@ -41,4 +41,4 @@ memory: 4096 cpus: 1 roles: - - kube-node + - kube_node diff --git a/config/samples/pdf.yml.storage b/config/samples/pdf.yml.storage index bcd0e8d0..67257078 100644 --- a/config/samples/pdf.yml.storage +++ b/config/samples/pdf.yml.storage @@ -18,7 +18,7 @@ memory: 8192 cpus: 4 roles: - - kube-master + - kube_control_plane - etcd volumes: - name: sda @@ -34,7 +34,7 @@ memory: 16384 cpus: 8 roles: - - kube-node + - kube_node storage_controllers: - name: Virtual I/O Device SCSI controller type: virtio-scsi @@ -73,7 +73,7 @@ memory: 16384 cpus: 8 roles: - - kube-node + - kube_node storage_controllers: - name: Virtual I/O Device SCSI controller type: virtio-scsi @@ -112,7 +112,7 @@ memory: 16384 cpus: 8 roles: - - kube-node + - kube_node storage_controllers: - name: Virtual I/O Device SCSI controller type: virtio-scsi @@ -151,7 +151,7 @@ memory: 16384 cpus: 8 roles: - - kube-node + - kube_node storage_controllers: - name: Virtual I/O Device SCSI controller type: virtio-scsi @@ -190,7 +190,7 @@ memory: 16384 cpus: 8 roles: - - kube-node + - kube_node storage_controllers: - name: Virtual I/O Device SCSI controller type: virtio-scsi diff --git a/diagram.py b/diagram.py index f125daf2..1032193b 100644 --- a/diagram.py +++ b/diagram.py @@ -44,11 +44,11 @@ nodes.append(Suse()) with diagrams.Cluster("Kubernetes Roles"): roles = [] - if "kube-master" in node["roles"]: + if "kube_control_plane" in node["roles"]: roles.append(k8s_infra.Master()) if "etcd" in node["roles"]: roles.append(k8s_infra.ETCD()) - if "kube-node" in node["roles"]: + if "kube_node" in node["roles"]: roles.append(k8s_infra.Node()) installer = Ubuntu("installer\n10.10.16.2") diff --git a/docs/src/architecture.rst b/docs/src/architecture.rst index 51d26f57..3030f6d8 100644 --- a/docs/src/architecture.rst +++ b/docs/src/architecture.rst @@ -138,7 +138,7 @@ This folder contains the Ansible host inventory file. The Ansible playbooks, is autogenerated by Vagrant using the values specified in the *config/pdf.yml* file (or *config/default.yml*). -k8s-cluster.yml +k8s_cluster.yml *************** A preferred practice in Ansible is to not store variables in the diff --git a/docs/src/bare_metal_provisioning.rst b/docs/src/bare_metal_provisioning.rst index 53616dad..284a5d10 100644 --- a/docs/src/bare_metal_provisioning.rst +++ b/docs/src/bare_metal_provisioning.rst @@ -83,18 +83,18 @@ addressing those tasks to localhost. [all] localhost - [kube-master] + [kube_control_plane] localhost - [kube-node] + [kube_node] localhost [etcd] localhost [k8s-cluster:children] - kube-node - kube-master + kube_node + kube_control_plane EOL Ansible uses SSH protocol for executing remote instructions. The diff --git a/docs/src/benchmark_ingress.rst b/docs/src/benchmark_ingress.rst index ee94daa6..9c1f183f 100644 --- a/docs/src/benchmark_ingress.rst +++ b/docs/src/benchmark_ingress.rst @@ -73,7 +73,7 @@ This setup can be achieved creating the following *config/pdf.yml* file: size: 25 mount: /var/lib/docker/ roles: - - kube-master + - kube_control_plane - etcd - name: worker01 os: @@ -89,7 +89,7 @@ This setup can be achieved creating the following *config/pdf.yml* file: size: 25 mount: /var/lib/docker/ roles: - - kube-node + - kube_node - name: worker02 os: name: ubuntu @@ -104,7 +104,7 @@ This setup can be achieved creating the following *config/pdf.yml* file: size: 25 mount: /var/lib/docker/ roles: - - kube-node + - kube_node Once the Kubernetes cluster is provisioned by vagrant is possible to execute the networking benchmark process. A new k6 log file will be created on the diff --git a/docs/src/benchmark_network.rst b/docs/src/benchmark_network.rst index 255cba0e..7b226668 100644 --- a/docs/src/benchmark_network.rst +++ b/docs/src/benchmark_network.rst @@ -78,7 +78,7 @@ achieved creating the following *config/pdf.yml* file: port: 1 device: 0 roles: - - kube-master + - kube_control_plane - etcd - name: worker01 os: @@ -101,7 +101,7 @@ achieved creating the following *config/pdf.yml* file: port: 1 device: 0 roles: - - kube-node + - kube_node - name: worker02 os: name: ubuntu @@ -123,7 +123,7 @@ achieved creating the following *config/pdf.yml* file: port: 1 device: 0 roles: - - kube-node + - kube_node Once the Kubernetes cluster is provisioned by vagrant is possible to execute the networking benchmark process. A new iperf log file will be created on the diff --git a/playbooks/configure-addons.yml b/playbooks/configure-addons.yml index 8fedb891..46730749 100644 --- a/playbooks/configure-addons.yml +++ b/playbooks/configure-addons.yml @@ -114,7 +114,7 @@ - name: Build intel-qat-plugin in kerneldrv mode vars: qat_plugin_repo_folder: /tmp/intel-device-plugins-for-kubernetes - hosts: kube-node + hosts: kube_node tags: - qat - qat-plugin diff --git a/playbooks/configure-virtlet.yml b/playbooks/configure-virtlet.yml index e99702eb..b0b8ebcc 100644 --- a/playbooks/configure-virtlet.yml +++ b/playbooks/configure-virtlet.yml @@ -13,7 +13,7 @@ roles: - virtlet - name: Install virtlet - hosts: kube-node + hosts: kube_node tags: virtlet roles: - criproxy diff --git a/playbooks/roles/virtlet/tasks/main.yml b/playbooks/roles/virtlet/tasks/main.yml index e3d0d06f..6886276d 100644 --- a/playbooks/roles/virtlet/tasks/main.yml +++ b/playbooks/roles/virtlet/tasks/main.yml @@ -9,7 +9,7 @@ ############################################################################## - name: Apply virtlet extraRuntime label ansible.builtin.command: "/usr/local/bin/kubectl label node {{ item }} extraRuntime=virtlet --overwrite" - with_inventory_hostnames: kube-node + with_inventory_hostnames: kube_node changed_when: false - name: Create Virtlet binary folder ansible.builtin.file: diff --git a/tests/configure-envoy.yml b/tests/configure-envoy.yml index 607cc1b1..9a27a23e 100644 --- a/tests/configure-envoy.yml +++ b/tests/configure-envoy.yml @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -- hosts: kube-node +- hosts: kube_node vars: qat_envoy_dest: /tmp/kubernetes-qat-envoy roles: