Merge pull request #50 from puppetlabs/flannel_support

davejrt · web-flow · commit 2f174c86ff50 · 2018-01-30T11:04:53.000+11:00
Flannel support
diff --git a/README.md b/README.md
@@ -41,14 +41,15 @@ If you do not already have Docker installed on your workstation, install it [her
 The kubetool docker image takes each of the parameters as environment variables. When run as follows it will output a `kubernetes.yaml` file in your current working directory:
 
 ```puppet
-docker run --rm -v $(pwd):/mnt -e OS=debian -e VERSION=1.9.1 -e CONTAINER_RUNTIME=docker -e FQDN=kubernetes -e IP=172.17.10.101 -e BOOTSTRAP_CONTROLLER_IP=172.17.10.101 -e ETCD_INITIAL_CLUSTER="etcd-kube-master=http://172.17.10.101:2380" -e ETCD_IP="%{::ipaddress_enp0s8}" -e KUBE_API_ADVERTISE_ADDRESS="%{::ipaddress_enp0s8}" -e INSTALL_DASHBOARD=true puppet/kubetool
+docker run --rm -v $(pwd):/mnt -e OS=debian -e VERSION=1.9.1 -e CONTAINER_RUNTIME=docker -e CNI_PROVIDER=weave -e FQDN=kubernetes -e IP=172.17.10.101 -e BOOTSTRAP_CONTROLLER_IP=172.17.10.101 -e ETCD_INITIAL_CLUSTER="etcd-kube-master=http://172.17.10.101:2380" -e ETCD_IP="%{::ipaddress_enp0s8}" -e KUBE_API_ADVERTISE_ADDRESS="%{::ipaddress_enp0s8}" -e INSTALL_DASHBOARD=true puppet/kubetool
 ```
 
 The parameters are:
 
 * `OS`: the os kubernetes will run on.
 * `VERSION`: the version of kubernetes you want to deploy
 * `CONTAINER_RUNTIME`: the container runtime kubernetes will use, this can only be set to `docker` or `cri_containerd`
+* `CNI_PROVIDER` : This is the CNI network to install. This can be set to `weave` or `flannel`
 * `FQDN`: the cluster fqdn.
 * `BOOTSTRAP_CONTROLLER_IP`: the ip address of the controller puppet will use to create things like cluster role bindings, kube dns, and the Kubernetes dashboard.
 * `ETCD_INITIAL_CLUSTER`: the server addresses. When in production, include three, five, or seven nodes for etcd.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -4,6 +4,8 @@
 
   String $kubernetes_version                                       = $kubernetes::kubernetes_version,
   String $container_runtime                                        = $kubernetes::container_runtime,
+  Optional[String] $cni_cluster_cidr                               = $kubernetes::cni_cluster_cidr,
+  Optional[String] $cni_node_cidr                                  = $kubernetes::cni_node_cidr,
   String $kube_dns_version                                         = $kubernetes::kube_dns_version,
   String $kubernetes_fqdn                                          = $kubernetes::kubernetes_fqdn,
   Boolean $controller                                              = $kubernetes::controller,
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -22,7 +22,7 @@
 #
 # [*cni_version*]
 #   The version of the cni package you would like to install
-#   Defaults to 0.5.1
+#   Defaults to 0.6.0
 #
 # [*kube_dns_version*]
 #   The version of kube DNS you would like to install
@@ -212,6 +212,8 @@
   String $kubernetes_fqdn                                          = $kubernetes::params::kubernetes_fqdn,
   String $container_runtime                                        = $kubernetes::params::container_runtime,
   Optional[String] $cni_version                                    = $kubernetes::params::cni_version,
+  Optional[String] $cni_cluster_cidr                               = $kubernetes::params::cni_cluster_cidr,
+  Optional[String] $cni_node_cidr                                  = $kubernetes::params::cni_node_cidr,
   String $kube_dns_version                                         = $kubernetes::params::kube_dns_version,
   Boolean $controller                                              = $kubernetes::params::controller,
   Boolean $bootstrap_controller                                    = $kubernetes::params::bootstrap_controller,
@@ -253,13 +255,12 @@
   Optional[String] $front_proxy_client_key                         = $kubernetes::params::front_proxy_client_key,
   Optional[String] $sa_key                                         = $kubernetes::params::sa_key,
   Optional[String] $sa_pub                                         = $kubernetes::params::sa_pub,
-  String $cni_network_provider                                     = $kubernetes::params::cni_network_provider,
+  Optional[String] $cni_network_provider                           = $kubernetes::params::cni_network_provider,
   Boolean $install_dashboard                                       = $kubernetes::params::install_dashboard,
   Boolean $taint_master                                            = $kubernetes::params::taint_master,
 
   )  inherits kubernetes::params {
 
-
   if $controller {
     if $worker {
       fail translate(('A node can not be both a controller and a node'))
diff --git a/manifests/kube_addons.pp b/manifests/kube_addons.pp
@@ -1,12 +1,12 @@
 # Class kuberntes kube_addons
 class kubernetes::kube_addons (
 
-  Boolean $bootstrap_controller = $kubernetes::bootstrap_controller,
-  String $cni_network_provider  = $kubernetes::cni_network_provider,
-  Boolean $install_dashboard    = $kubernetes::install_dashboard,
-  String $kubernetes_version    = $kubernetes::kubernetes_version,
-  Boolean $controller           = $kubernetes::controller,
-  Boolean $taint_master         = $kubernetes::taint_master,
+  Boolean $bootstrap_controller          = $kubernetes::bootstrap_controller,
+  Optional[String]$cni_network_provider  = $kubernetes::cni_network_provider,
+  Boolean $install_dashboard             = $kubernetes::install_dashboard,
+  String $kubernetes_version             = $kubernetes::kubernetes_version,
+  Boolean $controller                    = $kubernetes::controller,
+  Boolean $taint_master                  = $kubernetes::taint_master,
 ){
 
   if $bootstrap_controller {
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -5,11 +5,11 @@
 case $::osfamily {
   'Debian' : {
     $kubernetes_package_version = '1.7.3-01'
-    $cni_version                = '0.5.1-00'
+    $cni_version = '0.6.0-00'
   }
   'RedHat' : {
     $kubernetes_package_version = '1.7.3'
-    $cni_version = '0.5.1'
+    $cni_version = '0.6.0'
   }
   default: { notify {"The OS family ${::os_family} is not supported by this module":} }
 }
@@ -22,7 +22,7 @@
 $bootstrap_controller_ip = undef
 $worker = false
 $kube_api_advertise_address = undef
-$etcd_version = '3.0.17'
+$etcd_version = '3.1.11'
 $etcd_ip = undef
 $etcd_initial_cluster = undef
 $bootstrap_token = undef
@@ -57,7 +57,9 @@
 $front_proxy_client_key = undef
 $sa_key = undef
 $sa_pub = undef
-$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'
+$cni_cluster_cidr = undef
+$cni_node_cidr = undef
+$cni_network_provider = undef
 $install_dashboard = false
 $taint_master = true
 
diff --git a/manifests/repos.pp b/manifests/repos.pp
@@ -31,7 +31,6 @@
       }
     }
     'RedHat': {
-
       if $container_runtime == 'docker' {
         yumrepo { 'docker':
           descr    => 'docker',
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -2,10 +2,10 @@
 
 class kubernetes::service (
 
-  Boolean $controller           = $kubernetes::controller,
-  Boolean $bootstrap_controller = $kubernetes::bootstrap_controller,
-  String $container_runtime     = $kubernetes::container_runtime,
-  Optional[String] $etcd_ip     = $kubernetes::etcd_ip,
+  Boolean $controller                = $kubernetes::controller,
+  Boolean $bootstrap_controller      = $kubernetes::bootstrap_controller,
+  String $container_runtime          = $kubernetes::container_runtime,
+  Optional[String] $etcd_ip          = $kubernetes::etcd_ip,
 ){
 
   $peeruls = inline_template("'{\"peerURLs\":[\"http://${etcd_ip}:2380\"]}'")
diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -16,6 +16,8 @@
     {
       'kubernetes_version' => '1.7.3',
       'container_runtime' => 'docker',
+      'cni_cluster_cidr' => '10.0.0.0/24',
+      'cni_node_cidr' => '10.0.1.0/24',
       'kube_dns_version' => '1.14.2',
       'controller' => true,
       'bootstrap_controller' => false,
diff --git a/templates/kube-controller-manager.yaml.erb b/templates/kube-controller-manager.yaml.erb
@@ -21,6 +21,8 @@ spec:
     - --leader-elect=true
     - --root-ca-file=/etc/kubernetes/pki/ca.crt
     - --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt
+    <%= @cni_node_cidr  %> 
+    <%= @cni_cluster_cidr  %>
     image: gcr.io/google_containers/kube-controller-manager-amd64:v<%= @kubernetes_version  %>
     livenessProbe:
       failureThreshold: 8
diff --git a/tooling/Dockerfile b/tooling/Dockerfile
@@ -25,4 +25,4 @@ RUN set -x && \
 
 WORKDIR /mnt
 
-ENTRYPOINT ["sh", "-c", "/etc/k8s/kube_tool.rb -o ${OS} -v ${VERSION} -r ${CONTAINER_RUNTIME}  -f ${FQDN} -i ${IP} -b ${BOOTSTRAP_CONTROLLER_IP} -e ${ETCD_INITIAL_CLUSTER} -t ${ETCD_IP} -a ${KUBE_API_ADVERTISE_ADDRESS} -d ${INSTALL_DASHBOARD}"]
+ENTRYPOINT ["sh", "-c", "/etc/k8s/kube_tool.rb -o ${OS} -v ${VERSION} -r ${CONTAINER_RUNTIME} -c ${CNI_PROVIDER} -f ${FQDN} -i ${IP} -b ${BOOTSTRAP_CONTROLLER_IP} -e ${ETCD_INITIAL_CLUSTER} -t ${ETCD_IP} -a ${KUBE_API_ADVERTISE_ADDRESS} -d ${INSTALL_DASHBOARD}"]
diff --git a/tooling/kube_tool.rb b/tooling/kube_tool.rb
@@ -7,7 +7,7 @@
 require_relative 'kube_tool/clean_up.rb'
 require_relative 'kube_tool/other_params.rb'
 
-options = {:os => nil, :version => nil, :container_runtime => nil, :fqdn => nil, :ip => nil, :bootstrap_controller_ip => nil, :etcd_initial_cluster => nil, :etcd_ip => nil, :kube_api_advertise_address => nil, :install_dashboard => nil}
+options = {:os => nil, :version => nil, :container_runtime => nil, :cni_provider=> nil, :fqdn => nil, :ip => nil, :bootstrap_controller_ip => nil, :etcd_initial_cluster => nil, :etcd_ip => nil, :kube_api_advertise_address => nil, :install_dashboard => nil}
 
 parser = OptionParser.new do|opts|
 
@@ -23,6 +23,10 @@
     options[:container_runtime] = container_runtime;
   end
 
+  opts.on('-c', '--cni-provider cni-provider', 'the networking provider to use') do |cni_provider|
+    options[:cni_provider] = cni_provider;
+  end
+  
   opts.on('-f', '--fqdn fqdn', 'fqdn') do |fqdn|
     options[:fqdn] = fqdn;
   end
@@ -76,7 +80,7 @@ def build_hiera(hash)
     CreateCerts.kube_scheduler
     CreateCerts.kube_workers
     CreateToken.bootstrap
-    OtherParams.create(hash[:os], hash[:version], hash[:container_runtime],  hash[:bootstrap_controller_ip], hash[:fqdn], hash[:etcd_initial_cluster], hash[:etcd_ip], hash[:kube_api_advertise_address], hash[:install_dashboard])
+    OtherParams.create(hash[:os], hash[:version], hash[:container_runtime], hash[:cni_provider], hash[:bootstrap_controller_ip], hash[:fqdn], hash[:etcd_initial_cluster], hash[:etcd_ip], hash[:kube_api_advertise_address], hash[:install_dashboard])
     CleanUp.remove_files
   end
 end
diff --git a/tooling/kube_tool/other_params.rb b/tooling/kube_tool/other_params.rb
@@ -2,7 +2,7 @@
 
 class OtherParams
 
-  def OtherParams.create(os, version, container_runtime, bootstrap_controller_ip, fqdn, etcd_initial_cluster, etcd_ip, kube_api_advertise_address, install_dashboard)
+  def OtherParams.create(os, version, container_runtime, cni_provider, bootstrap_controller_ip, fqdn, etcd_initial_cluster, etcd_ip, kube_api_advertise_address, install_dashboard)
     if install_dashboard.match('true')
        install = true
     else
@@ -13,10 +13,29 @@ def OtherParams.create(os, version, container_runtime, bootstrap_controller_ip,
     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_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'    
+    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'  
+    elsif cni_provider.match('romana')
+      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::kubernetes_fqdn'] = fqdn
     data['kubernetes::bootstrap_controller_ip'] = bootstrap_controller_ip
     data['kubernetes::etcd_initial_cluster'] = etcd_initial_cluster

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`'RedHat': {`
`34`		`-`
`35`	`34`	`if $container_runtime == 'docker' {`
`36`	`35`	`yumrepo { 'docker':`
`37`	`36`	`descr => 'docker',`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`{`
`17`	`17`	`'kubernetes_version' => '1.7.3',`
`18`	`18`	`'container_runtime' => 'docker',`
	`19`	`+ 'cni_cluster_cidr' => '10.0.0.0/24',`
	`20`	`+ 'cni_node_cidr' => '10.0.1.0/24',`
`19`	`21`	`'kube_dns_version' => '1.14.2',`
`20`	`22`	`'controller' => true,`
`21`	`23`	`'bootstrap_controller' => false,`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ RUN set -x && \`
`25`	`25`
`26`	`26`	`WORKDIR /mnt`
`27`	`27`
`28`		`-ENTRYPOINT ["sh", "-c", "/etc/k8s/kube_tool.rb -o ${OS} -v ${VERSION} -r ${CONTAINER_RUNTIME} -f ${FQDN} -i ${IP} -b ${BOOTSTRAP_CONTROLLER_IP} -e ${ETCD_INITIAL_CLUSTER} -t ${ETCD_IP} -a ${KUBE_API_ADVERTISE_ADDRESS} -d ${INSTALL_DASHBOARD}"]`
	`28`	`+ENTRYPOINT ["sh", "-c", "/etc/k8s/kube_tool.rb -o ${OS} -v ${VERSION} -r ${CONTAINER_RUNTIME} -c ${CNI_PROVIDER} -f ${FQDN} -i ${IP} -b ${BOOTSTRAP_CONTROLLER_IP} -e ${ETCD_INITIAL_CLUSTER} -t ${ETCD_IP} -a ${KUBE_API_ADVERTISE_ADDRESS} -d ${INSTALL_DASHBOARD}"]`