Merge pull request #228 from linkernetworks/phstsai/VX-254

[Task] VX-254: Pull resource setting out from yaml
linkernetworks · Aug 8, 2018 · fa87098 · fa87098
2 parents e682000 + 22a0837
commit fa87098
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 16 deletions.
diff --git a/deploy/helm/apps/charts/network-controller/templates/tcp-daemonset.yaml b/deploy/helm/apps/charts/network-controller/templates/tcp-daemonset.yaml
@@ -27,6 +27,9 @@ spec:
           name: docker-sock
         - mountPath: /var/run/openvswitch/
           name: ovs-data
+        resources:
+          requests:
+            cpu: {{ .Values.controller.tcpCPU }}
       volumes:
       - name: docker-sock
         hostPath:

diff --git a/deploy/helm/apps/charts/network-controller/templates/unix-daemonset.yaml b/deploy/helm/apps/charts/network-controller/templates/unix-daemonset.yaml
@@ -32,6 +32,9 @@ spec:
           name: ovs-sock
         - mountPath: /tmp/
           name: grpc-sock
+        resources:
+          requests:
+            cpu: {{ .Values.controller.unixCPU }}
       volumes:
       - name: docker-ns
         hostPath:

diff --git a/deploy/helm/apps/charts/prometheus/charts/cadvisor/templates/cadvisor.yaml b/deploy/helm/apps/charts/prometheus/charts/cadvisor/templates/cadvisor.yaml
@@ -39,6 +39,9 @@ spec:
           - --profiling
           - --housekeeping_interval={{ .Values.controller.housekeeping_interval }}
           - --disable_metrics=disk
+        resources:
+          requests:
+            cpu: {{ .Values.controller.cpu }}
       terminationGracePeriodSeconds: 30
       volumes:
       - name: rootfs

diff --git a/.../charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml b/.../charts/prometheus/charts/kube-state-metrics/templates/kube-state-metrics-deployment.yaml
@@ -30,8 +30,7 @@ spec:
         image: k8s.gcr.io/addon-resizer:1.7
         resources:
           requests:
-            cpu: 100m
-            memory: 30Mi
+            cpu: {{ .Values.controller.cpu }}
         env:
           - name: MY_POD_NAME
             valueFrom:

diff --git a/deploy/helm/apps/charts/prometheus/charts/node-exporter/templates/node-exporter.yaml b/deploy/helm/apps/charts/prometheus/charts/node-exporter/templates/node-exporter.yaml
@@ -47,5 +47,8 @@ spec:
           - --no-collector.wifi
           - --no-collector.xfs
           - --no-collector.zfs
+        resources:
+          requests:
+            cpu: {{ .Values.controller.cpu }}
       hostNetwork: true
 
diff --git a/deploy/helm/apps/charts/prometheus/templates/deployment.yaml b/deploy/helm/apps/charts/prometheus/templates/deployment.yaml
@@ -32,11 +32,7 @@ spec:
           name: config-volume
         resources:
           requests:
-            cpu: 100m
-            memory: 100Mi
-          limits:
-            cpu: 500m
-            memory: 2500Mi
+            cpu: {{ .Values.controller.cpu }}
       volumes:
       - emptyDir: {}
         name: data

diff --git a/...elm/apps/charts/vortex-server/.helmignore → deploy/helm/apps/charts/vortex/.helmignore b/...elm/apps/charts/vortex-server/.helmignore → deploy/helm/apps/charts/vortex/.helmignore
diff --git a/...helm/apps/charts/vortex-server/Chart.yaml → deploy/helm/apps/charts/vortex/Chart.yaml b/...helm/apps/charts/vortex-server/Chart.yaml → deploy/helm/apps/charts/vortex/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for vortex-server
-name: vortex-server
+name: vortex
 version: 0.1.0
diff --git a/...s/vortex-server/templates/deployment.yaml → ...s/charts/vortex/templates/deployment.yaml b/...s/vortex-server/templates/deployment.yaml → ...s/charts/vortex/templates/deployment.yaml
@@ -21,7 +21,13 @@ spec:
         image: sdnvortex/vortex-portal:{{ .Values.controller.webappImageTag }}
         ports:
         - containerPort: 8080
+        resources:
+          requests:
+            cpu: {{ .Values.controller.portalCPU }}
       - name: vortex-server
         image: sdnvortex/vortex:{{ .Values.controller.apiserverImageTag }}
         ports:
         - containerPort: 7890
+        resources:
+          requests:
+            cpu: {{ .Values.controller.serverCPU }}
diff --git a/...arts/vortex-server/templates/service.yaml → ...apps/charts/vortex/templates/service.yaml b/...arts/vortex-server/templates/service.yaml → ...apps/charts/vortex/templates/service.yaml
diff --git a/deploy/helm/config/development.yaml b/deploy/helm/config/development.yaml
@@ -1,7 +1,7 @@
 # vortex/deploy/helm/apps
 apps:
   # vortex/deploy/helm/apps/charts/vortex-server
-  vortex-server:
+  vortex:
     controller:
       replicaCount: 1
       nodeSelector:
@@ -10,6 +10,8 @@ apps:
     controller:
       apiserverImageTag: v0.1.10
       webappImageTag: v0.1.0
