From: Szekeres, Balazs (Nokia - HU/Budapest) Date: Thu, 27 Jun 2019 12:01:45 +0000 (+0200) Subject: Manifest update X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=712d966c95d2ed5fc259f5dcf5220c7d305dab61;p=ta%2Fcaas-install.git Manifest update Cpu request setted. Critical pods flag added. Minor version bump in infra-chart. Change-Id: Ib1f0a9a7a29e800f144260777d7c343404e71afc Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) --- diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec index 04ea249..e90bbc1 100644 --- a/SPECS/infra-charts.spec +++ b/SPECS/infra-charts.spec @@ -15,7 +15,7 @@ %define COMPONENT infra-charts %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 8 +%define RPM_MINOR_VERSION 9 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} diff --git a/infra-charts/templates/cpu-deviceplugin-daemonset.yaml b/infra-charts/templates/cpu-deviceplugin-daemonset.yaml index 865c3f4..b939620 100644 --- a/infra-charts/templates/cpu-deviceplugin-daemonset.yaml +++ b/infra-charts/templates/cpu-deviceplugin-daemonset.yaml @@ -38,11 +38,15 @@ spec: labels: {{ .Values.kubernetes_component_label }}: cpu-device-plugin spec: + priorityClassName: "system-node-critical" containers: - name: cpu-device-plugin image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/cpupooler:{{ .Values.cpupooler.container_version }} imagePullPolicy: IfNotPresent command: [ "/cpu-device-plugin", "-logtostderr" ] + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/cpu-setter-daemonset.yaml b/infra-charts/templates/cpu-setter-daemonset.yaml index 102a3e8..fc19e8c 100644 --- a/infra-charts/templates/cpu-setter-daemonset.yaml +++ b/infra-charts/templates/cpu-setter-daemonset.yaml @@ -38,11 +38,15 @@ spec: labels: {{ .Values.kubernetes_component_label }}: cpu-setter spec: + priorityClassName: "system-node-critical" containers: - name: cpu-device-plugin image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/cpupooler:{{ .Values.cpupooler.container_version }} imagePullPolicy: IfNotPresent command: [ "/cpu-setter", "--poolconfigs=/etc/cpu-pooler", "--cpusetroot=/sys/fs/cgroup/cpuset/kubepods/" ] + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/custom-metrics-apiserver-deployment.yaml b/infra-charts/templates/custom-metrics-apiserver-deployment.yaml index c45db1e..d948503 100755 --- a/infra-charts/templates/custom-metrics-apiserver-deployment.yaml +++ b/infra-charts/templates/custom-metrics-apiserver-deployment.yaml @@ -40,6 +40,7 @@ spec: } ] spec: + priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master serviceAccountName: custom-metrics-apiserver @@ -59,6 +60,9 @@ spec: - --config=/etc/adapter/config.yaml ports: - containerPort: {{ .Values.custom_metrics_api.port }} + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/elasticsearch-data-statefulset.yaml b/infra-charts/templates/elasticsearch-data-statefulset.yaml index d49aa3e..c74bf34 100644 --- a/infra-charts/templates/elasticsearch-data-statefulset.yaml +++ b/infra-charts/templates/elasticsearch-data-statefulset.yaml @@ -39,6 +39,7 @@ spec: } ] spec: + priorityClassName: "system-cluster-critical" affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -84,6 +85,7 @@ spec: cpu: "{{ .Values.elasticsearch.cpu_limit }}" memory: "{{ .Values.elasticsearch.memory_limit }}" requests: + cpu: "100m" memory: "{{ .Values.elasticsearch.memory_request }}" readinessProbe: tcpSocket: diff --git a/infra-charts/templates/elasticsearch-master-statefulset.yaml b/infra-charts/templates/elasticsearch-master-statefulset.yaml index d384405..373714c 100644 --- a/infra-charts/templates/elasticsearch-master-statefulset.yaml +++ b/infra-charts/templates/elasticsearch-master-statefulset.yaml @@ -39,6 +39,7 @@ spec: } ] spec: + priorityClassName: "system-cluster-critical" affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -76,6 +77,7 @@ spec: limits: memory: "{{ .Values.elasticsearch.memory_limit }}" requests: + cpu: "100m" memory: "{{ .Values.elasticsearch.memory_request }}" readinessProbe: httpGet: diff --git a/infra-charts/templates/metrics-server-deployment.yaml b/infra-charts/templates/metrics-server-deployment.yaml index f96a75d..91f8197 100755 --- a/infra-charts/templates/metrics-server-deployment.yaml +++ b/infra-charts/templates/metrics-server-deployment.yaml @@ -39,6 +39,7 @@ spec: labels: {{ .Values.kubernetes_component_label }}: metrics-server spec: + priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master serviceAccountName: metrics-apiserver @@ -50,6 +51,9 @@ spec: - "--logtostderr" - "--tls-cert-file=/etc/metrics-server/ssl/metrics-server.crt" - "--tls-private-key-file=/etc/metrics-server/ssl/metrics-server.key" + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/netwatcher.yaml b/infra-charts/templates/netwatcher.yaml index 267303e..1299c3e 100644 --- a/infra-charts/templates/netwatcher.yaml +++ b/infra-charts/templates/netwatcher.yaml @@ -28,6 +28,7 @@ spec: labels: {{ .Values.kubernetes_component_label }}: netwatcher spec: + priorityClassName: "system-node-critical" hostNetwork: true dnsPolicy: ClusterFirstWithHostNet containers: @@ -40,6 +41,9 @@ spec: - SYS_ADMIN - NET_ADMIN - NET_RAW + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/prometheus-dep.yaml b/infra-charts/templates/prometheus-dep.yaml index 8bce4ba..cedae67 100644 --- a/infra-charts/templates/prometheus-dep.yaml +++ b/infra-charts/templates/prometheus-dep.yaml @@ -38,6 +38,7 @@ spec: } ] spec: + priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master serviceAccountName: prometheus @@ -55,6 +56,8 @@ spec: resources: limits: memory: 2Gi + requests: + cpu: "30m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/sriovdp-ds.yaml b/infra-charts/templates/sriovdp-ds.yaml index bba35dc..efe37a0 100644 --- a/infra-charts/templates/sriovdp-ds.yaml +++ b/infra-charts/templates/sriovdp-ds.yaml @@ -38,6 +38,7 @@ spec: labels: name: sriovdp spec: + priorityClassName: "system-node-critical" nodeSelector: sriov: enabled containers: @@ -47,6 +48,9 @@ spec: - "-logtostderr" - "-v=10" - "-resource-prefix=nokia.k8s.io" + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/svcwatcher.yaml b/infra-charts/templates/svcwatcher.yaml index 1aec022..95b18ec 100644 --- a/infra-charts/templates/svcwatcher.yaml +++ b/infra-charts/templates/svcwatcher.yaml @@ -36,6 +36,7 @@ spec: labels: {{ .Values.kubernetes_component_label }}: svcwatcher spec: + priorityClassName: "system-cluster-critical" dnsPolicy: ClusterFirst nodeSelector: nodetype: caas_master @@ -44,6 +45,9 @@ spec: image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/svcwatcher:{{ .Values.svcwatcher.container_version }} args: - "--logtostderr" + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime diff --git a/infra-charts/templates/webhook-deployment.yaml b/infra-charts/templates/webhook-deployment.yaml index d98ec63..9a3f0f3 100644 --- a/infra-charts/templates/webhook-deployment.yaml +++ b/infra-charts/templates/webhook-deployment.yaml @@ -39,6 +39,7 @@ spec: labels: {{ .Values.kubernetes_component_label }}: cpu-dev-pod-mutator spec: + priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master containers: @@ -46,6 +47,9 @@ spec: image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/cpupooler:{{ .Values.cpupooler.container_version }} command: [ "/cpu-device-webhook", "-tls-cert-file=/etc/webhook/certs/cpuwebhook.crt", "-tls-private-key-file=/etc/webhook/certs/cpuwebhook.key", "-alsologtostderr", "-v=4" ] imagePullPolicy: IfNotPresent + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime