15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: change builtin defined variable (#2561) 

* feat: change inventory_hosts to hostvars

Signed-off-by: joyceliu <joyceliu@yunify.com>

* feat: change inventory_hosts to hostvars

Signed-off-by: joyceliu <joyceliu@yunify.com>

---------

Signed-off-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
liujian 2025-05-13 14:40:01 +08:00 committed by GitHub
parent 9a672ad646
commit fb474bde50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
40 changed files with 161 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/capkk/roles/init/init-os/tasks/init_ntpserver.yaml
View File

@ -15,7 +15,7 @@
{{- range $server := (.ntp.servers | fromJson) }} {{- range $server := (.ntp.servers | fromJson) }}
{{- $internalIPv4 := "" }} {{- $internalIPv4 := "" }}
{{- $internalIPv6 := "" }} {{- $internalIPv6 := "" }}
{{- range $.inventory_hosts }} {{- range $.hostvars }}
{{- if eq .hostname $server }} {{- if eq .hostname $server }}
{{- $internalIPv4 = .internal_ipv4 | default "" }} {{- $internalIPv4 = .internal_ipv4 | default "" }}
{{- $internalIPv6 = .internal_ipv6 | default "" }} {{- $internalIPv6 = .internal_ipv6 | default "" }}

6
builtin/capkk/roles/init/init-os/tasks/main.yaml
View File

@ -6,11 +6,11 @@
- name: Set hostname - name: Set hostname
command: | command: |
hostnamectl set-hostname {{ .inventory_name }} \ hostnamectl set-hostname {{ .inventory_hostname }} \
&& sed -i '/^127.0.1.1/s/.*/127.0.1.1 {{ .inventory_name }}/g' /etc/hosts && sed -i '/^127.0.1.1/s/.*/127.0.1.1 {{ .inventory_hostname }}/g' /etc/hosts
when: when:
- .set_hostname - .set_hostname
- .inventory_name | ne "localhost" - .inventory_hostname | ne "localhost"
- name: Sync init os to remote - name: Sync init os to remote
template: template:

34
builtin/capkk/roles/init/init-os/templates/init-os.sh
View File

@ -214,41 +214,41 @@ cat >>/etc/hosts<<EOF
# kubekey hosts BEGIN # kubekey hosts BEGIN
# kubernetes hosts # kubernetes hosts
{{- range .groups.k8s_cluster | default list }} {{- range .groups.k8s_cluster | default list }}
{{- $hostname := index $.inventory_hosts . "hostname" -}} {{- $hostname := index $.hostvars . "hostname" -}}
{{- $clusterName := $.kubernetes.cluster_name | default "kubekey" -}} {{- $clusterName := $.kubernetes.cluster_name | default "kubekey" -}}
{{- $dnsDomain := $.kubernetes.networking.dns_domain | default "cluster.local" -}} {{- $dnsDomain := $.kubernetes.networking.dns_domain | default "cluster.local" -}}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }} {{ index $.hostvars . "internal_ipv4" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv6" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }} {{ index $.hostvars . "internal_ipv6" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# etcd hosts # etcd hosts
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv6" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv6" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# image registry hosts # image registry hosts
{{- range .groups.image_registry | default list }} {{- range .groups.image_registry | default list }}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv6" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv6" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# nfs hosts # nfs hosts
{{- range .groups.nfs | default list }} {{- range .groups.nfs | default list }}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# kubekey hosts END # kubekey hosts END

4
builtin/capkk/roles/precheck/env_check/tasks/kubernetes.yaml
View File

@ -13,7 +13,7 @@
- | - |
{{- $existIP := false }} {{- $existIP := false }}
{{- range .groups.all | default list }} {{- range .groups.all | default list }}
{{- if eq $.kubernetes.control_plane_endpoint.kube_vip.address (index $.inventory_hosts . "internal_ipv4") }} {{- if eq $.kubernetes.control_plane_endpoint.kube_vip.address (index $.hostvars . "internal_ipv4") }}
{{- $existIP = true }} {{- $existIP = true }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -31,7 +31,7 @@
when: and .kube_version (ne .kube_version "") when: and .kube_version (ne .kube_version "")
- name: Check if kubernetes installed - name: Check if kubernetes installed
when: .groups.k8s_cluster | default list | has .inventory_name when: .groups.k8s_cluster | default list | has .inventory_hostname
block: block:
- name: Get kubernetes service - name: Get kubernetes service
ignore_errors: true ignore_errors: true

36
builtin/capkk/roles/precheck/env_check/tasks/network.yaml
View File

@ -59,21 +59,21 @@
kube_network_plugin:"{{ .kubernetes.kube_network_plugin }}" is not supported kube_network_plugin:"{{ .kubernetes.kube_network_plugin }}" is not supported
when: and .kubernetes.kube_network_plugin (ne .kubernetes.kube_network_plugin "") when: and .kubernetes.kube_network_plugin (ne .kubernetes.kube_network_plugin "")
# # This assertion will fail on the safe side: One can indeed schedule more pods # This assertion will fail on the safe side: One can indeed schedule more pods
# # on a node than the CIDR-range has space for when additional pods use the host # on a node than the CIDR-range has space for when additional pods use the host
# # network namespace. It is impossible to ascertain the number of such pods at # network namespace. It is impossible to ascertain the number of such pods at
# # provisioning time, so to establish a guarantee, we factor these out. # provisioning time, so to establish a guarantee, we factor these out.
# # NOTICE: the check blatantly ignores the inet6-case # NOTICE: the check blatantly ignores the inet6-case
# - name: Guarantee that enough network address space is available for all pods - name: Guarantee that enough network address space is available for all pods
# when: .groups.k8s_cluster | default list | has .inventory_name when: .groups.k8s_cluster | default list | has .inventory_hostname
# block: block:
# - name: Guarantee that enough ipv4 network address space is available for all pods - name: Guarantee that enough ipv4 network address space is available for all pods
# when: .kubernetes.networking.pod_cidr | default "10.233.64.0/18" | splitList "," | first | ipFamily | eq "IPv4" when: .kubernetes.networking.pod_cidr | default "10.233.64.0/18" | splitList "," | first | ipFamily | eq "IPv4"
# assert: assert:
# that: le .kubernetes.kubelet.max_pods (sub (pow 2 (sub 32 .kubernetes.networking.ipv4_mask_size | default 24 | float64)) 2) that: le .kubernetes.kubelet.max_pods (sub (pow 2 (sub 32 .kubernetes.networking.ipv4_mask_size | default 24 | float64)) 2)
# fail_msg: do not schedule more pods on a node than ipv4 inet addresses are available. fail_msg: do not schedule more pods on a node than ipv4 inet addresses are available.
# - name: Guarantee that enough ipv6 network address space is available for all pods - name: Guarantee that enough ipv6 network address space is available for all pods
# when: .kubernetes.networking.pod_cidr | default "10.233.64.0/18" | splitList "," | last | ipFamily | eq "IPv6" when: .kubernetes.networking.pod_cidr | default "10.233.64.0/18" | splitList "," | last | ipFamily | eq "IPv6"
# assert: assert:
# that: le .kubernetes.kubelet.max_pods (sub (pow 2 (sub 128 .kubernetes.networking.ipv6_mask_size | default 64 | float64)) 2) that: le .kubernetes.kubelet.max_pods (sub (pow 2 (sub 128 .kubernetes.networking.ipv6_mask_size | default 64 | float64)) 2)
# fail_msg: do not schedule more pods on a node than ipv6 inet addresses are available. fail_msg: do not schedule more pods on a node than ipv6 inet addresses are available.

4
builtin/capkk/roles/precheck/env_check/tasks/os.yaml
View File

@ -24,13 +24,13 @@
- name: Stop if memory is too small for masters - name: Stop if memory is too small for masters
assert: assert:
that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_master_memory_mb that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_master_memory_mb
when: .groups.kube_control_plane | default list | has .inventory_name when: .groups.kube_control_plane | default list | has .inventory_hostname
- name: Stop if memory is too small for nodes - name: Stop if memory is too small for nodes
assert: assert:
that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_node_memory_mb that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_node_memory_mb
when: when:
- .groups.kube_worker | default list | has .inventory_name - .groups.kube_worker | default list | has .inventory_hostname
- name: Stop if kernel version is too low - name: Stop if kernel version is too low
assert: assert:

18
builtin/core/playbooks/add_nodes.yaml
View File

@ -44,17 +44,17 @@
init_kubernetes_node: | init_kubernetes_node: |
{{- $initNodes := list -}} {{- $initNodes := list -}}
{{- range .groups.kube_control_plane -}} {{- range .groups.kube_control_plane -}}
{{- if index $.inventory_hosts . "kubernetes_install_service" "stdout" | eq "active" -}} {{- if index $.hostvars . "kubernetes_install_service" "stdout" | eq "active" -}}
{{- $initNodes = append $initNodes . -}} {{- $initNodes = append $initNodes . -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- if $initNodes | len | eq 1 -}} {{- if $initNodes | len | eq 1 -}}
{{ $initNodes | first }} {{ $initNodes | first }}
{{- else if $initNodes | len | lt 1 -}} {{- else if $initNodes | len | lt 1 -}}
{{ index $initNodes (randInt 0 ((sub ($initNodes | len) 1) | int)) }} {{ index $initNodes (randInt 0 ((sub ($initNodes | len) 1) | int)) }}
{{- end -}} {{- end -}}
- name: init node - name: init node
when: eq .inventory_name .init_kubernetes_node when: eq .inventory_hostname .init_kubernetes_node
block: block:
- name: Generate certificate key by kubeadm - name: Generate certificate key by kubeadm
command: | command: |
@ -80,15 +80,15 @@
- k8s_cluster - k8s_cluster
roles: roles:
- role: install/cri - role: install/cri
when: or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_name) when: or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_hostname)
- role: kubernetes/pre-kubernetes - role: kubernetes/pre-kubernetes
when: or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_name) when: or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_hostname)
- role: kubernetes/join-kubernetes - role: kubernetes/join-kubernetes
when: or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_name) when: or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_hostname)
- role: kubernetes/certs - role: kubernetes/certs
when: when:
- or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_name) - or (.add_nodes | default list | len | eq 0) (.add_nodes | default list | has .inventory_hostname)
- .groups.kube_control_plane | default list | has .inventory_name - .groups.kube_control_plane | default list | has .inventory_hostname
- .kubernetes.renew_certs.enabled - .kubernetes.renew_certs.enabled
- import_playbook: hook/post_install.yaml - import_playbook: hook/post_install.yaml