+      portalCPU: 50m
+      serverCPU: 100m
     service:
       ports:
         apiserverNodePort: 32326
@@ -18,36 +20,42 @@ apps:
   network-controller:
     controller:
       imageTag: v0.4.0
+      tcpCPU: 50m
+      unixCPU: 50m
   # vortex/deploy/helm/apps/charts/prometheus
   prometheus:
     controller:
       replicaCount: 1
       imageTag: v2.2.1
       scrapeInterval: 5s
       retention: 1h
+      cpu: 50m
     service:
       nodePort: true
     # vortex/deploy/helm/apps/charts/prometheus/charts/cadvisor
     cadvisor:
       controller:
         imageTag: v0.27.4
         housekeeping_interval: 10s
+        cpu: 100m
     # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics
     kube-state-metrics:
       controller:
         imageTag: v1.3.1
+        cpu: 50m
     # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter
     node-exporter:
       controller:
         imageTag: v1.0.1
+        cpu: 50m
 
 # vortex/deploy/helm/services
 services:
   # vortex/deploy/helm/services/charts/mongodb
   mongodb:
     controller:
       replicaCount: 1
-      cpu: 100m
+      cpu: 50m
       image:
         tag: 4.1.1-xenial
       pvc:

diff --git a/deploy/helm/config/productaion.yaml b/deploy/helm/config/productaion.yaml
@@ -1,7 +1,7 @@
 # vortex/deploy/helm/apps
 apps:
-  # vortex/deploy/helm/apps/charts/vortex-server
-  vortex-server:
+  # vortex/deploy/helm/apps/charts/vortex
+  vortex:
     controller:
       replicaCount: 1
       nodeSelector:
@@ -10,6 +10,8 @@ apps:
     controller:
       apiserverImageTag: v0.1.10
       webappImageTag: v0.1.0
+      portalCPU: 200m
+      serverCPU: 100m
     service:
       ports:
         apiserverNodePort: 32326
@@ -18,36 +20,42 @@ apps:
   network-controller:
     controller:
       imageTag: v0.4.0
+      tcpCPU: 100m
+      unixCPU: 100m
   # vortex/deploy/helm/apps/charts/prometheus
   prometheus:
     controller:
       replicaCount: 1
       imageTag: v2.2.1
       scrapeInterval: 5s
       retention: 1h
+      cpu: 100m
     service:
       nodePort: false
     # vortex/deploy/helm/apps/charts/prometheus/charts/cadvisor
     cadvisor:
       controller:
         imageTag: v0.27.4
         housekeeping_interval: 10s
+        cpu: 200m
     # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics
     kube-state-metrics:
       controller:
         imageTag: v1.3.1
+        cpu: 100m
     # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter
     node-exporter:
       controller:
         imageTag: v1.0.1
+        cpu: 100m
 
 # vortex/deploy/helm/services
 services:
   # vortex/deploy/helm/services/charts/mongodb
   mongodb:
     controller:
       replicaCount: 1
-      cpu: 100m
+      cpu: 200m
       image:
         tag: 4.1.1-xenial
       pvc:

diff --git a/deploy/helm/config/testing.yaml b/deploy/helm/config/testing.yaml
@@ -1,7 +1,7 @@
 # vortex/deploy/helm/apps
 apps:
-  # vortex/deploy/helm/apps/charts/vortex-server
-  vortex-server:
+  # vortex/deploy/helm/apps/charts/vortex
+  vortex:
     controller:
       replicaCount: 1
       nodeSelector:
@@ -10,6 +10,8 @@ apps:
     controller:
       apiserverImageTag: v0.1.10
       webappImageTag: v0.1.0
+      portalCPU: 50m
+      serverCPU: 100m
     service:
       ports:
         apiserverNodePort: 32326
@@ -18,36 +20,42 @@ apps:
   network-controller:
     controller:
       imageTag: v0.4.0
+      tcpCPU: 50m
+      unixCPU: 50m
   # vortex/deploy/helm/apps/charts/prometheus
   prometheus:
     controller:
       replicaCount: 1
       imageTag: v2.2.1
       scrapeInterval: 5s
       retention: 1h
+      cpu: 50m
     service:
       nodePort: true
     # vortex/deploy/helm/apps/charts/prometheus/charts/cadvisor
     cadvisor:
       controller:
         imageTag: v0.27.4
         housekeeping_interval: 10s
+        cpu: 100m
     # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics
     kube-state-metrics:
       controller:
         imageTag: v1.3.1
+        cpu: 20m
     # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter
     node-exporter:
       controller:
         imageTag: v1.0.1
+        cpu: 20m
 
 # vortex/deploy/helm/services
 services:
   # vortex/deploy/helm/services/charts/mongodb
   mongodb:
     controller:
       replicaCount: 1
-      cpu: 100m
+      cpu: 50m
       image:
         tag: 4.1.1-xenial
       pvc:

diff --git a/deploy/helm/services/charts/mongodb/templates/statefulset.yaml b/deploy/helm/services/charts/mongodb/templates/statefulset.yaml
@@ -28,6 +28,9 @@ spec:
           volumeMounts:
             - name: mongodb
               mountPath: /data/db
+          resources:
+            requests:
+              cpu: {{ .Values.controller.cpu }}
   volumeClaimTemplates:
   - metadata:
       name: mongodb