fixing acceptance tests

Author: Dave Try

manifests/cluster_roles.pp

@@ -32,7 +32,7 @@
     require     => File['/etc/kubernetes/manifests/clusterRoleBinding.yaml'],
     }
 
-  if $kubernetes_version =~ /1[.]8[.]\d/ {
+  if $kubernetes_version =~ /1[.](8|9)[.]\d/ {
 
     exec { 'Create role biniding for system nodes':
       command => 'kubectl set subject clusterrolebinding system:node --group=system:nodes',

manifests/service.pp

@@ -69,7 +69,7 @@
     }
 
     default: {
-      fail("Please specify a valid container runtime")
+      fail('Please specify a valid container runtime')
     }
   }
 

spec/spec_helper_acceptance.rb

@@ -29,6 +29,7 @@
       # Return the hostname on :dashboard
       vmhostname = on(host, 'hostname', acceptable_exit_codes: [0]).stdout.strip
       vmipaddr = on(host, "ip route get 8.8.8.8 | awk '{print $NF; exit}'", acceptable_exit_codes: [0]).stdout.strip
+      os = fact_on(host, 'osfamily')
 
       copy_module_to(host, :source => proj_root, :module_name => 'kubernetes')
       if fact_on(host, 'operatingsystem') == 'RedHat'
@@ -99,10 +100,12 @@
         on(host, "apt-get install build-essential curl git m4 python-setuptools ruby texinfo libbz2-dev libcurl4-openssl-dev libexpat-dev libncurses-dev zlib1g-dev --yes", acceptable_exit_codes: [0]).stdout
         on(host, "cd  /etc/puppetlabs/code/modules/kubernetes;rm -rf Gemfile.lock;bundle install --path vendor/bundle", acceptable_exit_codes: [0]).stdout
         # Creating certs
-        on(host, "export PATH=$PATH:/usr/local/go/bin;export PATH=$PATH:/root/go/bin;cd  /etc/puppetlabs/code/modules/kubernetes/tooling;./kube_tool.rb -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, "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
         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
+        # Disable swap
+        on(host, 'swapoff -a')
     end
   end
 end

templates/kube-apiserver.yaml.erb

@@ -13,7 +13,8 @@ spec:
     - kube-apiserver
     - --tls-private-key-file=/etc/kubernetes/pki/apiserver.key
     - --allow-privileged=true
-    - --experimental-bootstrap-token-auth=true
+    <% if @kubernetes_version =~ /1[.](8|9)[.]\d/ -%>- --enable-bootstrap-token-auth=true<% end %>
+    <% if @kubernetes_version =~ /1[.](6|7)[.]\d/ -%>- --experimental-bootstrap-token-auth=true<% end %>
     - --service-cluster-ip-range=10.96.0.0/12
     - --insecure-port=0
     - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
@@ -30,7 +31,7 @@ spec:
     - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
     - --requestheader-username-headers=X-Remote-User
     - --requestheader-allowed-names=front-proxy-client
-    <% if @kubernetes_version =~ /1[.]8[.]\d/ -%>- --authorization-mode=Node,RBAC<% end %> 
+    <% if @kubernetes_version =~ /1[.](8|9)[.]\d/ -%>- --authorization-mode=Node,RBAC<% end %>
     <% if @kubernetes_version =~ /1[.](6|7)[.]\d/ -%>- --authorization-mode=RBAC<% end %>
     - --advertise-address=<%= @kube_api_advertise_address  %>
     - --etcd-servers=http://127.0.0.1:2379

tooling/kube_tool.rb

@@ -10,19 +10,19 @@
 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

tooling/kube_tool/other_params.rb

@@ -4,19 +4,19 @@ class OtherParams
 
   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 
+       install = true
     else
        install = false
-    end   
-    if os.match('debian') 
+    end
+    if os.downcase.match('debian')
       kubernetes_package_version = "#{version}-00"
-    elsif os.match('rhel')
-      kubernetes_package_version = version   	    
-    end       
+    elsif os.downcase.match('redhat')
+      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::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
@@ -26,4 +26,4 @@ def OtherParams.create(os, version, container_runtime, bootstrap_controller_ip,
     File.open("kubernetes.yaml", "a") { |file| file.write(data.to_yaml) }
     File.write("kubernetes.yaml",File.open("kubernetes.yaml",&:read).gsub(/^---$/," "))
   end
-end  
+end