Manifest update

Cpu request setted to chart-repo and tiller.
Critical pods flag added.
Minor version bump.

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

diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec
index 8e5c0ed..c412098 100644 (file)
--- a/SPECS/caas-chartrepo.spec
+++ b/SPECS/caas-chartrepo.spec
@@ -15,7 +15,7 @@
 %define COMPONENT chartrepo
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 4
+%define RPM_MINOR_VERSION 5
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save

diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index 83415a2..8c7afb8 100644 (file)
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -15,7 +15,7 @@
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.14.1
-%define RPM_MINOR_VERSION 0
+%define RPM_MINOR_VERSION 1
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define go_version 1.11.5
 %define cni_plugins_version 0.7.0

diff --git a/ansible/roles/chart_repo/templates/chart-repo.yml b/ansible/roles/chart_repo/templates/chart-repo.yml
index af4f5e8..aacf6b7 100644 (file)
--- a/ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/ansible/roles/chart_repo/templates/chart-repo.yml
@@ -36,6 +36,7 @@ spec:
       labels:
         {{ caas.kubernetes_component_label }}: chart-repo
     spec:
+      priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
         nodename: caas_master1
@@ -45,13 +46,9 @@ spec:
         - name: chart-repo-handler
           image: {{ container_image_names | select('search', '/chartrepo') | list | last }}
           imagePullPolicy: IfNotPresent
-          ## Limits equals requets to put the container into qualified QoS category
           resources:
-            limits:
-              cpu: "0.2"
-              memory: "128Mi"
             requests:
-              cpu: "0.2"
+              cpu: "10m"
               memory: "128Mi"
           command:
             - "/usr/bin/mainstart.sh"

diff --git a/ansible/roles/helm/templates/tiller.yml b/ansible/roles/helm/templates/tiller.yml
index e5641ff..36c55d8 100644 (file)
--- a/ansible/roles/helm/templates/tiller.yml
+++ b/ansible/roles/helm/templates/tiller.yml
@@ -36,6 +36,7 @@ spec:
       labels:
         {{ caas.kubernetes_component_label }}: tiller
     spec:
+      priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
         nodename: caas_master1
@@ -49,6 +50,9 @@ spec:
               value: "{{ caas.internal_flannel_interface }}"
             - name: TILLER_PORT
               value: "{{ caas.tiller_port }}"
+          resources:
+            requests:
+              cpu: "10m"
           volumeMounts:
             - name: time-mount
               mountPath: /etc/localtime