pod limits for apiserver are too low

azalio · Feb 2, 2017 · cad1768 · cad1768
1 parent 18a16fa
commit cad1768
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/manifests/master/apiserver.pp b/manifests/master/apiserver.pp
@@ -505,7 +505,7 @@
       docker::run { 'kube-apiserver':
         ensure           => $ensure_container,
         image            => $container_image,
-        command          => "/hyperkube apiserver ${args}",
+        command          => '/hyperkube apiserver ${args}',
         volumes          => ['/etc/pki:/etc/pki', '/etc/ssl:/etc/ssl', '/etc/kubernetes:/etc/kubernetes',],
         restart_service  => true,
         net              => 'host',

diff --git a/manifests/master/controller_manager.pp b/manifests/master/controller_manager.pp
@@ -472,7 +472,7 @@
       docker::run { 'kube-controller-manager':
         ensure           => $ensure_container,
         image            => $container_image,
-        command          => "/hyperkube controller-manager ${args}",
+        command          => '/hyperkube controller-manager ${args}',
         volumes          => ['/etc/pki:/etc/pki', '/etc/ssl:/etc/ssl', '/etc/kubernetes:/etc/kubernetes',],
         restart_service  => true,
         net              => 'host',

diff --git a/manifests/master/params.pp b/manifests/master/params.pp
@@ -4,7 +4,7 @@
   # api server config
   $kube_api_manage_as = 'service'
   $kube_api_container_image = 'gcr.io/google_containers/hyperkube-amd64:v1.4.0'
-  $kube_api_pod_cpu = '100m'
+  $kube_api_pod_cpu = '300m'
   $kube_api_pod_memory = '700Mi'
   $kube_api_service_ensure = running
   $kube_api_journald_forward_enable = false

diff --git a/manifests/master/scheduler.pp b/manifests/master/scheduler.pp
@@ -231,7 +231,7 @@
       docker::run { 'kube-scheduler':
         ensure           => $ensure_container,
         image            => $container_image,
-        command          => "/hyperkube scheduler ${args}",
+        command          => '/hyperkube scheduler ${args}',
         volumes          => ['/etc/pki:/etc/pki', '/etc/ssl:/etc/ssl', '/etc/kubernetes:/etc/kubernetes',],
         restart_service  => true,
         net              => 'host',

diff --git a/manifests/node/kube_proxy.pp b/manifests/node/kube_proxy.pp
@@ -261,7 +261,7 @@
       docker::run { 'kube-proxy':
         ensure           => $ensure_container,
         image            => $container_image,
-        command          => "/hyperkube proxy ${args}",
+        command          => '/hyperkube proxy ${args}',
         volumes          => ['/etc/pki:/etc/pki', '/etc/ssl:/etc/ssl', '/etc/kubernetes:/etc/kubernetes',],
         restart_service  => true,
         net              => 'host',

diff --git a/templates/pods/pod_kube-apiserver.yml.erb b/templates/pods/pod_kube-apiserver.yml.erb
@@ -26,13 +26,6 @@ spec:
         port: <%= @insecure_port %>
       initialDelaySeconds: 30
       timeoutSeconds: 3
-    ports:
-    - containerPort: <%= @secure_port %>
-      hostPort: <%= @secure_port %>
-      name: https
-    - containerPort: <%= @insecure_port %>
-      hostPort: <%= @insecure_port %>
-      name: local
     volumeMounts:
     - mountPath: /etc/pki
       name: etcpki