2
builtin/core/playbooks/create_cluster.yaml
View File

@ -69,7 +69,7 @@
- role: kubernetes/certs - role: kubernetes/certs
when: when:
- .kubernetes.renew_certs.enabled - .kubernetes.renew_certs.enabled
- .groups.kube_control_plane | default list | has .inventory_name - .groups.kube_control_plane | default list | has .inventory_hostname
post_tasks: post_tasks:
- name: Add custom label to cluster - name: Add custom label to cluster
command: | command: |

4
builtin/core/playbooks/hook/post_install.yaml
View File

@ -7,9 +7,9 @@
ignore_errors: true ignore_errors: true
copy: copy:
src: | src: |
{{ .scripts_dir }}/post_install_{{ .inventory_name }}.sh {{ .scripts_dir }}/post_install_{{ .inventory_hostname }}.sh
dest: | dest: |
/etc/kubekey/scripts/post_install_{{ .inventory_name }}.sh /etc/kubekey/scripts/post_install_{{ .inventory_hostname }}.sh
mode: 0755 mode: 0755
register: execute_result register: execute_result

4
builtin/core/playbooks/hook/pre_install.yaml
View File

@ -18,9 +18,9 @@
ignore_errors: true ignore_errors: true
copy: copy:
src: | src: |
{{ .work_dir }}/scripts/pre_install_{{ .inventory_name }}.sh {{ .work_dir }}/scripts/pre_install_{{ .inventory_hostname }}.sh
dest: | dest: |
/etc/kubekey/scripts/pre_install_{{ .inventory_name }}.sh /etc/kubekey/scripts/pre_install_{{ .inventory_hostname }}.sh
mode: 0755 mode: 0755
register: execute_result register: execute_result

8
builtin/core/roles/init/init-cert/tasks/main.yaml
View File

@ -19,8 +19,8 @@
sans: | sans: |
{{- $ips := list }} {{- $ips := list }}
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{- $ips = append $ips $internalIPv4 }} {{- $ips = append $ips $internalIPv4 }}
{{- end }} {{- end }}
@ -47,8 +47,8 @@
sans: | sans: |
{{- $ips := list }} {{- $ips := list }}
{{- range .groups.image_registry | default list }} {{- range .groups.image_registry | default list }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{- $ips = append $ips $internalIPv4 }} {{- $ips = append $ips $internalIPv4 }}
{{- end }} {{- end }}

2
builtin/core/roles/init/init-os/tasks/init_ntpserver.yaml
View File

