diff --git a/cmd/clusterctl/examples/openstack/provider-component/user-data/centos/templates/worker-user-data.sh b/cmd/clusterctl/examples/openstack/provider-component/user-data/centos/templates/worker-user-data.sh index 6dc32c05c0..eed672f19c 100644 --- a/cmd/clusterctl/examples/openstack/provider-component/user-data/centos/templates/worker-user-data.sh +++ b/cmd/clusterctl/examples/openstack/provider-component/user-data/centos/templates/worker-user-data.sh @@ -7,8 +7,6 @@ NAMESPACE={{ .Machine.ObjectMeta.Namespace }} MACHINE=$NAMESPACE MACHINE+="/" MACHINE+={{ .Machine.ObjectMeta.Name }} -CLUSTER_DNS_DOMAIN={{ .Cluster.Spec.ClusterNetwork.ServiceDomain }} -SERVICE_CIDR={{ .ServiceCIDR }} cat < /etc/yum.repos.d/kubernetes.repo [kubernetes] name=Kubernetes diff --git a/cmd/clusterctl/examples/openstack/provider-component/user-data/ubuntu/templates/worker-user-data.sh b/cmd/clusterctl/examples/openstack/provider-component/user-data/ubuntu/templates/worker-user-data.sh index 3bdd62fd97..1dbb57f9be 100644 --- a/cmd/clusterctl/examples/openstack/provider-component/user-data/ubuntu/templates/worker-user-data.sh +++ b/cmd/clusterctl/examples/openstack/provider-component/user-data/ubuntu/templates/worker-user-data.sh @@ -7,8 +7,6 @@ NAMESPACE={{ .Machine.ObjectMeta.Namespace }} MACHINE=$NAMESPACE MACHINE+="/" MACHINE+={{ .Machine.ObjectMeta.Name }} -CLUSTER_DNS_DOMAIN={{ .Cluster.Spec.ClusterNetwork.ServiceDomain }} -SERVICE_CIDR={{ .ServiceCIDR }} swapoff -a # disable swap in fstab @@ -72,7 +70,6 @@ KUBEADM=$(getversion kubeadm ${KUBELET_VERSION}-) KUBECTL=$(getversion kubectl ${KUBELET_VERSION}-) apt-get install -y kubelet=${KUBELET} kubeadm=${KUBEADM} kubectl=${KUBECTL} # kubeadm uses 10th IP as DNS server -CLUSTER_DNS_SERVER=$(prips ${SERVICE_CIDR} | head -n 11 | tail -n 1) # Write the cloud.conf so that the kubelet can use it. echo $OPENSTACK_CLOUD_PROVIDER_CONF | base64 -d > /etc/kubernetes/cloud.conf @@ -84,12 +81,6 @@ cat > /etc/kubernetes/kubeadm_config.yaml < /etc/systemd/system/kubelet.service.d/20-kubenet.conf <