diff --git a/bootstrap/README.md b/bootstrap/README.md index 20f9022..d587566 100644 --- a/bootstrap/README.md +++ b/bootstrap/README.md @@ -68,7 +68,7 @@ Check the current default value of `kube_version` in cloned repository. ```sh cd kubespray -ansible-playbook -i inventory/prod/inventory.ini -e kube_version=v1.16.9 -e upgrade_cluster_setup=true cluster.yml +ansible-playbook -i inventory/prod/inventory.ini -e kube_version=v1.17.5 -e upgrade_cluster_setup=true cluster.yml ``` History: diff --git a/bootstrap/init.sh b/bootstrap/init.sh index 7988672..293a23f 100755 --- a/bootstrap/init.sh +++ b/bootstrap/init.sh @@ -2,7 +2,7 @@ echo "######################################################################################" echo "## Reinit repository" rm -rf kubespray -VERSION=${1:-release-2.12} +VERSION=${1:-release-2.13} git clone --branch $VERSION https://github.com/kubernetes-sigs/kubespray.git echo "######################################################################################" @@ -41,6 +41,7 @@ echo "## Preparing real prod environment" cp -r kubespray/inventory/sample kubespray/inventory/prod rm kubespray/inventory/prod/inventory.ini cp ./prod.ini kubespray/inventory/prod/inventory.ini -gsed -i "s/kube_network_plugin: .*/kube_network_plugin: flannel/" ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml +#gsed -i "s/kube_network_plugin: .*/kube_network_plugin: flannel/" ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml +gsed -i "s/# calico_iptables_backend: \"Legacy\"/calico_iptables_backend: \"NFT\"/" ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml #echo 'calico_iptables_backend: "NFT"' >> ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-net-cluster.yml #gsed -i "s/metrics_server_enabled: .*/metrics_server_enabled: true/" ./kubespray/inventory/prod/group_vars/k8s-cluster/addons.yml