@ -15,7 +15,7 @@
{{- range $server := .ntp.servers }} {{- range $server := .ntp.servers }}
{{- $internalIPv4 := "" }} {{- $internalIPv4 := "" }}
{{- $internalIPv6 := "" }} {{- $internalIPv6 := "" }}
{{- range $.inventory_hosts }} {{- range $.hostvars }}
{{- if eq .hostname $server }} {{- if eq .hostname $server }}
{{- $internalIPv4 = .internal_ipv4 | default "" }} {{- $internalIPv4 = .internal_ipv4 | default "" }}
{{- $internalIPv6 = .internal_ipv6 | default "" }} {{- $internalIPv6 = .internal_ipv6 | default "" }}

4
builtin/core/roles/init/init-os/tasks/init_repository.yaml
View File

@ -42,7 +42,7 @@
mv /etc/apt/sources.list.kubekey.bak-$now /etc/apt/sources.list mv /etc/apt/sources.list.kubekey.bak-$now /etc/apt/sources.list
mv /etc/apt/sources.list.d.kubekey.bak-$now /etc/apt/sources.list.d mv /etc/apt/sources.list.d.kubekey.bak-$now /etc/apt/sources.list.d
else else
apt-get update && apt install -y socat conntrack ipset ebtables chrony ipvsadm {{ if .groups.nfs | default list | has .inventory_name }}nfs-kernel-server{{ end }} apt-get update && apt install -y socat conntrack ipset ebtables chrony ipvsadm {{ if .groups.nfs | default list | has .inventory_hostname }}nfs-kernel-server{{ end }}
fi fi
when: .os.release.ID_LIKE | eq "debian" when: .os.release.ID_LIKE | eq "debian"
- name: Init rhel repository - name: Init rhel repository
@ -68,7 +68,7 @@
# update repository # update repository
yum clean all && yum makecache yum clean all && yum makecache
# install # install
yum install -y openssl socat conntrack ipset ebtables chrony ipvsadm {{ if .groups.nfs | default list | has .inventory_name }}nfs-utils{{ end }} yum install -y openssl socat conntrack ipset ebtables chrony ipvsadm {{ if .groups.nfs | default list | has .inventory_hostname }}nfs-utils{{ end }}
# reset repository # reset repository
rm -rf /etc/yum.repos.d rm -rf /etc/yum.repos.d
mv /etc/yum.repos.d.kubekey.bak-$now /etc/yum.repos.d mv /etc/yum.repos.d.kubekey.bak-$now /etc/yum.repos.d

6
builtin/core/roles/init/init-os/tasks/main.yaml
View File

@ -12,11 +12,11 @@
- name: Set hostname - name: Set hostname
command: | command: |
hostnamectl set-hostname {{ .inventory_name }} \ hostnamectl set-hostname {{ .inventory_hostname }} \
&& sed -i '/^127.0.1.1/s/.*/127.0.1.1 {{ .inventory_name }}/g' /etc/hosts && sed -i '/^127.0.1.1/s/.*/127.0.1.1 {{ .inventory_hostname }}/g' /etc/hosts
when: when:
- .set_hostname - .set_hostname
- .inventory_name | ne "localhost" - .inventory_hostname | ne "localhost"
- name: Sync init os to remote - name: Sync init os to remote
template: template:

34
builtin/core/roles/init/init-os/templates/init-os.sh
View File

