Merge pull request #218 from linkernetworks/phstsai/VX-244

[Task] VX-244: Organize the helm folder
linkernetworks · Aug 3, 2018 · 827e610 · 827e610
2 parents ba4183f + ab133e8
commit 827e610
Show file tree

Hide file tree

Showing 44 changed files with 270 additions and 193 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,8 @@ notifications:
 
 before_install:
     - go get -u github.com/kardianos/govendor
-    - sudo apt-get install -y socat openvswitch-switch
+    - sudo apt-get install -y socat openvswitch-switch jq
+    - sudo pip install yq
     - curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
     - curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
     - curl -L https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz > helm-v2.9.1-linux-amd64.tar.gz && tar -zxvf helm-v2.9.1-linux-amd64.tar.gz && chmod +x linux-amd64/helm && sudo mv linux-amd64/helm /usr/local/bin/helm
@@ -64,7 +65,7 @@ jobs:
       install:
           - sudo add-apt-repository ppa:duggan/bats --yes 
           - sudo apt-get update -q
-          - sudo apt-get install -qqy jq httpie bats
+          - sudo apt-get install -qqy httpie bats
       script:
         - make build
         - sudo make src.test-bats
diff --git a/Makefile b/Makefile
@@ -109,14 +109,13 @@ apps.init-helm:
 
 .PHONY: apps.launch
 apps.launch:
-	helm install --name vortex-foundation --debug --wait --set global.environment=local deploy/helm/foundation
-	helm install --name vortex-apps --debug --wait --set global.environment=local --set vortex-server.image.tag=$(SERVER_VERSION)  deploy/helm/apps/
-
+	yq -y .services deploy/helm/config/development.yaml | helm install --name vortex-services --debug --wait -f - deploy/helm/services
+	yq -y .apps deploy/helm/config/development.yaml | helm install --name vortex-apps --debug --wait -f - --set vortex-server.controller.apiserverImageTag=$(SERVER_VERSION) deploy/helm/apps
 
 .PHONY: apps.upgrade
 apps.upgrade:
-	helm upgrade vortex-foundation --debug --wait --set global.environment=local deploy/helm/foundation
-	helm upgrade vortex-apps --debug --wait --set global.environment=local deploy/helm/apps/
+	yq -y .services deploy/helm/config/development.yaml | helm upgrade vortex-services --debug -f - deploy/helm/services
+	yq -y .apps deploy/helm/config/development.yaml | helm  upgrade vortex-apps --debug -f - --set vortex-server.controller.apiserverImageTag=$(SERVER_VERSION) deploy/helm/apps
 
 .PHONY: apps.teardown
 apps.teardown:

diff --git a/deploy/helm/apps/charts/network-controller/templates/tcp-daemonset.yaml b/deploy/helm/apps/charts/network-controller/templates/tcp-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: network-controller-server-tcp
-        image: sdnvortex/network-controller:{{ .Values.image.tag }}
+        image: sdnvortex/network-controller:{{ .Values.controller.imageTag }}
         securityContext:
           privileged: true
         command: ["/go/bin/server"]

diff --git a/deploy/helm/apps/charts/network-controller/templates/unix-daemonset.yaml b/deploy/helm/apps/charts/network-controller/templates/unix-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: network-controller-server-unix
-        image: sdnvortex/network-controller:{{ .Values.image.tag }}
+        image: sdnvortex/network-controller:{{ .Values.controller.imageTag }}
         securityContext:
           privileged: true
         command: ["/go/bin/server"]

diff --git a/deploy/helm/apps/charts/network-controller/values.yaml b/deploy/helm/apps/charts/network-controller/values.yaml
diff --git a/deploy/helm/apps/charts/prometheus/charts/cadvisor/templates/cadvisor.yaml b/deploy/helm/apps/charts/prometheus/charts/cadvisor/templates/cadvisor.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: prometheus
       containers:
       - name: cadvisor
-        image: google/cadvisor:latest
+        image: google/cadvisor:{{ .Values.controller.imageTag }}
         volumeMounts:
         - name: rootfs
           mountPath: /rootfs
@@ -37,7 +37,7 @@ spec:
             protocol: TCP
         args:
           - --profiling
-          - --housekeeping_interval={{ .Values.config.housekeeping_interval }}
+          - --housekeeping_interval={{ .Values.controller.housekeeping_interval }}
           - --disable_metrics=disk
       terminationGracePeriodSeconds: 30
       volumes:

diff --git a/deploy/helm/apps/charts/prometheus/charts/cadvisor/values.yaml b/deploy/helm/apps/charts/prometheus/charts/cadvisor/values.yaml
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
@@ -1,6 +1,4 @@
 apiVersion: apps/v1
-# Kubernetes versions after 1.9.0 should use apps/v1
-# Kubernetes versions before 1.8.0 should use apps/v1beta1 or extensions/v1beta1
 kind: Deployment
 metadata:
   name: kube-state-metrics
@@ -18,7 +16,7 @@ spec:
       serviceAccountName: prometheus
       containers:
       - name: kube-state-metrics
-        image: quay.io/coreos/kube-state-metrics:{{ .Values.image.tag }}
+        image: quay.io/coreos/kube-state-metrics:{{ .Values.controller.imageTag }}
         ports:
         - name: http-metrics
           containerPort: 8080
@@ -31,9 +29,6 @@ spec:
       - name: addon-resizer
         image: k8s.gcr.io/addon-resizer:1.7
         resources:
-          limits:
-            cpu: 100m
-            memory: 30Mi
           requests:
             cpu: 100m
             memory: 30Mi

diff --git a/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics/values.yaml b/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics/values.yaml
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
@@ -16,7 +16,7 @@ spec:
       serviceAccountName: prometheus
       containers:
       - name:  node-exporter
-        image: sdnvortex/node-exporter:{{ .Values.image.tag }}
+        image: sdnvortex/node-exporter:{{ .Values.controller.imageTag }}
         ports:
           - name: http-metrics
             containerPort: 9100

diff --git a/deploy/helm/apps/charts/prometheus/charts/node-exporter/values.yaml b/deploy/helm/apps/charts/prometheus/charts/node-exporter/values.yaml
diff --git a/deploy/helm/apps/charts/prometheus/templates/config.yaml b/deploy/helm/apps/charts/prometheus/templates/config.yaml
@@ -7,7 +7,7 @@ data:
   # https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml
   prometheus.yml: |
     global:
-      scrape_interval: {{ .Values.config.scrapeInterval }}
+      scrape_interval: {{ .Values.controller.scrapeInterval }}
       scrape_timeout: 5s
     scrape_configs:
 

diff --git a/deploy/helm/apps/charts/prometheus/templates/deployment.yaml b/deploy/helm/apps/charts/prometheus/templates/deployment.yaml
@@ -6,24 +6,24 @@ metadata:
   name: prometheus
   namespace: vortex
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.controller.replicaCount }}
   template:
     metadata:
       labels:
         app: prometheus
     spec:
       serviceAccountName: prometheus
       containers:
-      - image: prom/prometheus:v2.2.1
+      - image: prom/prometheus:{{ .Values.controller.imageTag }}
         name: prometheus
         command:
         - "/bin/prometheus"
         args:
         - "--config.file=/etc/prometheus/prometheus.yml"
         - "--storage.tsdb.path=/prometheus"
-        - "--storage.tsdb.retention=24h"
+        - "--storage.tsdb.retention={{ .Values.controller.retention }}"
         ports:
-        - containerPort: {{ .Values.service.ports.targetPort }}
+        - containerPort: 9090
           protocol: TCP
         volumeMounts:
         - mountPath: "/prometheus"

diff --git a/deploy/helm/apps/charts/prometheus/templates/service.yaml b/deploy/helm/apps/charts/prometheus/templates/service.yaml
@@ -6,17 +6,17 @@ metadata:
   name: prometheus
   namespace: vortex
 spec:
-  {{ if eq .Values.global.environment "develop" }}
-  type: ClusterIP
-  ports:
-  - port: {{ .Values.service.ports.port }}
-    targetPort: {{ .Values.service.ports.targetPort }}
-  {{ else if or (eq .Values.global.environment "local") (eq .Values.global.environment "testing") }}
+  selector:
+    app: prometheus
+  {{- if .Values.service.nodePort }}
   type: NodePort
   ports:
