first commit to add cri-containerd

final commit for cri_containerd

Author: scott coulton

tooling/Dockerfile

@@ -25,4 +25,4 @@ RUN set -x && \
 
 WORKDIR /mnt
 
-ENTRYPOINT ["sh", "-c", "/etc/k8s/kube_tool.rb -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}  -f ${FQDN} -i ${IP} -b ${BOOTSTRAP_CONTROLLER_IP} -e ${ETCD_INITIAL_CLUSTER} -t ${ETCD_IP} -a ${KUBE_API_ADVERTISE_ADDRESS} -d ${INSTALL_DASHBOARD}"]

tooling/kube_tool.rb

@@ -7,9 +7,22 @@
 require_relative 'kube_tool/clean_up.rb'
 require_relative 'kube_tool/other_params.rb'
 
-options = {: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, :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|
+   
+   opts.on('-o', '--os-type os-type', 'the os that kubernetes will run on') do |os|
+    options[:os] = os;
+  end
+
+   opts.on('-v', '--version version', 'the kubernetes version to install') do |version|
+    options[:version] = version;
+  end
+ 
+   opts.on('-r', '--container_runtime container runtime', 'the container runtime to use. this can only be docker or cri_containerd') do |container_runtime|
+    options[:container_runtime] = container_runtime;
+  end
+   
   opts.on('-f', '--fqdn fqdn', 'fqdn') do |fqdn|
     options[:fqdn] = fqdn;
   end
@@ -63,7 +76,7 @@ def build_hiera(hash)
     CreateCerts.kube_scheduler
     CreateCerts.kube_workers
     CreateToken.bootstrap
-    OtherParams.create(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[: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

tooling/kube_tool/other_params.rb

@@ -2,13 +2,21 @@
 
 class OtherParams
 
-  def OtherParams.create(bootstrap_controller_ip, fqdn, etcd_initial_cluster, etcd_ip, kube_api_advertise_address, install_dashboard)
+  def OtherParams.create(os, version, container_runtime, bootstrap_controller_ip, fqdn, etcd_initial_cluster, etcd_ip, kube_api_advertise_address, install_dashboard)
     if install_dashboard.match('true')
        install = true 
     else
        install = false
     end   
+    if os.match('debian') 
+      kubernetes_package_version = "#{version}-00"
+    elsif os.match('rhel')
+      kubernetes_package_version = version   	    
+    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::kubernetes_fqdn'] = fqdn
     data['kubernetes::bootstrap_controller_ip'] = bootstrap_controller_ip
     data['kubernetes::etcd_initial_cluster'] = etcd_initial_cluster