@ -210,41 +210,41 @@ cat >>/etc/hosts<<EOF
# kubekey hosts BEGIN # kubekey hosts BEGIN
# kubernetes hosts # kubernetes hosts
{{- range .groups.k8s_cluster | default list }} {{- range .groups.k8s_cluster | default list }}
{{- $hostname := index $.inventory_hosts . "hostname" -}} {{- $hostname := index $.hostvars . "hostname" -}}
{{- $clusterName := $.kubernetes.cluster_name | default "kubekey" -}} {{- $clusterName := $.kubernetes.cluster_name | default "kubekey" -}}
{{- $dnsDomain := $.kubernetes.networking.dns_domain | default "cluster.local" -}} {{- $dnsDomain := $.kubernetes.networking.dns_domain | default "cluster.local" -}}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }} {{ index $.hostvars . "internal_ipv4" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv6" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }} {{ index $.hostvars . "internal_ipv6" }} {{ $hostname }} {{ printf "%s.%s" $hostname $clusterName }} {{ printf "%s.%s.%s" $hostname $clusterName $dnsDomain }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# etcd hosts # etcd hosts
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv6" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv6" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# image registry hosts # image registry hosts
{{- range .groups.image_registry | default list }} {{- range .groups.image_registry | default list }}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv6" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv6" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# nfs hosts # nfs hosts
{{- range .groups.nfs | default list }} {{- range .groups.nfs | default list }}
{{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }} {{- if and (index $.hostvars . "internal_ipv4") (ne (index $.hostvars . "internal_ipv4") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }} {{- if and (index $.hostvars . "internal_ipv6") (ne (index $.hostvars . "internal_ipv6") "") }}
{{ index $.inventory_hosts . "internal_ipv4" }} {{ index $.inventory_hosts . "hostname" }} {{ index $.hostvars . "internal_ipv4" }} {{ index $.hostvars . "hostname" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# kubekey hosts END # kubekey hosts END

4
builtin/core/roles/install/cni/defaults/main.yaml
View File

@ -134,8 +134,8 @@ cni:
address: {{ .dockerio_registry }}/kubeovn address: {{ .dockerio_registry }}/kubeovn
{{- $ips := list }} {{- $ips := list }}
{{- range .groups.kube_control_plane | default list }} {{- range .groups.kube_control_plane | default list }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{- $ips = append $ips $internalIPv4 }} {{- $ips = append $ips $internalIPv4 }}
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}

4
builtin/core/roles/install/cri/defaults/main.yaml
View File

@ -26,8 +26,8 @@ image_registry:
{{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }} {{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }}
{{ .image_registry.ha_vip }} {{ .image_registry.ha_vip }}
{{- else if .groups.image_registry | default list | len | lt 0 }} {{- else if .groups.image_registry | default list | len | lt 0 }}
{{- $internalIPv4 := index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv4" | default "" }} {{- $internalIPv4 := index .hostvars (.groups.image_registry | default list | first) "internal_ipv4" | default "" }}
{{- $internalIPv6 := index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv6" | default "" }} {{- $internalIPv6 := index .hostvars (.groups.image_registry | default list | first) "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{ $internalIPv4 }} {{ $internalIPv4 }}
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}

8
builtin/core/roles/install/etcd/templates/etcd.env
View File

@ -18,12 +18,12 @@ ETCD_PROXY=off
ETCD_ENABLE_V2=true ETCD_ENABLE_V2=true
{{- $ips := list }} {{- $ips := list }}
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{- $ips = append $ips (printf "%s=https://%s:2380" (index $.inventory_hosts . "hostname") $internalIPv4) }} {{- $ips = append $ips (printf "%s=https://%s:2380" (index $.hostvars . "hostname") $internalIPv4) }}
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}
{{- $ips = append $ips (printf "%s=https://%s:2380" (index $.inventory_hosts . "hostname") $internalIPv6) }} {{- $ips = append $ips (printf "%s=https://%s:2380" (index $.hostvars . "hostname") $internalIPv6) }}
{{- end }} {{- end }}
{{- end }} {{- end }}
ETCD_INITIAL_CLUSTER={{ $ips | join "," }} ETCD_INITIAL_CLUSTER={{ $ips | join "," }}

4
builtin/core/roles/install/image-registry/defaults/main.yaml
View File

@ -9,8 +9,8 @@ image_registry:
{{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }} {{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }}
{{ .image_registry.ha_vip }} {{ .image_registry.ha_vip }}
{{- else if .groups.image_registry | default list | len | lt 0 }} {{- else if .groups.image_registry | default list | len | lt 0 }}
{{- $internalIPv4 := index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv4" | default "" }} {{- $internalIPv4 := index .hostvars (.groups.image_registry | default list | first) "internal_ipv4" | default "" }}
{{- $internalIPv6 := index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv6" | default "" }} {{- $internalIPv6 := index .hostvars (.groups.image_registry | default list | first) "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{ $internalIPv4 }} {{ $internalIPv4 }}
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}

4
builtin/core/roles/install/image-registry/tasks/install_registry.yaml
View File

@ -14,8 +14,8 @@
apt update && apt install -y nfs-common apt update && apt install -y nfs-common
{{- end }} {{- end }}
{{- if }} {{- if }}
{{- $internalIPv4 := index .inventory_hosts (.groups.nfs | default list | first) "internal_ipv4" | default "" }} {{- $internalIPv4 := index .hostvars (.groups.nfs | default list | first) "internal_ipv4" | default "" }}
{{- $internalIPv6 := index .inventory_hosts (.groups.nfs | default list | first) "internal_ipv6" | default "" }} {{- $internalIPv6 := index .hostvars (.groups.nfs | default list | first) "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
mount -t nfs {{ $internalIPv4 }}:{{ .image_registry.registry.storage.filesystem.nfs_mount }} {{ .image_registry.registry.storage.filesystem.rootdir }} mount -t nfs {{ $internalIPv4 }}:{{ .image_registry.registry.storage.filesystem.nfs_mount }} {{ .image_registry.registry.storage.filesystem.rootdir }}
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}

6
builtin/core/roles/install/security/tasks/main.yaml
View File

@ -5,7 +5,7 @@
chmod 600 /etc/ssl/etcd/ssl/* && chown root:root /etc/ssl/etcd/ssl/* chmod 600 /etc/ssl/etcd/ssl/* && chown root:root /etc/ssl/etcd/ssl/*
chmod 700 /var/lib/etcd && chown etcd:etcd /var/lib/etcd chmod 700 /var/lib/etcd && chown etcd:etcd /var/lib/etcd
chmod 550 /usr/local/bin/etcd* && chown root:root /usr/local/bin/etcd* chmod 550 /usr/local/bin/etcd* && chown root:root /usr/local/bin/etcd*
when: .groups.etcd | default list | has .inventory_name when: .groups.etcd | default list | has .inventory_hostname
- name: security enhancement for control plane - name: security enhancement for control plane
command: | command: |
@ -21,7 +21,7 @@
chmod 640 /var/lib/kubelet/config.yaml && chown root:root /var/lib/kubelet/config.yaml chmod 640 /var/lib/kubelet/config.yaml && chown root:root /var/lib/kubelet/config.yaml
chmod 640 -R /etc/systemd/system/kubelet.service* && chown root:root -R /etc/systemd/system/kubelet.service* chmod 640 -R /etc/systemd/system/kubelet.service* && chown root:root -R /etc/systemd/system/kubelet.service*
chmod 640 /etc/systemd/system/k8s-certs-renew* && chown root:root /etc/systemd/system/k8s-certs-renew* chmod 640 /etc/systemd/system/k8s-certs-renew* && chown root:root /etc/systemd/system/k8s-certs-renew*
when: .groups.kube_control_plane | default list | has .inventory_name when: .groups.kube_control_plane | default list | has .inventory_hostname
- name: security enhancement for worker - name: security enhancement for worker
command: | command: |
@ -36,4 +36,4 @@
chmod 550 -R /opt/cni/bin && chown root:root -R /opt/cni/bin chmod 550 -R /opt/cni/bin && chown root:root -R /opt/cni/bin
chmod 640 /var/lib/kubelet/config.yaml && chown root:root /var/lib/kubelet/config.yaml chmod 640 /var/lib/kubelet/config.yaml && chown root:root /var/lib/kubelet/config.yaml
chmod 640 -R /etc/systemd/system/kubelet.service* && chown root:root -R /etc/systemd/system/kubelet.service* chmod 640 -R /etc/systemd/system/kubelet.service* && chown root:root -R /etc/systemd/system/kubelet.service*
when: .groups.kube_worker | default list | has .inventory_name when: .groups.kube_worker | default list | has .inventory_hostname

4
builtin/core/roles/kubernetes/init-kubernetes/tasks/init_kubernetes.yaml
View File

@ -2,7 +2,7 @@
- name: Sync external etcd config - name: Sync external etcd config
when: when:
- and (.kubernetes.etcd.deployment_type | eq "external") (.groups.etcd | default list | len | lt 0) - and (.kubernetes.etcd.deployment_type | eq "external") (.groups.etcd | default list | len | lt 0)
- .groups.kube_control_plane | default list | has .inventory_name - .groups.kube_control_plane | default list | has .inventory_hostname
block: block:
- name: Sync etcd ca file to remote - name: Sync etcd ca file to remote
copy: copy:
@ -62,7 +62,7 @@
when: .kubernetes_install_service.stdout | eq "inactive" when: .kubernetes_install_service.stdout | eq "inactive"
- name: Set to worker node - name: Set to worker node
when: .groups.kube_worker | default list | has .inventory_name when: .groups.kube_worker | default list | has .inventory_hostname
block: block:
- name: Remote master taint - name: Remote master taint
ignore_errors: true ignore_errors: true

14
builtin/core/roles/kubernetes/init-kubernetes/tasks/main.yaml
View File

@ -6,20 +6,20 @@
{{- $initNodes := list -}} {{- $initNodes := list -}}
{{- $notInitNodes := list -}} {{- $notInitNodes := list -}}
{{- range .groups.kube_control_plane -}} {{- range .groups.kube_control_plane -}}
{{- if index $.inventory_hosts . "kubernetes_install_service" "stdout" | eq "active" -}} {{- if index $.hostvars . "kubernetes_install_service" "stdout" | eq "active" -}}
{{- $initNodes = append $initNodes . -}} {{- $initNodes = append $initNodes . -}}
{{- else if index $.inventory_hosts . "kubernetes_install_service" "stdout" | eq "inactive" -}} {{- else if index $.hostvars . "kubernetes_install_service" "stdout" | eq "inactive" -}}
{{- $notInitNodes = append $notInitNodes . -}} {{- $notInitNodes = append $notInitNodes . -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- if $initNodes | len | eq 1 -}} {{- if $initNodes | len | eq 1 -}}
{{ $initNodes | first }} {{ $initNodes | first }}
{{- else if $initNodes | len | lt 1 -}} {{- else if $initNodes | len | lt 1 -}}
{{ index $initNodes (randInt 0 ((sub ($initNodes | len) 1) | int)) }} {{ index $initNodes (randInt 0 ((sub ($initNodes | len) 1) | int)) }}
{{- else if $notInitNodes | len | eq 1 -}} {{- else if $notInitNodes | len | eq 1 -}}
{{ $notInitNodes | first }} {{ $notInitNodes | first }}
{{- else if $notInitNodes | len | lt 1 }} {{- else if $notInitNodes | len | lt 1 }}
{{ index $notInitNodes (randInt 0 ((sub ($notInitNodes | len) 1) | int)) }} {{ index $notInitNodes (randInt 0 ((sub ($notInitNodes | len) 1) | int)) }}
{{- end -}} {{- end -}}
- name: Set custom hosts to /etc/hosts - name: Set custom hosts to /etc/hosts
@ -33,7 +33,7 @@
EOF EOF
- name: Init kubernetes - name: Init kubernetes
when: eq .inventory_name .init_kubernetes_node when: eq .inventory_hostname .init_kubernetes_node
block: block:
- include_tasks: init_kubernetes.yaml - include_tasks: init_kubernetes.yaml
when: .kubernetes_install_service.stdout | eq "inactive" when: .kubernetes_install_service.stdout | eq "inactive"

14
builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta2
View File

@ -10,13 +10,13 @@ etcd:
imageTag: {{ .kubernetes.etcd.image.tag }} imageTag: {{ .kubernetes.etcd.image.tag }}
serverCertSANs: serverCertSANs:
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
- {{ index $.inventory_hosts . "internal_ipv4" }} - {{ index $.hostvars . "internal_ipv4" }}
{{- end }} {{- end }}
{{- else }} {{- else }}
external: external:
endpoints: endpoints:
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
- https://{{ index $.inventory_hosts . "internal_ipv4" }}:2379 - https://{{ index $.hostvars . "internal_ipv4" }}:2379
{{- end }} {{- end }}
caFile: /etc/kubernetes/pki/etcd/ca.crt caFile: /etc/kubernetes/pki/etcd/ca.crt
certFile: /etc/kubernetes/pki/etcd/client.crt certFile: /etc/kubernetes/pki/etcd/client.crt
@ -73,11 +73,11 @@ apiServer:
- {{ .kubernetes.networking.service_cidr | ipInCIDR 0 }} - {{ .kubernetes.networking.service_cidr | ipInCIDR 0 }}
- {{ .kubernetes.control_plane_endpoint.host }} - {{ .kubernetes.control_plane_endpoint.host }}
{{- range .groups.k8s_cluster | default list }} {{- range .groups.k8s_cluster | default list }}
- {{ index $.inventory_hosts . "hostname" }} - {{ index $.hostvars . "hostname" }}
- {{ index $.inventory_hosts . "hostname" }}.{{ $.kubernetes.cluster_name }} - {{ index $.hostvars . "hostname" }}.{{ $.kubernetes.cluster_name }}
- {{ index $.inventory_hosts . "hostname" }}.{{ $.kubernetes.cluster_name }}.{{ $.kubernetes.networking.dns_domain }} - {{ index $.hostvars . "hostname" }}.{{ $.kubernetes.cluster_name }}.{{ $.kubernetes.networking.dns_domain }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
- {{ $internalIPv4 }} - {{ $internalIPv4 }}
{{- end }} {{- end }}

14
builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3
View File

@ -10,13 +10,13 @@ etcd:
imageTag: {{ .kubernetes.etcd.image.tag }} imageTag: {{ .kubernetes.etcd.image.tag }}
serverCertSANs: serverCertSANs:
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
- {{ index $.inventory_hosts . "internal_ipv4" }} - {{ index $.hostvars . "internal_ipv4" }}
{{- end }} {{- end }}
{{- else }} {{- else }}
external: external:
endpoints: endpoints:
{{- range .groups.etcd | default list }} {{- range .groups.etcd | default list }}
- https://{{ index $.inventory_hosts . "internal_ipv4" }}:2379 - https://{{ index $.hostvars . "internal_ipv4" }}:2379
{{- end }} {{- end }}
caFile: /etc/kubernetes/pki/etcd/ca.crt caFile: /etc/kubernetes/pki/etcd/ca.crt
certFile: /etc/kubernetes/pki/etcd/client.crt certFile: /etc/kubernetes/pki/etcd/client.crt
@ -72,11 +72,11 @@ apiServer:
- {{ .kubernetes.networking.service_cidr | ipInCIDR 0 }} - {{ .kubernetes.networking.service_cidr | ipInCIDR 0 }}
- {{ .kubernetes.control_plane_endpoint.host }} - {{ .kubernetes.control_plane_endpoint.host }}
{{- range .groups.k8s_cluster | default list }} {{- range .groups.k8s_cluster | default list }}
- {{ index $.inventory_hosts . "hostname" }} - {{ index $.hostvars . "hostname" }}
- {{ index $.inventory_hosts . "hostname" }}.{{ $.kubernetes.cluster_name }} - {{ index $.hostvars . "hostname" }}.{{ $.kubernetes.cluster_name }}
- {{ index $.inventory_hosts . "hostname" }}.{{ $.kubernetes.cluster_name }}.{{ $.kubernetes.networking.dns_domain }} - {{ index $.hostvars . "hostname" }}.{{ $.kubernetes.cluster_name }}.{{ $.kubernetes.networking.dns_domain }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
- {{ $internalIPv4 }} - {{ $internalIPv4 }}
{{- end }} {{- end }}

12
builtin/core/roles/kubernetes/join-kubernetes/tasks/join_kubernetes.yaml
View File

@ -5,11 +5,11 @@
sed -i ':a;$!{N;ba};s@# kubekey custom BEGIN.*# kubekey custom END@@' /etc/hosts sed -i ':a;$!{N;ba};s@# kubekey custom BEGIN.*# kubekey custom END@@' /etc/hosts
cat >> /etc/hosts <<EOF cat >> /etc/hosts <<EOF
# kubekey custom BEGIN # kubekey custom BEGIN
{{- if and (index .inventory_hosts .init_kubernetes_node "internal_ipv4") (ne (index .inventory_hosts .init_kubernetes_node "internal_ipv4") "") }} {{- if and (index .hostvars .init_kubernetes_node "internal_ipv4") (ne (index .hostvars .init_kubernetes_node "internal_ipv4") "") }}
{{ index .inventory_hosts .init_kubernetes_node "internal_ipv4" }} {{ .kubernetes.control_plane_endpoint.host }} {{ index .hostvars .init_kubernetes_node "internal_ipv4" }} {{ .kubernetes.control_plane_endpoint.host }}
{{- end }} {{- end }}
{{- if and (index .inventory_hosts .init_kubernetes_node "internal_ipv6") (ne (index .inventory_hosts .init_kubernetes_node "internal_ipv6") "") }} {{- if and (index .hostvars .init_kubernetes_node "internal_ipv6") (ne (index .hostvars .init_kubernetes_node "internal_ipv6") "") }}
{{ index .inventory_hosts .init_kubernetes_node "internal_ipv6" }} {{ .kubernetes.control_plane_endpoint.host }} {{ index .hostvars .init_kubernetes_node "internal_ipv6" }} {{ .kubernetes.control_plane_endpoint.host }}
{{- end }} {{- end }}
# kubekey custom END # kubekey custom END
EOF EOF
@ -35,7 +35,7 @@
dest: /root/.kube/config dest: /root/.kube/config
- name: Set to worker node - name: Set to worker node
when: .groups.kube_worker | default list | has .inventory_name when: .groups.kube_worker | default list | has .inventory_hostname
block: block:
- name: Remote master taint - name: Remote master taint
ignore_errors: true ignore_errors: true
@ -49,7 +49,7 @@
- name: Set change custom hosts to /etc/hosts - name: Set change custom hosts to /etc/hosts
when: when:
- eq .kubernetes.control_plane_endpoint.type "local" - eq .kubernetes.control_plane_endpoint.type "local"
- .groups.kube_control_plane | default list | has .inventory_name - .groups.kube_control_plane | default list | has .inventory_hostname
command: | command: |
sed -i ':a;$!{N;ba};s@# kubekey custom BEGIN.*# kubekey custom END@@' /etc/hosts sed -i ':a;$!{N;ba};s@# kubekey custom BEGIN.*# kubekey custom END@@' /etc/hosts
cat >> /etc/hosts <<EOF cat >> /etc/hosts <<EOF

10
builtin/core/roles/kubernetes/join-kubernetes/tasks/main.yaml
View File

@ -1,5 +1,5 @@
- name: Join kubernetes - name: Join kubernetes
when: ne .inventory_name .init_kubernetes_node when: ne .inventory_hostname .init_kubernetes_node
block: block:
# HAProxy is deployed as a static Pod, which starts only after Kubelet is running. # HAProxy is deployed as a static Pod, which starts only after Kubelet is running.
# Therefore, the control plane must be reachable before HAProxy starts (e.g., by configuring /etc/hosts). # Therefore, the control plane must be reachable before HAProxy starts (e.g., by configuring /etc/hosts).
@ -7,8 +7,8 @@
command: | command: |
cat >> /etc/hosts << EOF cat >> /etc/hosts << EOF
# haproxy dns for kubekey begin # haproxy dns for kubekey begin
{{- $internalIPv4 := index .inventory_hosts (.groups.kube_control_plane | default list | first) "internal_ipv4" | default "" }} {{- $internalIPv4 := index .hostvars (.groups.kube_control_plane | default list | first) "internal_ipv4" | default "" }}
{{- $internalIPv6 := index .inventory_hosts (.groups.kube_control_plane | default list | first) "internal_ipv6" | default "" }} {{- $internalIPv6 := index .hostvars (.groups.kube_control_plane | default list | first) "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
{{ $internalIPv4 }} {{ .kubernetes.control_plane_endpoint.host }} {{ $internalIPv4 }} {{ .kubernetes.control_plane_endpoint.host }}
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}
@ -23,7 +23,7 @@
when: .kubernetes.control_plane_endpoint.type | eq "haproxy" when: .kubernetes.control_plane_endpoint.type | eq "haproxy"
block: block:
- name: Replace control_plane by local hosts - name: Replace control_plane by local hosts
when: .groups.kube_control_plane | default list | has .inventory_name when: .groups.kube_control_plane | default list | has .inventory_hostname
command: | command: |
new_dns="# haproxy dns for kubekey begin new_dns="# haproxy dns for kubekey begin
{{- if ne .internal_ipv4 "" }} {{- if ne .internal_ipv4 "" }}
@ -34,7 +34,7 @@
# haproxy dns for kubekey end" # haproxy dns for kubekey end"
sed -i '/# haproxy dns for kubekey begin/,/# haproxy dns for kubekey end/c\'"$new_dns" /etc/hosts sed -i '/# haproxy dns for kubekey begin/,/# haproxy dns for kubekey end/c\'"$new_dns" /etc/hosts
- name: Replace worker by haproxy hosts - name: Replace worker by haproxy hosts
when: .groups.worker | default list | has .inventory_name when: .groups.worker | default list | has .inventory_hostname
command: | command: |
new_dns="# haproxy dns for kubekey begin new_dns="# haproxy dns for kubekey begin
{{ .kubernetes.control_plane_endpoint.haproxy.address }} {{ .kubernetes.control_plane_endpoint.host }} {{ .kubernetes.control_plane_endpoint.haproxy.address }} {{ .kubernetes.control_plane_endpoint.host }}

2
builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta2
View File

@ -8,7 +8,7 @@ discovery:
apiServerEndpoint: {{ .kubernetes.control_plane_endpoint.host }}:{{ .kubernetes.control_plane_endpoint.port }} apiServerEndpoint: {{ .kubernetes.control_plane_endpoint.host }}:{{ .kubernetes.control_plane_endpoint.port }}
token: "{{ .kubeadm_token }}" token: "{{ .kubeadm_token }}"
unsafeSkipCAVerification: true unsafeSkipCAVerification: true
{{- if .groups.kube_control_plane | default list | has .inventory_name }} {{- if .groups.kube_control_plane | default list | has .inventory_hostname }}
controlPlane: controlPlane:
localAPIEndpoint: localAPIEndpoint:
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}

2
builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3
View File

@ -8,7 +8,7 @@ discovery:
apiServerEndpoint: {{ .kubernetes.control_plane_endpoint.host }}:{{ .kubernetes.control_plane_endpoint.port }} apiServerEndpoint: {{ .kubernetes.control_plane_endpoint.host }}:{{ .kubernetes.control_plane_endpoint.port }}
token: "{{ .kubeadm_token }}" token: "{{ .kubeadm_token }}"
unsafeSkipCAVerification: true unsafeSkipCAVerification: true
{{- if .groups.kube_control_plane | default list | has .inventory_name }} {{- if .groups.kube_control_plane | default list | has .inventory_hostname }}
controlPlane: controlPlane:
localAPIEndpoint: localAPIEndpoint:
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}

4
builtin/core/roles/kubernetes/pre-kubernetes/tasks/high-availability/main.yaml
View File

@ -2,10 +2,10 @@
- include_tasks: high-availability/kube_vip.yaml - include_tasks: high-availability/kube_vip.yaml
when: when:
- .kubernetes.control_plane_endpoint.type | eq "kube_vip" - .kubernetes.control_plane_endpoint.type | eq "kube_vip"
- .groups.kube_control_plane | default list | has .inventory_name - .groups.kube_control_plane | default list | has .inventory_hostname
# only deploy haproxy in worker node. control_plane node use local static pod: kube-apiserver. # only deploy haproxy in worker node. control_plane node use local static pod: kube-apiserver.
- include_tasks: high-availability/haproxy.yaml - include_tasks: high-availability/haproxy.yaml
when: when:
- .kubernetes.control_plane_endpoint.type | eq "haproxy" - .kubernetes.control_plane_endpoint.type | eq "haproxy"
- .groups.kube_worker | default list | has .inventory_name - .groups.kube_worker | default list | has .inventory_hostname

8
builtin/core/roles/kubernetes/pre-kubernetes/templates/haproxy/haproxy.cfg
View File

@ -37,11 +37,11 @@ backend kube_api_backend
option httpchk GET /healthz option httpchk GET /healthz
http-check expect status 200 http-check expect status 200
{{- range .groups.kube_control_plane | default list }} {{- range .groups.kube_control_plane | default list }}
{{- $internalIPv4 := index $.inventory_hosts . "internal_ipv4" | default "" }} {{- $internalIPv4 := index $.hostvars . "internal_ipv4" | default "" }}
{{- $internalIPv6 := index $.inventory_hosts . "internal_ipv6" | default "" }} {{- $internalIPv6 := index $.hostvars . "internal_ipv6" | default "" }}
{{- if ne $internalIPv4 "" }} {{- if ne $internalIPv4 "" }}
server {{ index $.inventory_hosts . "hostname" }} {{ $internalIPv4 }}:{{ $.kubernetes.apiserver.port }} check check-ssl verify none server {{ index $.hostvars . "hostname" }} {{ $internalIPv4 }}:{{ $.kubernetes.apiserver.port }} check check-ssl verify none
{{- else if ne $internalIPv6 "" }} {{- else if ne $internalIPv6 "" }}
server {{ index $.inventory_hosts . "hostname" }} {{ $internalIPv6 }}:{{ $.kubernetes.apiserver.port }} check check-ssl verify none server {{ index $.hostvars . "hostname" }} {{ $internalIPv6 }}:{{ $.kubernetes.apiserver.port }} check check-ssl verify none
{{- end }} {{- end }}
{{- end }} {{- end }}

4
builtin/core/roles/kubernetes/pre-kubernetes/templates/kubevip/kubevip.BGP
View File

@ -31,7 +31,7 @@ spec:
value: | value: |
{{- $ips := list }} {{- $ips := list }}
{{- range .groups.kube_control_plane | default list }} {{- range .groups.kube_control_plane | default list }}
{{- $ips = append $ips (index $.inventory_hosts . "internal_ipv4") }} {{- $ips = append $ips (index $.hostvars . "internal_ipv4") }}
{{- end }} {{- end }}
{{ $ips | join "," }} {{ $ips | join "," }}
- name: bgp_as - name: bgp_as
@ -44,7 +44,7 @@ spec:
value: | value: |
{{- $ips := list }} {{- $ips := list }}
{{- range .groups.kube_control_plane | default list }} {{- range .groups.kube_control_plane | default list }}
{{- $ips = append $ips (printf "%s:65000::false" (index $.inventory_hosts . "internal_ipv4")) }} {{- $ips = append $ips (printf "%s:65000::false" (index $.hostvars . "internal_ipv4")) }}
{{- end }} {{- end }}
{{ $ips | join "," }} {{ $ips | join "," }}
- name: lb_enable - name: lb_enable

4
builtin/core/roles/precheck/env_check/tasks/etcd.yaml
View File

@ -24,7 +24,7 @@
## https://cwiki.yunify.com/pages/viewpage.action?pageId=145920824 ## https://cwiki.yunify.com/pages/viewpage.action?pageId=145920824
- name: Check dev io for etcd - name: Check dev io for etcd
when: when:
- .groups.etcd | default list | has .inventory_name - .groups.etcd | default list | has .inventory_hostname
block: block:
- name: Check fio is exist - name: Check fio is exist
ignore_errors: true ignore_errors: true
@ -48,7 +48,7 @@
command: rm -rf {{ .tmp_dir }}/etcd/test-data command: rm -rf {{ .tmp_dir }}/etcd/test-data
- name: Check if etcd has installed - name: Check if etcd has installed
when: .groups.etcd | default list | has .inventory_name when: .groups.etcd | default list | has .inventory_hostname
block: block:
- name: Get etcd service - name: Get etcd service
ignore_errors: true ignore_errors: true

4
builtin/core/roles/precheck/env_check/tasks/kubernetes.yaml
View File

@ -13,7 +13,7 @@
- | - |
{{- $existIP := false }} {{- $existIP := false }}
{{- range .groups.all | default list }} {{- range .groups.all | default list }}
{{- if eq $.kubernetes.control_plane_endpoint.kube_vip.address (index $.inventory_hosts . "internal_ipv4") }} {{- if eq $.kubernetes.control_plane_endpoint.kube_vip.address (index $.hostvars . "internal_ipv4") }}
{{- $existIP = true }} {{- $existIP = true }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -31,7 +31,7 @@
when: and .kube_version (ne .kube_version "") when: and .kube_version (ne .kube_version "")
- name: Check if kubernetes installed - name: Check if kubernetes installed
when: .groups.k8s_cluster | default list | has .inventory_name when: .groups.k8s_cluster | default list | has .inventory_hostname
block: block:
- name: Get kubernetes service - name: Get kubernetes service
ignore_errors: true ignore_errors: true

2
builtin/core/roles/precheck/env_check/tasks/network.yaml
View File

@ -65,7 +65,7 @@
# provisioning time, so to establish a guarantee, we factor these out. # provisioning time, so to establish a guarantee, we factor these out.
# NOTICE: the check blatantly ignores the inet6-case # NOTICE: the check blatantly ignores the inet6-case
- name: Guarantee that enough network address space is available for all pods - name: Guarantee that enough network address space is available for all pods
when: .groups.k8s_cluster | default list | has .inventory_name when: .groups.k8s_cluster | default list | has .inventory_hostname
block: block:
- name: Guarantee that enough ipv4 network address space is available for all pods - name: Guarantee that enough ipv4 network address space is available for all pods
when: .kubernetes.networking.pod_cidr | default "10.233.64.0/18" | splitList "," | first | ipFamily | eq "IPv4" when: .kubernetes.networking.pod_cidr | default "10.233.64.0/18" | splitList "," | first | ipFamily | eq "IPv4"

4
builtin/core/roles/precheck/env_check/tasks/os.yaml
View File

@ -24,13 +24,13 @@
- name: Stop if memory is too small for masters - name: Stop if memory is too small for masters
assert: assert:
that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_master_memory_mb that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_master_memory_mb
when: .groups.kube_control_plane | default list | has .inventory_name when: .groups.kube_control_plane | default list | has .inventory_hostname
- name: Stop if memory is too small for nodes - name: Stop if memory is too small for nodes
assert: assert:
that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_node_memory_mb that: .process.memInfo.MemTotal | trimSuffix " kB" | atoi | le .cluster_require.minimal_node_memory_mb
when: when:
- .groups.kube_worker | default list | has .inventory_name - .groups.kube_worker | default list | has .inventory_hostname
- name: Stop if kernel version is too low - name: Stop if kernel version is too low
assert: assert:

4
pkg/const/common.go
View File

@ -48,12 +48,12 @@ const ( // === From Global Parameter ===
const ( // === From system generate === const ( // === From system generate ===
// VariableInventoryName the value which defined in inventory.spec.host. // VariableInventoryName the value which defined in inventory.spec.host.
VariableInventoryName = "inventory_name" VariableInventoryName = "inventory_hostname"
// VariableHostName the value is node hostname, default VariableInventoryName. // VariableHostName the value is node hostname, default VariableInventoryName.
// If VariableInventoryName is "localhost". try to set the actual name. // If VariableInventoryName is "localhost". try to set the actual name.
VariableHostName = "hostname" VariableHostName = "hostname"
// VariableGlobalHosts the value is host_var which defined in inventory. // VariableGlobalHosts the value is host_var which defined in inventory.
VariableGlobalHosts = "inventory_hosts" VariableGlobalHosts = "hostvars"
// VariableGroupsAll the value is a all host_name slice of VariableGroups. // VariableGroupsAll the value is a all host_name slice of VariableGroups.
VariableGroupsAll = "all" VariableGroupsAll = "all"
// VariableUnGrouped the value is a all host_name slice of VariableGroups. // VariableUnGrouped the value is a all host_name slice of VariableGroups.

4
pkg/const/workdir.go
View File

@ -49,8 +49,8 @@ work_dir/
| | | | | |-- playbook.yaml | | | | | |-- playbook.yaml
| | | | | |-- /playbookName/variable/ | | | | | |-- /playbookName/variable/
| | | | | | |-- location.yaml | | | | | | |-- location.yaml
| | | | | | |-- inventory_name1.yaml | | | | | | |-- inventory_hostname1.yaml
| | | | | | |-- inventory_name2.yaml | | | | | | |-- inventory_hostname2.yaml
| |
| | | |-- inventories/ | | | |-- inventories/
| | | | |-- namespace/ | | | | |-- namespace/

10
pkg/variable/variable_get_test.go
View File

@ -159,19 +159,19 @@ func TestGetAllVariable(t *testing.T) {
"images": []any{"abc"}, "images": []any{"abc"},
}, },
"groups": map[string][]string{"all": {"localhost"}, "ungrouped": {"localhost"}}, "groups": map[string][]string{"all": {"localhost"}, "ungrouped": {"localhost"}},
"inventory_hosts": map[string]any{ "hostvars": map[string]any{
"localhost": map[string]any{ "localhost": map[string]any{
"internal_ipv4": "127.0.0.1", "internal_ipv4": "127.0.0.1",
"internal_ipv6": "::1", "internal_ipv6": "::1",
"artifact": map[string]any{ "artifact": map[string]any{
"images": []any{"abc"}, "images": []any{"abc"},
}, },
"inventory_name": "localhost", "inventory_hostname": "localhost",
"hostname": "localhost", "hostname": "localhost",
}, },
}, },
"inventory_name": "localhost", "inventory_hostname": "localhost",
"hostname": "localhost", "hostname": "localhost",
}, },
}, },
} }

4
plugins/roles/etcd/restore/tasks/main.yaml
View File

@ -17,10 +17,10 @@
export $(cat /etc/etcd.env | grep ETCDCTL_CERT) export $(cat /etc/etcd.env | grep ETCDCTL_CERT)
export $(cat /etc/etcd.env | grep ETCDCTL_KEY) export $(cat /etc/etcd.env | grep ETCDCTL_KEY)
etcdctl snapshot restore /tmp/kubekey/etcd/snapshot.db \ etcdctl snapshot restore /tmp/kubekey/etcd/snapshot.db \
--name={{ .inventory_name }} --endpoints=https://{{ .internal_ipv4 }}:2379 \ --name={{ .inventory_hostname }} --endpoints=https://{{ .internal_ipv4 }}:2379 \
{{- $ips := list -}} {{- $ips := list -}}
{{- range $element := .groups.etcd -}} {{- range $element := .groups.etcd -}}
{{- $ips = append $ips (printf "%s=https://%s:2380" (index .inventory_hosts $element "inventory_name") (index .inventory_hosts $element "internal_ipv4") -}} {{- $ips = append $ips (printf "%s=https://%s:2380" (index .hostvars $element "inventory_hostname") (index .hostvars $element "internal_ipv4") -}}
{{- end -}} {{- end -}}
--initial-cluster={{ $ips | join "," }} \ --initial-cluster={{ $ips | join "," }} \
--initial-advertise-peer-urls=https://{{ .internal_ipv4 }}:2380\ --initial-advertise-peer-urls=https://{{ .internal_ipv4 }}:2380\