Allow additional configuration of API Server (#47)

Author: Zetten

manifests/config.pp

@@ -38,6 +38,7 @@
   Optional[String] $apiserver_kubelet_client_key                   = $kubernetes::apiserver_kubelet_client_key,
   Optional[String] $apiserver_crt                                  = $kubernetes::apiserver_crt,
   Optional[String] $apiserver_key                                  = $kubernetes::apiserver_key,
+  Array $apiserver_extra_arguments                                 = $kubernetes::apiserver_extra_arguments,
   Optional[String] $ca_crt                                         = $kubernetes::ca_crt,
   Optional[String] $ca_key                                         = $kubernetes::ca_key,
   Optional[String] $front_proxy_ca_crt                             = $kubernetes::front_proxy_ca_crt,

manifests/init.pp

@@ -152,6 +152,10 @@
 #   The api server key. Must be passed as cert not a file.
 #   Defaults to undef
 #
+# [*apiserver_extra_arguments*]
+#   A string array of extra arguments to be passed to the api server.
+#   Defaults to []
+#
 # [*ca_crt*]
 #   The clusters ca certificate. Must be passed as cert not a file.
 #   Defaults to undef
@@ -240,6 +244,7 @@
   Optional[String] $apiserver_kubelet_client_key                   = $kubernetes::params::apiserver_kubelet_client_key,
   Optional[String] $apiserver_crt                                  = $kubernetes::params::apiserver_crt,
   Optional[String] $apiserver_key                                  = $kubernetes::params::apiserver_key,
+  Array $apiserver_extra_arguments                                 = $kubernetes::params::apiserver_extra_arguments,
   Optional[String] $ca_crt                                         = $kubernetes::params::ca_crt,
   Optional[String] $ca_key                                         = $kubernetes::params::ca_key,
   Optional[String] $front_proxy_ca_crt                             = $kubernetes::params::front_proxy_ca_crt,

manifests/params.pp

@@ -48,6 +48,7 @@
 $apiserver_kubelet_client_key = undef
 $apiserver_crt = undef
 $apiserver_key = undef
+$apiserver_extra_arguments = []
 $ca_crt = undef
 $ca_key = undef
 $front_proxy_ca_crt = undef

spec/classes/config_spec.rb

@@ -49,6 +49,7 @@
       'apiserver_kubelet_client_key' => 'foo',
       'apiserver_crt' => 'foo',
       'apiserver_key' => 'foo',
+      'apiserver_extra_arguments' => ['--some-extra-arg=foo'],
       'kubernetes_fqdn' => 'kube.foo.dev',
       'ca_crt' => 'foo',
       'ca_key' => 'foo',
@@ -98,6 +99,13 @@
       it { should contain_file('/etc/kubernetes/secrets/bootstraptoken.yaml') }
       it { should contain_file('/root/admin.conf') }
       it { should contain_file('/etc/profile.d/kubectl.sh') }
+
+      # Check API server config
+      it {
+        should contain_file('/etc/kubernetes/manifests/kube-apiserver.yaml')
+                   .with_content(/^\s*- --experimental-bootstrap-token-auth=true$/) # with kubernetes_version = 1.7.x
+                   .with_content(/^\s*- --some-extra-arg=foo$/)
+      }
     end
 
   context 'with worker => true' do

templates/kube-apiserver.yaml.erb

@@ -35,6 +35,9 @@ spec:
     <% 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
+<% @apiserver_extra_arguments.each do |arg| -%>
+    - <%= arg %>
+<% end -%>
     image: gcr.io/google_containers/kube-apiserver-amd64:v<%= @kubernetes_version  %>
     livenessProbe:
       failureThreshold: 8