build: v3.3.0 chart

metersphere · Sep 27, 2024 · 2901ee9 · 2901ee9
1 parent e26ffbf
commit 2901ee9
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 51 deletions.
diff --git a/charts/metersphere/Chart.yaml b/charts/metersphere/Chart.yaml
@@ -1,18 +1,18 @@
 apiVersion: v2
-appVersion: 3.0.0-beta
+appVersion: 3.3.0
 description: A Helm chart to deploy MeterSphere
 engine: gotpl
 home: https://metersphere.io
 icon: https://metersphere.io/images/logo/favicon.ico
 maintainers:
 - email: [email protected]
   name: metersphere
-name: metersphere
+name: metersphere3
 sources:
 - https://github.com/metersphere/
 dependencies:
 - name: kafka
   repository: https://charts.bitnami.com/bitnami
   condition: kafka.enabled
   version: 26.0.0
-version: 3.0.0-beta
+version: 3.3.0
diff --git a/charts/metersphere/templates/02-pvc/data.yaml b/charts/metersphere/templates/02-pvc/data.yaml
@@ -10,7 +10,7 @@ spec:
     requests:
       storage: {{.Values.dataPersistence.size}}
   storageClassName: {{.Values.common.storageClass}}
-{{if .Values.nodeController.enabled }}
+{{if .Values.taskRunner.enabled }}
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1

diff --git a/charts/metersphere/templates/03-modules/metersphere.yaml b/charts/metersphere/templates/03-modules/metersphere.yaml
@@ -1,10 +1,10 @@
-{{if .Values.apiTest.enabled }}
+{{if .Values.metersphere.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: metersphere
 spec:
-  replicas: {{.Values.apiTest.replicas | default 1}}
+  replicas: {{.Values.metersphere.replicas | default 1}}
   selector:
     matchLabels:
       app: metersphere
@@ -69,21 +69,11 @@ spec:
                 echo "Kafka bootstrap $i is OK now."
                 sleep 5
               done
-        - name: wait-system-setting
-          image: busybox:latest
-          imagePullPolicy: IfNotPresent
-          command:
-            - sh
-            - -c
-            - |
-              set -ex
-              until nc -zv metersphere-system-setting 8001; do sleep 5; done
-              sleep 10
       serviceAccountName: metersphere
         {{ end }}
       containers:
         - name: metersphere
-          image: {{.Values.common.imagePrefix}}{{.Values.apiTest.image}}:{{.Values.common.imageTag}}
+          image: {{.Values.common.imagePrefix}}{{.Values.common.image}}:{{.Values.common.imageTag}}
           imagePullPolicy: {{.Values.common.imagePullPolicy}}
           resources:
             limits:
@@ -93,7 +83,7 @@ spec:
               cpu: 0.1
           ports:
             - name: http
-              containerPort: 8004
+              containerPort: 8081
           env:
             - name: FORMAT_MESSAGES_PATTERN_DISABLE_LOOKUPS
               value: "true"
@@ -104,6 +94,11 @@ spec:
                   name: metersphere-config
                   key: kafka.bootstrap-servers
             {{ end }}
+          command:
+            - sh
+            - -c
+            - |
+              sh /shells/metersphere.sh
           volumeMounts:
             - mountPath: /opt/metersphere/conf
               name: opt-metersphere-config
@@ -156,6 +151,6 @@ spec:
     app: metersphere
   ports:
     - name: http
-      port: 8004
+      port: 8081
       protocol: TCP
 {{end}}
diff --git a/charts/metersphere/templates/03-modules/result-hub.yaml b/charts/metersphere/templates/03-modules/result-hub.yaml
@@ -57,7 +57,7 @@ spec:
               done
       containers:
         - name: result-hub
-          image: {{.Values.common.imagePrefix}}{{.Values.dataStreaming.image}}:{{.Values.common.imageTag}}
+          image: {{.Values.common.imagePrefix}}{{.Values.common.image}}:{{.Values.common.imageTag}}
           imagePullPolicy: {{.Values.common.imagePullPolicy}}
           resources:
             limits:
@@ -71,6 +71,11 @@ spec:
           env:
             - name: FORMAT_MESSAGES_PATTERN_DISABLE_LOOKUPS
               value: "true"
+          command:
+            - sh
+            - -c
+            - |
+              sh /shells/result-hub.sh
           volumeMounts:
             - mountPath: /opt/metersphere/conf
               name: opt-metersphere-config
@@ -85,8 +90,10 @@ spec:
             defaultMode: 420
             name: metersphere-config
             items:
-            - key: common.properties
+            - key: metersphere.properties
               path: metersphere.properties
+            - key: redisson.yml
+              path: redisson.yml
           name: opt-metersphere-config
         - name: metersphere-logs
           {{if .Values.logPersistence.enabled}}
@@ -95,19 +102,5 @@ spec:
           {{ else }}
           emptyDir: {}
           {{ end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: result-hub
-  labels:
-    app: result-hub
-spec:
-  sessionAffinity: ClientIP
-  selector:
-    app: result-hub
-  ports:
-    - name: http
-      port: 8084
-      protocol: TCP
+
 {{end}}
diff --git a/charts/metersphere/templates/03-modules/task-runner.yaml b/charts/metersphere/templates/03-modules/task-runner.yaml
@@ -1,10 +1,10 @@
-{{if .Values.nodeController.enabled }}
+{{if .Values.taskRunner.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: task-runner
 spec:
-  replicas: {{.Values.nodeController.replicas | default 1}}
+  replicas: {{.Values.taskRunner.replicas | default 1}}
   selector:
     matchLabels:
       app: task-runner
@@ -47,7 +47,7 @@ spec:
               done
       containers:
         - name: task-runner
-          image: {{.Values.common.imagePrefix}}{{.Values.nodeController.image}}:{{.Values.common.imageTag}}
+          image: {{.Values.common.imagePrefix}}{{.Values.common.image}}:{{.Values.common.imageTag}}
           imagePullPolicy: {{.Values.common.imagePullPolicy}}
           resources:
             limits:
@@ -57,13 +57,16 @@ spec:
               cpu: 0.1
           ports:
             - name: http
-              containerPort: 8082
+              containerPort: 8000
           env:
             - name: FORMAT_MESSAGES_PATTERN_DISABLE_LOOKUPS
               value: "true"
+          command:
+            - sh
+            - -c
+            - |
+              sh /shells/task-runner.sh
           volumeMounts:
-            - mountPath: /opt/metersphere/conf
-              name: opt-metersphere-config
             - mountPath: /opt/metersphere/logs
               name: metersphere-logs
             - mountPath: /opt/metersphere/data
@@ -100,6 +103,6 @@ spec:
     app: task-runner
   ports:
     - name: http
-      port: 8082
+      port: 8000
       protocol: TCP
 {{end}}
diff --git a/charts/metersphere/templates/04-ingress.yaml b/charts/metersphere/templates/04-ingress.yaml
@@ -16,9 +16,9 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: metersphere-gateway
+                name: metersphere
                 port:
-                  number: 8000
+                  number: 8081
 {{if .Values.ingress.https.enabled}}
   tls:
     - hosts:

diff --git a/charts/metersphere/values.yaml b/charts/metersphere/values.yaml
@@ -15,7 +15,7 @@ common:
   image: "metersphere-ce"
   imagePullSecrets: nil
   storageClass: default
-  imageTag: v3.0.0-beta
+  imageTag: v3.3.0
   imagePullPolicy: Always
   properties: |-
     ## DATABASE
@@ -46,10 +46,18 @@ redisson:
       address: "redis://{{.Values.redis.host}}:{{.Values.redis.port}}"
       database: {{.Values.redis.database}}
 
+metersphere:
+  enabled: true
+  replicas: 1
+
 resultHub:
   enabled: true
   replicas: 1
 
+taskRunner:
+  enabled: true
+  replicas: 1
+
 logPersistence:
   enabled: true
   accessModes: ReadWriteMany
@@ -63,7 +71,7 @@ dataPersistence:
 mysql:
   enabled: true
   image: mysql
-  imageTag: "8.0.35"
+  imageTag: "8.0.38"
   host: metersphere-mysql
   port: 3306
   username: root
@@ -75,7 +83,7 @@ mysql:
 minio:
   enabled: true
   image: minio
-  imageTag: "RELEASE.2023-11-06T22-26-08Z"
+  imageTag: "RELEASE.2024-05-07T06-41-25Z"
   username: admin
   password: Password123@minio
   host: metersphere-minio
@@ -87,7 +95,7 @@ minio:
 redis:
   enabled: true
   image: redis
-  imageTag: "6.2.6"
+  imageTag: "7.2.5-alpine"
   password: Password123@redis
   host: metersphere-redis
   port: 6379
@@ -98,8 +106,8 @@ redis:
     size: 10Gi
 kafka:
   enabled: true
-  fullnameOverride: metersphere-kafka
-  host: metersphere-kafka
+  fullnameOverride: kafka
+  host: kafka
   port: 9092
   metricTopic: JMETER_METRICS
   logTopic: JMETER_LOGS