fixes weave URL in kube_tool and uses default IP range (#63)

* removing hardcodes ip address range

* reverting to older URL

* fixes for weave address range

Author: davejrt

spec/acceptance/kubernetes_spec.rb

@@ -39,7 +39,7 @@ class {'kubernetes':
 
         it 'can access the deployed service' do
           shell('sleep 60')
-          shell('curl 10.96.188.5', :acceptable_exit_codes => [0]) do |r|
+          shell('curl -s 10.96.188.5', :acceptable_exit_codes => [0]) do |r|
             expect(r.stdout).to match (/Welcome to nginx!/)
           end
         end

spec/spec_helper_acceptance.rb

@@ -42,6 +42,8 @@
       on host, puppet('module', 'install', 'puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'stahnma-epel'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'puppetlabs-translate', '--version', '1.0.0' ), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module', 'install', 'puppet-archive'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0,1] }
 
       # shell('echo "#{vmhostname}" > /etc/hostname')
       # shell("hostname #{vmhostname}")
@@ -113,10 +115,14 @@
         on(host, "tar -C /usr/local -xzf go.tar.gz", acceptable_exit_codes: [0]).stdout
         on(host, "export PATH=$PATH:/usr/local/go/bin;go get -u github.com/cloudflare/cfssl/cmd/...", acceptable_exit_codes: [0]).stdout
         # Creating certs
-        on(host, "source ~/.bash_profile;rbenv global 2.3.1;rbenv local 2.3.1;export PATH=$PATH:/usr/local/go/bin;export PATH=$PATH:/root/go/bin;cd  /etc/puppetlabs/code/modules/kubernetes/tooling;./kube_tool.rb -o #{os} -v 1.8.5 -r docker -f kubernetes -i #{vmipaddr} -b #{vmipaddr} -e \"etcd-#{vmhostname}=http://#{vmipaddr}:2380\" -t \"#{vmipaddr}\" -a \"#{vmipaddr}\" -d true", acceptable_exit_codes: [0]).stdout
+        on(host, "source ~/.bash_profile;rbenv global 2.3.1;rbenv local 2.3.1;export PATH=$PATH:/usr/local/go/bin;export PATH=$PATH:/root/go/bin;cd  /etc/puppetlabs/code/modules/kubernetes/tooling;./kube_tool.rb -o #{os} -v 1.9.2 -r cri_containerd -c weave -f kubernetes -i #{vmipaddr} -b #{vmipaddr} -e \"etcd-#{vmhostname}=http://#{vmipaddr}:2380\" -t \"#{vmipaddr}\" -a \"#{vmipaddr}\" -d true", acceptable_exit_codes: [0]).stdout
         create_remote_file(host, "/etc/hosts", hosts_file)
         create_remote_file(host, "/tmp/nginx.yml", nginx)
         on(host, 'cp /etc/puppetlabs/code/modules/kubernetes/tooling/kubernetes.yaml /etc/puppetlabs/code/environments/production/hieradata/common.yaml', acceptable_exit_codes: [0]).stdout
+        on(host, 'sed -i /cni_network_provider/d /etc/puppetlabs/code/environments/production/hieradata/common.yaml', acceptable_exit_codes: [0]).stdout
+        on(host, 'echo "kubernetes::cni_network_provider: https://cloud.weave.works/k8s/net?k8s-version=\$(kubectl version | base64 | tr -d \"\n\")\&env.IPALLOC_RANGE=100.32.0.0/12" >> /etc/puppetlabs/code/environments/production/hieradata/common.yaml', acceptable_exit_codes: [0]).stdout
+        on(host, 'echo "kubernetes::taint_master: false"  >> /etc/puppetlabs/code/environments/production/hieradata/common.yaml', acceptable_exit_codes: [0]).stdout
+
         # Disable swap
         on(host, 'swapoff -a')
     end

tooling/kube_tool/other_params.rb

@@ -13,29 +13,29 @@ def OtherParams.create(os, version, container_runtime, cni_provider, bootstrap_c
     elsif os.downcase.match('redhat')
       kubernetes_package_version = version
     end
-    
+
     if cni_provider.match('weave')
-       cni_network_provider = 'https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d "\n")\&env.IPALLOC_RANGE=100.32.0.0/12'
-    elsif      
+       cni_network_provider = 'https://git.io/weave-kube-1.6'
+    elsif
        cni_provider.match('flannel')
        cni_network_provider = 'https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml'
-       cni_cluster_cidr = '- --cluster-cidr=10.244.0.0/16' 
-       cni_node_cidr = '- --allocate-node-cidrs=true'    
+       cni_cluster_cidr = '- --cluster-cidr=10.244.0.0/16'
+       cni_node_cidr = '- --allocate-node-cidrs=true'
     elsif cni_provider.match('calico')
        cni_network_provider = 'https://docs.projectcalico.org/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml'
        cni_cluster_cidr = '- --cluster-cidr=192.168.0.0/16'
-       cni_node_cidr = '- --allocate-node-cidrs=true'  
+       cni_node_cidr = '- --allocate-node-cidrs=true'
     elsif cni_provider.match('romana')
-      cni_network_provider = 'https://raw.githubusercontent.com/romana/romana/master/containerize/specs/romana-kubeadm.yml'	    
+      cni_network_provider = 'https://raw.githubusercontent.com/romana/romana/master/containerize/specs/romana-kubeadm.yml'
     end
-    
+
     data = Hash.new
     data['kubernetes::kubernetes_version'] = version
     data['kubernetes::kubernetes_package_version'] = kubernetes_package_version
     data['kubernetes::container_runtime'] = container_runtime
     data['kubernetes::cni_network_provider'] = cni_network_provider
     data['kubernetes::cni_cluster_cidr'] = cni_cluster_cidr
-    data['kubernetes::cni_node_cidr'] = cni_node_cidr 
+    data['kubernetes::cni_node_cidr'] = cni_node_cidr
     data['kubernetes::kubernetes_fqdn'] = fqdn
     data['kubernetes::bootstrap_controller_ip'] = bootstrap_controller_ip
     data['kubernetes::etcd_initial_cluster'] = etcd_initial_cluster
@@ -44,5 +44,6 @@ def OtherParams.create(os, version, container_runtime, cni_provider, bootstrap_c
     data['kubernetes::install_dashboard'] = install
     File.open("kubernetes.yaml", "a") { |file| file.write(data.to_yaml) }
     File.write("kubernetes.yaml",File.open("kubernetes.yaml",&:read).gsub(/^---$/," "))
+
   end
 end