Manifest update

Cpu request setted to kubedns.
Critical pods flag added.
Minor version bump.

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

diff --git a/ansible/roles/kubedns/templates/kubedns-deployment.yml b/ansible/roles/kubedns/templates/kubedns-deployment.yml
index bd55989..f47cd09 100644 (file)
--- a/ansible/roles/kubedns/templates/kubedns-deployment.yml
+++ b/ansible/roles/kubedns/templates/kubedns-deployment.yml
@@ -35,6 +35,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
+      priorityClassName: "system-cluster-critical"
       hostNetwork: true
       nodeSelector:
         nodetype: caas_master
@@ -73,7 +74,7 @@ spec:
           limits:
             memory: 170Mi
           requests:
-            cpu: 100m
+            cpu: 10m
             memory: 70Mi
         livenessProbe:
           tcpSocket:
@@ -108,6 +109,10 @@ spec:
         - containerPort: 10055
           name: metrics
           protocol: TCP
+        resources:
+          requests:
+            cpu: 10m
+            memory: 70Mi
         volumeMounts:
         - name: time-mount
           mountPath: /etc/localtime

diff --git a/rpmbuild.spec b/rpmbuild.spec
index aee4dbc..3f256cc 100644 (file)
--- a/rpmbuild.spec
+++ b/rpmbuild.spec
@@ -15,7 +15,7 @@
 %define COMPONENT kubedns
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.15.4
-%define RPM_MINOR_VERSION 0
+%define RPM_MINOR_VERSION 1
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}