-  - port: {{ .Values.service.ports.port }}
-    targetPort: {{ .Values.service.ports.targetPort }}
-    nodePort: {{ .Values.service.ports.nodePort }}
-  {{ end }}
-  selector:
-    app: prometheus
+  - port: 9090
+    targetPort: 9090
+    nodePort: 30003
+  {{- else }}
+  type: ClusterIP
+  ports:
+  - port: 9090
+    targetPort: 9090
+  {{- end }}
diff --git a/deploy/helm/apps/charts/prometheus/values.yaml b/deploy/helm/apps/charts/prometheus/values.yaml
diff --git a/deploy/helm/apps/charts/vortex-server/templates/deployment.yaml b/deploy/helm/apps/charts/vortex-server/templates/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: vortex-server
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.controller.replicaCount }}
   selector:
     matchLabels:
       app: vortex-server
@@ -18,10 +18,10 @@ spec:
       serviceAccountName: vortex-admin
       containers:
       - name: vortex-webapp
-        image: sdnvortex/vortex-portal:{{ .Values.image.webappTag }}
+        image: sdnvortex/vortex-portal:{{ .Values.controller.webappImageTag }}
         ports:
         - containerPort: 8080
       - name: vortex-server
-        image: sdnvortex/vortex:{{ .Values.image.apiserverTag }}
+        image: sdnvortex/vortex:{{ .Values.controller.apiserverImageTag }}
         ports:
         - containerPort: 7890
diff --git a/deploy/helm/apps/charts/vortex-server/templates/service.yaml b/deploy/helm/apps/charts/vortex-server/templates/service.yaml
@@ -10,13 +10,13 @@ spec:
   ports:
     - name: apiserver
       protocol: TCP
-      port: {{ .Values.service.ports.apiserverPort }}
-      targetPort: {{ .Values.service.ports.apiserverTargetPort }}
+      port: 7890
+      targetPort: 7890
       nodePort: {{ .Values.service.ports.apiserverNodePort }}
     - name: webapp
       protocol: TCP
-      port: {{ .Values.service.ports.webappPort }}
-      targetPort: {{ .Values.service.ports.webappTargetPort }}
+      port: 8080
+      targetPort: 8080
       nodePort: {{ .Values.service.ports.webappNodePort }}
   selector:
     app: vortex-server
diff --git a/deploy/helm/apps/charts/vortex-server/values.yaml b/deploy/helm/apps/charts/vortex-server/values.yaml
diff --git a/deploy/helm/apps/values.yaml b/deploy/helm/apps/values.yaml
diff --git a/deploy/helm/config/development.yaml b/deploy/helm/config/development.yaml
@@ -0,0 +1,61 @@
+# vortex/deploy/helm/apps
+apps:
+  # vortex/deploy/helm/apps/charts/vortex-server
+  vortex-server:
+    controller:
+      replicaCount: 1
+      nodeSelector:
+        glusterfs: false
+    replicaCount: 1
+    controller:
+      apiserverImageTag: v0.1.7
+      webappImageTag: v0.1.0
+    service:
+      ports:
+        apiserverNodePort: 32326
+        webappNodePort: 32767
+  # vortex/deploy/helm/apps/charts/network-controller
+  network-controller:
+    controller:
+      imageTag: v0.4.0
+  # vortex/deploy/helm/apps/charts/prometheus
+  prometheus:
+    controller:
+      replicaCount: 1
+      imageTag: v2.2.1
+      scrapeInterval: 5s
+      retention: 1h
+    service:
+      nodePort: true
+    # vortex/deploy/helm/apps/charts/prometheus/charts/cadvisor
+    cadvisor:
+      controller:
+        imageTag: v0.27.4
+        housekeeping_interval: 10s
+    # vortex/deploy/helm/apps/charts/prometheus/charts/kube-state-metrics
+    kube-state-metrics:
+      controller:
+        imageTag: v1.3.1
+    # vortex/deploy/helm/apps/charts/prometheus/charts/node-exporter
+    node-exporter:
+      controller:
+        imageTag: v1.0.1
+
+# vortex/deploy/helm/services
+services:
+  # vortex/deploy/helm/services/charts/mongodb
+  mongodb:
+    controller:
+      replicaCount: 1
+      cpu: 100m
+      image:
+        tag: 4.1.1-xenial
+      pvc:
+        localVolume: true
+        reclaimPolicy: Delete
+        accessModes: ReadWriteOnce
+        storageClass: mongo
+        storage: 1Gi
+    service:
+      nodePort: true
+