From: Tobik, Balint <balint.tobik@nokia.com>
Date: Fri, 5 Jul 2019 12:50:41 +0000 (+0200)
Subject: cpu-setter-daemonset correction
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=fbf6b8894dead3b31dd798c8b29d33209184d587;p=ta%2Fcaas-install.git

cpu-setter-daemonset correction

Signed-off-by: Tobik, Balint <balint.tobik@nokia.com>
Change-Id: Ifb5f275face421fbdd559a4094c6498e0ee9e61a
---

diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec
index 8ff0562..b51e721 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 11
+%define RPM_MINOR_VERSION 12
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
diff --git a/infra-charts/templates/cpu-setter-daemonset.yaml b/infra-charts/templates/cpu-setter-daemonset.yaml
index fc19e8c..1a5ccd2 100644
--- a/infra-charts/templates/cpu-setter-daemonset.yaml
+++ b/infra-charts/templates/cpu-setter-daemonset.yaml
@@ -40,7 +40,7 @@ spec:
     spec:
       priorityClassName: "system-node-critical"
       containers:
-      - name: cpu-device-plugin
+      - name: cpu-setter
         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/" ]
@@ -53,7 +53,9 @@ spec:
            readOnly: true
          - mountPath: /etc/cpu-pooler
            name: cpu-pooler-config
-         - mountPath: /var/lib/kubelet/device-plugins/kubelet_internal_checkpoint
+         - mountPath: /sys/fs/cgroup/cpuset/kubepods/
+           name: kubepods
+         - mountPath: /var/lib/kubelet/device-plugins/
            name: checkpointfile
            readOnly: true
         env:
@@ -61,13 +63,18 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        securityContext:
+          privileged: true
       volumes:
       - name: time-mount
         hostPath:
           path: /etc/localtime
       - name: checkpointfile
         hostPath:
-         path: /var/lib/kubelet/device-plugins/kubelet_internal_checkpoint
+         path: /var/lib/kubelet/device-plugins/
+      - name: kubepods
+        hostPath:
+         path: /sys/fs/cgroup/cpuset/kubepods/
       - name: cpu-pooler-config
         configMap:
           name: cpu-pooler-configmap