feat: 增加node-controller部署

charts/metersphere/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.12.0
+appVersion: 1.12.3
 description: A Helm chart to deploy MeterSphere
 engine: gotpl
 home: https://metersphere.io
@@ -15,4 +15,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   condition: kafka.enabled
   version: 11.3.1
-version: 1.0.0
+version: 1.0.1

charts/metersphere/templates/03-modules/metersphere-node-controller.yaml

@@ -0,0 +1,96 @@
+{{if .Values.nodeController.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: metersphere-node-controller
+spec:
+  replicas: {{.Values.nodeController.replicas | default 1}}
+  selector:
+    matchLabels:
+      app: metersphere-node-controller
+  template:
+    metadata:
+      labels:
+        app: metersphere-node-controller
+    spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - metersphere-node-controller
+              topologyKey: kubernetes.io/hostname
+      initContainers:
+        - name: wait-kafka
+          image: busybox:latest
+          imagePullPolicy: IfNotPresent
+          command:
+            - sh
+            - -c
+            - |
+              set -ex
+              until nc -zv {{ .Values.common.kafka.host }} {{ .Values.common.kafka.port }}; do sleep 5; done
+              sleep 10
+      containers:
+        - name: metersphere-node-controller
+          image: {{.Values.common.imagePrefix}}{{.Values.nodeController.image}}:{{.Values.common.imageTag}}
+          imagePullPolicy: {{.Values.common.imagePullPolicy}}
+          resources:
+            limits:
+              memory: 1Gi
+            requests:
+              memory: 300Mi
+              cpu: 0.1
+          ports:
+            - name: http
+              containerPort: 8084
+          volumeMounts:
+            - mountPath: /opt/metersphere/conf
+              name: opt-metersphere-config
+            - mountPath: /opt/metersphere/logs
+              name: metersphere-logs
+            - mountPath: /var/run 
+              name: docker-sock 
+      {{if ne (.Values.common.imagePullSecret | default "nil") "nil"}}
+      imagePullSecrets:
+        - name: {{.Values.common.imagePullSecret}}
+      {{ end }}
+      volumes:
+        - configMap:
+            defaultMode: 420
+            name: metersphere-config
+            items:
+            - key: node-controller.properties
+              path: metersphere.properties
+          name: opt-metersphere-config
+        - name: metersphere-logs
+          {{if .Values.logPersistence.enabled}}
+          persistentVolumeClaim:
+            claimName: metersphere-logs-pvc
+          {{ else }}
+          emptyDir: {}
+          {{ end }}
+        - name: docker-sock 
+          hostPath: 
+            path: /var/run 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: metersphere-node-controller
+  labels:
+    app: metersphere-node-controller
+spec:
+  sessionAffinity: ClientIP
+  selector:
+    app: metersphere-node-controller
+  ports:
+    - name: http
+      port: 8084
+      protocol: TCP
+{{end}}

charts/metersphere/values.yaml

@@ -9,7 +9,7 @@ common:
   imagePrefix: "registry.cn-qingdao.aliyuncs.com/metersphere/"
   imagePullSecrets: nil
   storageClass: vsan
-  imageTag: v1.12.0
+  imageTag: v1.12.3
   imagePullPolicy: Always
   mysql: 
     host: metersphere-mysql
@@ -70,9 +70,24 @@ dataStreaming:
     kafka.report.topic={{.Values.common.kafka.reportTopic}}
     jmeter.report.granularity=5000
 
+nodeController:
+  enabled: true
+  image: ms-node-controller
+  replicas: 1
+  properties: |-
+    ## KAFKA
+    kafka.partitions=1
+    kafka.replicas=1
+    kafka.topic={{.Values.common.kafka.metricTopic}}
+    kafka.bootstrap-servers={{.Values.common.kafka.host}}:{{.Values.common.kafka.port}}
+    kafka.log.topic={{.Values.common.kafka.logTopic}}
+    kafka.test.topic={{.Values.common.kafka.testTopic}}
+    kafka.report.topic={{.Values.common.kafka.reportTopic}}
+    jmeter.report.granularity=5000
+
 jmeter:
   image: jmeter-master
-  imageTag: 5.4.1-ms8-jdk8
+  imageTag: 5.4.1-ms10-jdk8
 
 logPersistence:
   enabled: false