Kubernetes version update

Kuberntets updated to 1.15.0
Eviction and system reserved settings now set.

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

diff --git a/ansible/roles/kubelet/templates/common-config.yaml.j2 b/ansible/roles/kubelet/templates/common-config.yaml.j2
index 7065aeb..b30e900 100644 (file)
--- a/ansible/roles/kubelet/templates/common-config.yaml.j2
+++ b/ansible/roles/kubelet/templates/common-config.yaml.j2
@@ -16,6 +16,14 @@ cgroupDriver: cgroupfs
 clusterDNS:
 - {{ caas.dns_svc_ip }}
 clusterDomain: {{ caas.dns_domain }}
+evictionHard:
+  memory.available: "{{ caas_hard_eviction_threshold }}"
+evictionMinimumReclaim:
+  memory.available: "512Mi"
+evictionSoft:
+  memory.available: "{{ caas_soft_eviction_threshold }}"
+evictionSoftGracePeriod:
+  memory.available: "30s"
 kubeReserved:
   cpu: "{{ kube_reserved_cpu }}"
 rotateCertificates: true
@@ -24,5 +32,6 @@ staticPodPath: "/etc/kubernetes/manifests"
 streamingConnectionIdleTimeout: 5m0s
 systemReserved:
   cpu: "{{ system_reserved_cpu }}"
+  memory: "{{ system_reserved_memory }}"
 tlsCertFile: "/etc/kubernetes/ssl/kubelet-server.pem"
 tlsPrivateKeyFile: "/etc/kubernetes/ssl/kubelet-server-key.pem"

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 4323fa5..853bcd7 100644 (file)
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -14,8 +14,8 @@
 
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.14.0
-%define RPM_MINOR_VERSION 3
+%define RPM_MAJOR_VERSION 1.15.0
+%define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1