diff --git a/kvirt/cluster/k3s/bootstrap.sh b/kvirt/cluster/k3s/bootstrap.sh index ef208f28a..bc5d8294d 100644 --- a/kvirt/cluster/k3s/bootstrap.sh +++ b/kvirt/cluster/k3s/bootstrap.sh @@ -23,7 +23,7 @@ export IP={{ api_ip }} export IP=$(hostname -I | cut -f1 -d" ") {% endif %} -curl -sfL https://get.k3s.io | {{ install_k3s_args }} K3S_TOKEN={{ token }} sh -s - server {{ '--cluster-init' if ctlplanes > 1 else '' }} {{ extra_args|join(" ") }} {{ '--tls-san $IP' if not cloud_lb and config_type in ['aws', 'gcp', 'ibmcloud'] else '' }} +curl -sfL https://get.k3s.io | {{ install_k3s_args }} K3S_TOKEN={{ token }} sh -s - {{ '--cluster-init' if ctlplanes > 1 else '' }} {{ extra_args|join(" ") }} {{ '--tls-san $IP' if not cloud_lb and config_type in ['aws', 'gcp', 'ibmcloud'] else '' }} export K3S_TOKEN=$(cat /var/lib/rancher/k3s/server/node-token) sed "s/127.0.0.1/$IP/" /etc/rancher/k3s/k3s.yaml > /root/kubeconfig if [ -d /root/manifests ] ; then diff --git a/kvirt/cluster/k3s/ctlplanes.sh b/kvirt/cluster/k3s/ctlplanes.sh index 92b3bf2d2..f78527023 100644 --- a/kvirt/cluster/k3s/ctlplanes.sh +++ b/kvirt/cluster/k3s/ctlplanes.sh @@ -32,4 +32,4 @@ export IP={{ first_ip }} {% set first_ip = '{}-{}'.format(cluster, node_suffix) | kcli_info('ip', client) %} {% endif %} -curl -sfL https://get.k3s.io | {{ install_k3s_args|default("") }} K3S_TOKEN={{ token }} sh -s - server --server https://{{ first_ip }}:6443 {{ extra_args|join(" ") }} --tls-san $IP +curl -sfL https://get.k3s.io | {{ install_k3s_args|default("") }} K3S_TOKEN={{ token }} sh -s - --server https://{{ first_ip }}:6443 {{ extra_args|join(" ") }} --tls-san $IP diff --git a/kvirt/cluster/k3s/join.sh b/kvirt/cluster/k3s/join.sh index fdb46bae5..b85565494 100644 --- a/kvirt/cluster/k3s/join.sh +++ b/kvirt/cluster/k3s/join.sh @@ -4,4 +4,4 @@ {% set api_ip = '{0}-ctlplane-1'.format(cluster)|kcli_info('ip') if scale|default(False) and 'ctlplane-0' in name else first_ip %} {% endif %} -curl --retry 5 -sfL https://get.k3s.io | K3S_URL=https://{{ api_ip }}:6443 K3S_TOKEN={{ token }} {{ install_k3s_args|default([])|join(' ') }} sh -s - agent {{ extra_args|join(' ') }} +curl --retry 5 -sfL https://get.k3s.io | K3S_URL=https://{{ api_ip }}:6443 K3S_TOKEN={{ token }} {{ install_k3s_args|default([])|join(' ') }} sh -s - {{ extra_args|join(' ') }}