From: Szekeres, Balazs (Nokia - HU/Budapest) Date: Thu, 27 Jun 2019 11:54:46 +0000 (+0200) Subject: Manifest update X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=commitdiff_plain;h=d24b652b4823c54bba217a60264185e6102c2552 Manifest update Cpu request setted to flannel. Critical pods flag added. Minor version bump. Change-Id: Ia0e971ad235e10b9d8c85b251f00c12fbf293775 Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) --- diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec index 4df97b1..1414896 100644 --- a/SPECS/caas-flannel.spec +++ b/SPECS/caas-flannel.spec @@ -15,7 +15,7 @@ %define COMPONENT flannel %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.11.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/ansible/roles/flannel/templates/flannel-ds.yaml b/ansible/roles/flannel/templates/flannel-ds.yaml index 41e78a2..117f9cf 100644 --- a/ansible/roles/flannel/templates/flannel-ds.yaml +++ b/ansible/roles/flannel/templates/flannel-ds.yaml @@ -32,6 +32,7 @@ spec: tier: node {{ caas.kubernetes_component_label }}: flannel spec: + priorityClassName: "system-node-critical" hostNetwork: true dnsPolicy: ClusterFirstWithHostNet # TODO: figure out why flannel needs to run with root to modify network settings on the host @@ -62,6 +63,9 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime