Skip to content

Commit ffdda32

Browse files
electrocucarachaelectrocucaracha
committed
Change Ansible group names
1 parent fd3d95c commit ffdda32

21 files changed

+88
-88
lines changed

‎Vagrantfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ File.open("#{File.dirname(__FILE__)}/inventory/hosts.ini", "w") do |inventory_fi
3737
inventory_file.puts("#{node['name']}\t\tansible_host=#{node['networks'][0]['ip']}\tip=#{node['networks'][0]['ip']}")
3838
etchosts_dict += "#{node['networks'][0]['ip']}-#{node['name']},"
3939
end
40-
%w[kube-master kube-node etcd qat-node criu].each do |group|
40+
%w[kube_control_plane kube_node etcd qat-node criu].each do |group|
4141
inventory_file.puts("\n[#{group}]")
4242
nodes.each do |node|
4343
inventory_file.puts(node["name"]) if node["roles"].include?(group.to_s)
4444
end
4545
end
46-
inventory_file.puts("\n[k8s_cluster:children]\nkube-node\nkube-master")
46+
inventory_file.puts("\n[k8s_cluster:children]\nkube_node\nkube_control_plane")
4747
end
4848

4949
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|
162162
nodeconfig.vm.box = vagrant_boxes[node["os"]["name"]][node["os"]["release"]]["name"]
163163
nodeconfig.vm.box_version = vagrant_boxes[node["os"]["name"]][node["os"]["release"]]["version"] if vagrant_boxes[node["os"]["name"]][node["os"]["release"]].key? "version"
164164
nodeconfig.vm.provider "virtualbox" do |v, _override|
165-
v.customize ["modifyvm", :id, "--nested-hw-virt", "on"] if node["roles"].include?("kube-node")
165+
v.customize ["modifyvm", :id, "--nested-hw-virt", "on"] if node["roles"].include?("kube_node")
166166
if node.key? "storage_controllers"
167167
node["storage_controllers"].each do |storage_controller|
168168
# Add VirtualBox storage controllers if they weren't added before
@@ -203,7 +203,7 @@ Vagrant.configure("2") do |config|
203203
end
204204
nodeconfig.vm.provider "libvirt" do |v, _override|
205205
v.disk_bus = "sata"
206-
v.nested = true if node["roles"].include?("kube-node")
206+
v.nested = true if node["roles"].include?("kube_node")
207207
v.loader = loader if node["os"] == "clearlinux"
208208
v.cpu_mode = "host-passthrough"
209209
if node.key? "volumes"

