Merge pull request puppetlabs#627 from puppetlabs/CONT-914-address_ci_failures

(CONT-914) - Address CI Failures

Author: LukasAud

metadata.json

@@ -21,8 +21,8 @@
       "version_requirement": ">= 2.0.0 < 7.0.0"
     },
     {
-      "name": "herculesteam-augeasproviders_sysctl",
-      "version_requirement": ">= 2.2.1 < 3.0.0"
+      "name": "puppet-augeasproviders_sysctl",
+      "version_requirement": ">= 3.0.0 < 4.0.0"
     },
     {
       "name": "puppet-augeasproviders_core",

spec/acceptance/integration_kubernetes_spec.rb

@@ -9,7 +9,7 @@
     after(:all) { reset_target_host }
     describe 'set up controller' do
       it 'sets up the controller' do
-        run_shell('puppet agent --test', expect_failures: true) do |r|
+        run_shell('puppet agent -t', expect_failures: true) do |r|
           expect(r.exit_code.to_s).to match(%r{0|2})
         end
       end
@@ -20,7 +20,7 @@
     after(:all) { reset_target_host }
     describe 'set up worker' do
       it 'sets up the worker' do
-        run_shell('puppet agent --test', expect_failures: true) do |r|
+        run_shell('puppet agent -t', expect_failures: true) do |r|
           expect(r.exit_code.to_s).to match(%r{0|2})
         end
       end
@@ -31,7 +31,7 @@
     after(:all) { reset_target_host }
     describe 'set up worker' do
       it 'sets up the worker' do
-        run_shell('puppet agent --test', expect_failures: true) do |r|
+        run_shell('puppet agent -t', expect_failures: true) do |r|
           expect(r.exit_code.to_s).to match(%r{0|2})
         end
       end

spec/acceptance/kubernetes_spec.rb

@@ -9,29 +9,37 @@
       context 'it should install the module and run' do
         before(:all) { change_target_host('controller') }
         after(:all) { reset_target_host }
+        # fetch_ip_hostname_by_role returns an array of 3 elements [hostname, ipaddress, internal_ipaddress]
+        int_ipaddr1 = fetch_ip_hostname_by_role('controller')[2]
+
         pp = <<-MANIFEST
-        if $facts['os']['family'] == 'redhat'{
-          class {'kubernetes':
-                  kubernetes_version => '1.22.0',
-                  kubernetes_package_version => '1.22.0',
-                  controller_address => "$::ipaddress:6443",
-                  container_runtime => 'docker',
-                  manage_docker => false,
-                  controller => true,
-                  schedule_on_controller => true,
-                  environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
-                  ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],
-                  cgroup_driver => 'cgroupfs',
-                }
+        case $facts['os']['family'] {
+          'RedHat', 'CentOS':  {
+            class {'kubernetes':
+              kubernetes_version => '1.22.0',
+              kubernetes_package_version => '1.22.0',
+              controller_address => "#{int_ipaddr1}:6443",
+              container_runtime => 'docker',
+              manage_docker => false,
+              controller => true,
+              schedule_on_controller => true,
+              environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
+              ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],
+              cgroup_driver => 'cgroupfs',
+            }
           }
-        if $facts['os']['family'] == 'debian'{
+          /^(Debian|Ubuntu)$/: {
           class {'kubernetes':
                   controller => true,
                   schedule_on_controller => true,
                   environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
                   ignore_preflight_errors => ['NumCPU'],
                 }
           }
+          default:  {
+            class {'kubernetes': } # any other OS are not supported
+        }
+      }
     MANIFEST
 
         it 'runs' do

spec/spec_helper_acceptance_local.rb

@@ -75,11 +75,11 @@ def configure_puppet_server(controller, worker1, worker2)
   puppet_cert_sign
   # Create site.pp
   site_pp = <<-EOS
-  node /#{controller}/ {
+  node /#{controller[0]}/ {
     class {'kubernetes':
       kubernetes_version => '1.20.6',
       kubernetes_package_version => '1.20.6',
-      controller_address => "$::ipaddress:6443",
+      controller_address => "#{controller[1]}:6443",
       container_runtime => 'docker',
       manage_docker => false,
       controller => true,
@@ -120,7 +120,7 @@ def configure_puppet_agent(role)
 def puppet_cert_sign
   # Sign the certs
   ENV['TARGET_HOST'] = target_roles('controller')[0][:name]
-  run_shell("puppetserver ca sign --all", expect_failures: true)
+  run_shell('puppetserver ca sign --all', expect_failures: true)
 end
 
 def clear_certs(role)
@@ -145,7 +145,7 @@ def execute_agent(role)
         ENV['TARGET_HOST'] = target_roles(node)[0][:name]
         run_shell("echo #{int_ipaddr1} puppet  >> /etc/hosts")
       }
-      configure_puppet_server(hostname1, hostname2, hostname3)
+      configure_puppet_server([hostname1, int_ipaddr1], hostname2, hostname3)
     else
       c.filter_run_excluding :integration
     end
@@ -158,8 +158,8 @@ def execute_agent(role)
     run_shell('puppet module install puppetlabs-apt')
     run_shell('puppet module install maestrodev-wget')
     run_shell('puppet module install puppet-archive')
-    run_shell('puppet module install herculesteam-augeasproviders_sysctl')
-    run_shell('puppet module install herculesteam-augeasproviders_core')
+    run_shell('puppet module install puppet-augeasproviders_sysctl')
+    run_shell('puppet module install puppet-augeasproviders_core')
     run_shell('puppet module install puppet-kmod')
     run_shell('puppet module install puppetlabs-docker')
     run_shell('puppet module install puppetlabs-helm')
@@ -295,11 +295,11 @@ def execute_agent(role)
   run_shell("sed -i /cni_network_provider/d /etc/puppetlabs/code/environments/production/hieradata/#{family.capitalize}.yaml")
 
   if family =~ /debian|ubuntu-1604-lts/
-    run_shell("echo 'kubernetes::cni_network_provider: https://cloud.weave.works/k8s/net?k8s-version=1.16.6' >> /etc/puppetlabs/code/environments/production/hieradata/#{family.capitalize}.yaml")
+    run_shell("echo 'kubernetes::cni_network_provider: https://github.com/weaveworks/weave/releases/download/v2.8.1/weave-daemonset-k8s-1.11.yaml' >> /etc/puppetlabs/code/environments/production/hieradata/#{family.capitalize}.yaml")
   end
 
   if family =~ /redhat|centos/
-    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")
+    run_shell("echo 'kubernetes::cni_network_provider: https://github.com/weaveworks/weave/releases/download/v2.8.1/weave-daemonset-k8s-1.11.yaml' >> /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")

tooling/kube_tool/create_certs.rb

@@ -88,7 +88,7 @@ def kube_ca
     File.open("ca-csr.json", "w+") { |file| file.write(csr.to_json) }
     File.open("ca-conf.json", "w+") { |file| file.write(conf.to_json) }
     system('cfssl gencert -initca ca-csr.json | cfssljson -bare ca')
-    system("openssl x509 -pubkey -in ca.pem | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //' > discovery_token_hash")
+    system("openssl x509 -pubkey -in ca.pem | openssl pkey -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //' > discovery_token_hash")
     FileUtils.rm_f('ca.csr')
     data = Hash.new
     cer = File.read("ca.pem")

tooling/kube_tool/other_params.rb

@@ -19,7 +19,7 @@ def OtherParams.create(opts)
 
     case opts[:cni_provider]
     when 'weave'
-      cni_network_provider = "https://cloud.weave.works/k8s/net?k8s-version=#{version}"
+      cni_network_provider = "https://github.com/weaveworks/weave/releases/download/v2.8.1/weave-daemonset-k8s-1.11.yaml"
       cni_pod_cidr = '10.32.0.0/12'
     when 'flannel'
       cni_network_provider = 'https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml'