Manifest update

Cpu request setted to kubernetes.
Minor version bump.

Change-Id: I9b6c3da0c45c31102cc642cc8395c4e441ede6a1
Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) <balazs.szekeres@nokia.com>

diff --git a/ansible/roles/kube_master/templates/apiserver.yml b/ansible/roles/kube_master/templates/apiserver.yml
index 69a9bda..5390c5b 100644 (file)
--- a/ansible/roles/kube_master/templates/apiserver.yml
+++ b/ansible/roles/kube_master/templates/apiserver.yml
@@ -29,6 +29,9 @@ spec:
       command:
         - "/kube-apiserver"
         {{ apiserver_params | to_nice_yaml | indent(8) }}
+      resources:
+        requests:
+          cpu: "50m"
       volumeMounts:
         - name: time-mount
           mountPath: /etc/localtime

diff --git a/ansible/roles/kube_master/templates/cm.yml b/ansible/roles/kube_master/templates/cm.yml
index 27d6f26..7950af2 100644 (file)
--- a/ansible/roles/kube_master/templates/cm.yml
+++ b/ansible/roles/kube_master/templates/cm.yml
@@ -47,6 +47,9 @@ spec:
           port: 10252
         initialDelaySeconds: 15
         timeoutSeconds: 1
+      resources:
+        requests:
+          cpu: "10m"
       volumeMounts:
         - name: time-mount
           mountPath: /etc/localtime

diff --git a/ansible/roles/kube_master/templates/scheduler.yml b/ansible/roles/kube_master/templates/scheduler.yml
index f8a9434..7bc92d4 100644 (file)
--- a/ansible/roles/kube_master/templates/scheduler.yml
+++ b/ansible/roles/kube_master/templates/scheduler.yml
@@ -41,6 +41,9 @@ spec:
           port: 10251
           initialDelaySeconds: 15
           timeoutSeconds: 1
+      resources:
+        requests:
+          cpu: "10m"
       volumeMounts:
         - name: time-mount
           mountPath: /etc/localtime

diff --git a/ansible/roles/kube_proxy/templates/kube-proxy.yml b/ansible/roles/kube_proxy/templates/kube-proxy.yml
index 14ccd3f..0a5f033 100644 (file)
--- a/ansible/roles/kube_proxy/templates/kube-proxy.yml
+++ b/ansible/roles/kube_proxy/templates/kube-proxy.yml
@@ -31,6 +31,9 @@ spec:
         - "--kubeconfig=/etc/kubernetes/kubeconfig/proxyc.yml"
         - "--hostname-override={{ ansible_host }}"
         - "--masquerade-all=true"
+      resources:
+        requests:
+          cpu: "10m"
       volumeMounts:
         - name: time-mount
           mountPath: /etc/localtime

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 95e2062..ce9df55 100644 (file)
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -15,7 +15,7 @@
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.15.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1