‎_commons.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export galaxy_base_path=/tmp/galaxy/
3131
function _get_kube_version {
3232
if command -v kubectl >/dev/null && kubectl version >/dev/null 2>&1; then
3333
kubectl version -o yaml | grep gitVersion | awk 'FNR==2{ print $2}'
34-
elif [ -f "$KRD_FOLDER/k8s-cluster.yml" ]; then
35-
grep kube_version "$KRD_FOLDER/k8s-cluster.yml" | awk '{ print $2}'
34+
elif [ -f "$KRD_FOLDER/k8s_cluster.yml" ]; then
35+
grep kube_version "$KRD_FOLDER/k8s_cluster.yml" | awk '{ print $2}'
3636
elif [ -n "${KRD_KUBE_VERSION-}" ]; then
3737
echo "${KRD_KUBE_VERSION}"
3838
else
@@ -161,66 +161,66 @@ EOF
161161
fi
162162
export KRD_DOWNLOAD_LOCALHOST=$KRD_DOWNLOAD_RUN_ONCE
163163
export KUBESPRAY_ETCD_KUBELET_DEPLOYMENT_TYPE
164-
envsubst <k8s-cluster.tpl >"$krd_inventory_folder/group_vars/k8s-cluster.yml"
164+
envsubst <k8s-cluster.tpl >"$krd_inventory_folder/group_vars/k8s_cluster.yml"
165165
if [ -n "${KRD_KUBE_VERSION-}" ]; then
166-
sed -i "s/^kube_version: .*$/kube_version: ${KRD_KUBE_VERSION}/" "$krd_inventory_folder/group_vars/k8s-cluster.yml"
166+
sed -i "s/^kube_version: .*$/kube_version: ${KRD_KUBE_VERSION}/" "$krd_inventory_folder/group_vars/k8s_cluster.yml"
167167
fi
168168
if [ -n "${KRD_MANUAL_DNS_SERVER-}" ]; then
169-
sed -i "s/^manual_dns_server: .*$/manual_dns_server: $KRD_MANUAL_DNS_SERVER/" "$krd_inventory_folder/group_vars/k8s-cluster.yml"
169+
sed -i "s/^manual_dns_server: .*$/manual_dns_server: $KRD_MANUAL_DNS_SERVER/" "$krd_inventory_folder/group_vars/k8s_cluster.yml"
170170
fi
171171
if [ -n "${KRD_REGISTRY_MIRRORS_LIST-}" ] && [ "$KRD_CONTAINER_RUNTIME" != "containerd" ]; then
172172
if [ "$KRD_CONTAINER_RUNTIME" == "docker" ]; then
173-
echo "docker_registry_mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
173+
echo "docker_registry_mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
174174
for mirror in ${KRD_REGISTRY_MIRRORS_LIST//,/ }; do
175-
echo " - $mirror" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
175+
echo " - $mirror" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
176176
done
177177
elif [ "$KRD_CONTAINER_RUNTIME" == "crio" ]; then
178-
echo "crio_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
178+
echo "crio_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
179179
if _vercmp "${kubespray_version#*v}" '<' "2.18"; then
180180
for mirror in ${KRD_REGISTRY_MIRRORS_LIST//,/ }; do
181-
echo " - ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
181+
echo " - ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
182182
done
183183
else
184-
echo " - location: registry-1.docker.io" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
185-
echo " unqualified: false" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
186-
echo " mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
184+
echo " - location: registry-1.docker.io" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
185+
echo " unqualified: false" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
186+
echo " mirrors:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
187187
for mirror in ${KRD_REGISTRY_MIRRORS_LIST//,/ }; do
188-
echo " - location: ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
188+
echo " - location: ${mirror#*//}" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
189189
if [[ ${mirror#*//} == *"$KRD_INSECURE_REGISTRIES_LIST"* ]]; then
190-
echo " insecure: true" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
190+
echo " insecure: true" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
191191
else
192-
echo " insecure: false" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
192+
echo " insecure: false" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
193193
fi
194194
done
195195
fi
196196
fi
197197
fi
198198
if [ -n "${KRD_INSECURE_REGISTRIES_LIST-}" ] && [ "$KRD_CONTAINER_RUNTIME" != "containerd" ]; then
199199
if [ "$KRD_CONTAINER_RUNTIME" == "docker" ]; then
200-
echo "docker_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
200+
echo "docker_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
201201
for registry in ${KRD_INSECURE_REGISTRIES_LIST//,/ }; do
202-
echo " - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
202+
echo " - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
203203
done
204204
elif [ "$KRD_CONTAINER_RUNTIME" == "crio" ] && _vercmp "${kubespray_version#*v}" '<' "2.18"; then
205-
echo "crio_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
205+
echo "crio_insecure_registries:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
206206
for registry in ${KRD_INSECURE_REGISTRIES_LIST//,/ }; do
207-
echo " - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
207+
echo " - $registry" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
208208
done
209209
fi
210210
fi
211211
if [ -n "${KRD_DNS_ETCHOSTS_DICT-}" ]; then
212-
echo "dns_etchosts: |" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
212+
echo "dns_etchosts: |" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
213213
for etchost_entry in ${KRD_DNS_ETCHOSTS_DICT//,/ }; do
214-
echo " ${etchost_entry%-*} ${etchost_entry#*-}" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
214+
echo " ${etchost_entry%-*} ${etchost_entry#*-}" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
215215
done
216216
fi
217217
if [ "$KRD_NETWORK_PLUGIN" == "cilium" ] && [ "$KRD_CILIUM_TUNNEL_MODE" == "disabled" ]; then
218-
echo "cilium_auto_direct_node_routes: true" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
218+
echo "cilium_auto_direct_node_routes: true" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
219219
fi
220220
if [ "$kubespray_version" != "master" ] && _vercmp "${kubespray_version#*v}" '>' "2.15" && [ "$KRD_METALLB_ENABLED" == "true" ] && [ -n "${KRD_METALLB_ADDRESS_POOLS_LIST-}" ]; then
221-
echo "metallb_ip_range:" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
221+
echo "metallb_ip_range:" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
222222
for pool in ${KRD_METALLB_ADDRESS_POOLS_LIST//,/ }; do
223-
echo " - $pool" | tee --append "$krd_inventory_folder/group_vars/k8s-cluster.yml"
223+
echo " - $pool" | tee --append "$krd_inventory_folder/group_vars/k8s_cluster.yml"
224224
done
225225
fi
226226
}

‎_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function upgrade_k8s {
4545
$PIP_CMD -r ./requirements.txt
4646
popd
4747
fi
48-
sed -i "s/^kube_version: .*\$/kube_version: $KRD_KUBE_VERSION/" "$krd_inventory_folder/group_vars/k8s-cluster.yml"
48+
sed -i "s/^kube_version: .*\$/kube_version: $KRD_KUBE_VERSION/" "$krd_inventory_folder/group_vars/k8s_cluster.yml"
4949
_run_ansible_cmd "$kubespray_folder/upgrade-cluster.yml" "upgrade-cluster-kubernetes.log"
5050

5151
sudo cp "$krd_inventory_folder/artifacts/admin.conf" "$HOME/.kube/config"

‎aio.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ if [[ $krd_actions_list == *k8s* ]]; then
8282
[all]
8383
$hostname
8484
85-
[kube-master]
85+
[kube_control_plane]
8686
$hostname ansible_host=$ip_address ip=$ip_address
8787
88-
[kube-node]
88+
[kube_node]
8989
$hostname ansible_host=$ip_address ip=$ip_address
9090
9191
[etcd]
9292
$hostname ansible_host=$ip_address ip=$ip_address
9393
94-
[k8s-cluster:children]
95-
kube-node
96-
kube-master
94+
[k8s_cluster:children]
95+
kube_node
96+
kube_control_plane
9797
EOL
9898
fi
9999

‎ci/bootstrap.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ if [[ ${TEST_MULTINODE:-false} == "false" ]]; then
8181
port: 4
8282
device: 0
8383
roles:
84-
- kube-master
84+
- kube_control_plane
8585
- etcd
86-
- kube-node
86+
- kube_node
8787
- qat-node
8888
EOL
8989
# editorconfig-checker-enable
@@ -112,7 +112,7 @@ else
112112
port: 1
113113
device: 0
114114
roles:
115-
- kube-master
115+
- kube_control_plane
116116
- etcd
117117
EOL
118118
# editorconfig-checker-enable
@@ -141,7 +141,7 @@ EOL
141141
port: 1
142142
device: 0
143143
roles:
144-
- kube-node
144+
- kube_node
145145
EOL
146146
# editorconfig-checker-enable
147147
done

‎config/default.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
memory: 8192
1818
cpus: 2
1919
roles:
20-
- kube-master
20+
- kube_control_plane
2121
- etcd
2222
- name: "controller02"
2323
os:
@@ -29,7 +29,7 @@
2929
memory: 8192
3030
cpus: 2
3131
roles:
32-
- kube-master
32+
- kube_control_plane
3333
- etcd
3434
- name: "controller03"
3535
os:
@@ -41,7 +41,7 @@
4141
memory: 8192
4242
cpus: 2
4343
roles:
44-
- kube-master
44+
- kube_control_plane
4545
- etcd
4646
- name: "compute01"
4747
os:
@@ -84,7 +84,7 @@
8484
port: 1
8585
device: 1
8686
roles:
87-
- kube-node
87+
- kube_node
8888
- qat-node
8989
- name: "compute02"
9090
os:
@@ -121,4 +121,4 @@
121121
port: 1
122122
device: 1
123123
roles:
124-
- kube-node
124+
- kube_node

‎config/samples/pdf.yml.distros

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
port: 1
2020
device: 0
2121
roles:
22-
- kube-master
22+
- kube_control_plane
2323
- etcd
2424
- name: ubuntu18
2525
os:
@@ -42,7 +42,7 @@
4242
port: 1
4343
device: 0
4444
roles:
45-
- kube-node
45+
- kube_node
4646
- name: ubuntu20
4747
os:
4848
name: ubuntu
@@ -64,7 +64,7 @@
6464
port: 1
6565
device: 0
6666
roles:
67-
- kube-node
67+
- kube_node
6868
- name: ubuntu22
6969
os:
7070
name: ubuntu
@@ -86,7 +86,7 @@
8686
port: 1
8787
device: 0
8888
roles:
89-
- kube-node
89+
- kube_node
9090
- name: opensuse15
9191
os:
9292
name: opensuse
@@ -108,7 +108,7 @@
108108
port: 1
109109
device: 0
110110
roles:
111-
- kube-node
111+
- kube_node
112112
- name: fedora37
113113
os:
114114
name: fedora
@@ -130,7 +130,7 @@
130130
port: 1
131131
device: 0
132132
roles:
133-
- kube-node
133+
- kube_node
134134
- name: fedora38
135135
os:
136136
name: fedora
@@ -152,7 +152,7 @@
152152
port: 1
153153
device: 0
154154
roles:
155-
- kube-node
155+
- kube_node
156156
- name: fedora39
157157
os:
158158
name: fedora39
@@ -174,7 +174,7 @@
174174
port: 1
175175
device: 0
176176
roles:
177-
- kube-node
177+
- kube_node
178178
- name: fedora40
179179
os:
180180
name: fedora
@@ -196,4 +196,4 @@
196196
port: 1
197197
device: 0
198198
roles:
199-
- kube-node
199+
- kube_node

‎config/samples/pdf.yml.intel_dpdk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
memory: 8192
1919
cpus: 8
2020
roles:
21-
- kube-master
21+
- kube_control_plane
2222
- etcd
2323
- name: "compute01"
2424
os:
@@ -60,7 +60,7 @@
6060
size: 50
6161
mount: /var/lib/docker/
6262
roles:
63-
- kube-node
63+
- kube_node
6464
- qat-node
6565
- name: "compute02"
6666
os:
@@ -102,7 +102,7 @@
102102
size: 50
103103
mount: /var/lib/docker/
104104
roles:
105-
- kube-node
105+
- kube_node
106106
- qat-node
107107
- name: "compute03"
108108
os:
@@ -144,5 +144,5 @@
144144
size: 50
145145
mount: /var/lib/docker/
146146
roles:
147-
- kube-node
147+
- kube_node
148148
- qat-node

‎config/samples/pdf.yml.intel_kernel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
memory: 8192
1919
cpus: 8
2020
roles:
21-
- kube-master
21+
- kube_control_plane
2222
- etcd
2323
- name: "compute01"
2424
os:
@@ -45,7 +45,7 @@
4545
size: 50
4646
mount: /var/lib/docker/
4747
roles:
48-
- kube-node
48+
- kube_node
4949
- qat-node
5050
- name: "compute02"
5151
os:
@@ -72,7 +72,7 @@
7272
size: 50
7373
mount: /var/lib/docker/
7474
roles:
75-
- kube-node
75+
- kube_node
7676
- qat-node
7777
- name: "compute03"
7878
os:
@@ -99,5 +99,5 @@
9999
size: 50
100100
mount: /var/lib/docker/
101101
roles:
102-
- kube-node
102+
- kube_node
103103
- qat-node

‎config/samples/pdf.yml.localai

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
port: 4
3838
device: 0
3939
roles:
40-
- kube-master
40+
- kube_control_plane
4141
- etcd
42-
- kube-node
42+
- kube_node

0 commit comments

Comments
 (0)