Merge pull request #512 from puppetlabs/k8s_cert

Bump test k8s version to 1.20.6 and update apt key

Author: adrianiurca

manifests/repos.pp

@@ -30,7 +30,7 @@
           repos    => pick($kubernetes_apt_repos,'main'),
           release  => pick($kubernetes_apt_release,'kubernetes-xenial'),
           key      => {
-            'id'     => pick($kubernetes_key_id,'54A647F9048D5688D7DA2ABE6A030B21BA07F4FB'),
+            'id'     => pick($kubernetes_key_id,'7F92E05B31093BEF5A3C2D38FEEA9169307EA071'),
             'source' => pick($kubernetes_key_source,'https://packages.cloud.google.com/apt/doc/apt-key.gpg'),
           },
         }

spec/acceptance/integration_kubernetes_spec.rb

@@ -47,7 +47,7 @@
       it 'verify the k8 nodes' do
         run_shell('sleep 20')
         run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl get nodes') do |r|
-          expect(r.stdout).to match(/#{hostname1}(\s)+Ready(\s)+master/)
+          expect(r.stdout).to match(/#{hostname1}(\s)+Ready(\s)+control-plane,master/)
           expect(r.stdout).to match(/#{hostname2}(\s)+Ready/)
           expect(r.stdout).to match(/#{hostname3}(\s)+Ready/)
         end

spec/acceptance/kubernetes_spec.rb

@@ -13,8 +13,8 @@
         pp = <<-MANIFEST
         if $facts['os']['family'] == 'redhat'{
           class {'kubernetes':
-                  kubernetes_version => '1.16.6',
-                  kubernetes_package_version => '1.16.6',
+                  kubernetes_version => '1.20.6',
+                  kubernetes_package_version => '1.20.6',
                   controller_address => "$::ipaddress:6443",
                   container_runtime => 'docker',
                   manage_docker => false,

spec/spec_helper_acceptance_local.rb

@@ -77,8 +77,8 @@ def configure_puppet_server(controller, worker1, worker2)
   site_pp = <<-EOS
   node /#{controller}/ {
     class {'kubernetes':
-      kubernetes_version => '1.16.6',
-      kubernetes_package_version => '1.16.6',
+      kubernetes_version => '1.20.6',
+      kubernetes_package_version => '1.20.6',
       controller_address => "$::ipaddress:6443",
       container_runtime => 'docker',
       manage_docker => false,
@@ -262,7 +262,7 @@ def execute_agent(role)
   end
   if family =~ /redhat|centos/
     runtime = 'docker'
-    cni = 'flannel'
+    cni = 'weave'
     ['controller', 'worker1', 'worker2'].each { |node|
       ENV['TARGET_HOST'] = target_roles(node)[0][:name]
       run_shell('setenforce 0 || true')
@@ -283,7 +283,7 @@ def execute_agent(role)
 
   ENV['TARGET_HOST'] = target_roles('controller')[0][:name]
   run_shell('docker build -t kubetool:latest /etc/puppetlabs/code/environments/production/modules/kubernetes/tooling')
-  run_shell("docker run --rm -v $(pwd)/hieradata:/mnt -e OS=#{family} -e VERSION=1.16.6 -e CONTAINER_RUNTIME=#{runtime} -e CNI_PROVIDER=#{cni} -e ETCD_INITIAL_CLUSTER=#{hostname1}:#{int_ipaddr1} -e ETCD_IP=#{int_ipaddr1} -e ETCD_PEERS=[#{int_ipaddr1},#{int_ipaddr2},#{int_ipaddr3}] -e KUBE_API_ADVERTISE_ADDRESS=#{int_ipaddr1} -e INSTALL_DASHBOARD=true kubetool:latest")
+  run_shell("docker run --rm -v $(pwd)/hieradata:/mnt -e OS=#{family} -e VERSION=1.20.6 -e CONTAINER_RUNTIME=#{runtime} -e CNI_PROVIDER=#{cni} -e ETCD_INITIAL_CLUSTER=#{hostname1}:#{int_ipaddr1} -e ETCD_IP=#{int_ipaddr1} -e ETCD_PEERS=[#{int_ipaddr1},#{int_ipaddr2},#{int_ipaddr3}] -e KUBE_API_ADVERTISE_ADDRESS=#{int_ipaddr1} -e INSTALL_DASHBOARD=true kubetool:latest")
   create_remote_file("nginx","/tmp/nginx.yml", nginx)
   create_remote_file("hiera","/etc/puppetlabs/puppet/hiera.yaml", hiera)
   run_shell('chmod 644 /etc/puppetlabs/puppet/hiera.yaml')
@@ -299,7 +299,7 @@ def execute_agent(role)
   end
 
   if family =~ /redhat|centos/
-    run_shell("echo 'kubernetes::cni_network_provider: https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml' >> /etc/puppetlabs/code/environments/production/hieradata/#{family.capitalize}.yaml")
+    run_shell("echo 'kubernetes::cni_network_provider: https://cloud.weave.works/k8s/net?k8s-version=1.20.6' >> /etc/puppetlabs/code/environments/production/hieradata/#{family.capitalize}.yaml")
   end
 
   run_shell("echo 'kubernetes::schedule_on_controller: true'  >> /etc/puppetlabs/code/environments/production/hieradata/#{family.capitalize}.yaml")