Merge pull request #41 from rwaffen/fix_forgotten_user_group

fix forgotten user and group values
voxpupuli · Apr 13, 2023 · d5d5a21 · d5d5a21
2 parents e7efb89 + cdf43c2
commit d5d5a21
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/manifests/server/apiserver.pp b/manifests/server/apiserver.pp
@@ -271,8 +271,8 @@
 
           dir   => '/srv/kubernetes',
           bin   => 'kube-apiserver',
-          user  => kube,
-          group => kube,
+          user  => $k8s::user,
+          group => $k8s::group,
       }),
       require => [
         File["${_sysconfig_path}/kube-apiserver"],

diff --git a/manifests/server/controller_manager.pp b/manifests/server/controller_manager.pp
@@ -92,8 +92,8 @@
           dir   => '/srv/kubernetes',
           bin   => 'kube-controller-manager',
           needs => ['kube-apiserver.service'],
-          user  => kube,
-          group => kube,
+          user  => $k8s::user,
+          group => $k8s::group,
       }),
       require => [
         File["${_sysconfig_path}/kube-controller-manager"],

diff --git a/manifests/server/scheduler.pp b/manifests/server/scheduler.pp
@@ -73,8 +73,8 @@
           dir   => '/srv/kubernetes',
           bin   => 'kube-scheduler',
           needs => ['kube-apiserver.service'],
-          user  => kube,
-          group => kube,
+          user  => $k8s::user,
+          group => $k8s::group,
       }),
       require => [
         File["${_sysconfig_path}/kube-scheduler"],

diff --git a/manifests/server/tls.pp b/manifests/server/tls.pp
@@ -185,17 +185,17 @@
     if $generate_ca and !defined(File["${cert_path}/service-account.key"]) {
       file { "${cert_path}/service-account.key":
         ensure  => $ensure,
-        owner   => kube,
-        group   => kube,
+        owner   => $k8s::user,
+        group   => $k8s::group,
         replace => false,
         mode    => '0600',
       }
     }
     if !defined(File["${cert_path}/service-account.pub"]) {
       file { "${cert_path}/service-account.pub":
         ensure  => $ensure,
-        owner   => kube,
-        group   => kube,
+        owner   => $k8s::user,
+        group   => $k8s::group,
         replace => false,
         mode    => '0640',
       }