Merge pull request #144 from ananace/idempotency-change

Un-DRY execs to avoid puppet-lint failures

Author: ananace

manifests/server/tls/cert.pp

@@ -61,18 +61,17 @@
   if $ensure == 'present' {
     Package <| title == 'openssl' |>
     -> exec {
-      default:
-        path => $facts['path'];
-
       "Create K8s ${title} key":
         command => "openssl genrsa -out '${key}' ${key_bits}; echo > '${cert}'",
         unless  => "openssl pkey -in '${key}' -text | grep '${key_bits} bit'",
+        path    => $facts['path'],
         before  => File[$key],
         notify  => Exec["Create K8s ${title} CSR"];
 
       "Create K8s ${title} CSR":
         command     => "openssl req -new -key '${key}' \
           -out '${csr}' -config '${$config}'; echo > '${cert}'",
+        path        => $facts['path'],
         refreshonly => true,
         notify      => Exec["Sign K8s ${title} cert"],
         require     => File[$key],
@@ -84,6 +83,7 @@
           -out '${cert}' -days '${valid_days}' \
           -extensions v3_req -extfile '${config}'",
         unless  => "openssl verify -CAfile '${ca_cert}' '${cert}'",
+        path    => $facts['path'],
         require => [
           File[$csr],
           File[$key],

spec/unit/puppet/provider/kubeconfig/kubectl_spec.rb

@@ -67,7 +67,6 @@ def self.message(*_); end
         ],
         'current-context' => 'default',
         'kind' => 'Config',
-        'preferences' => {},
       }
     end
 
@@ -125,7 +124,7 @@ def self.message(*_); end
         catalog.apply
 
         data = Psych.load(File.read(tmpfile))
-        expect(data).to eq default_kubeconfig
+        expect(data.slice(*default_kubeconfig.keys)).to eq default_kubeconfig
       end
     end
   end