zhanghongtong 5 éve
szülő
commit
dfee322cb5

+ 12 - 8
deploy/chart/kuiper/templates/StatefulSet.yaml

@@ -65,15 +65,17 @@ spec:
             path: random.yaml
           - key: zmq.yaml
             path: zmq.yaml
-      {{- if .Values.kuiperConfig."mqtt_source.yaml".default.certificationSecretName }}
+      {{ $certificationSecretName := index .Values "kuiperConfig" "mqtt_source.yaml" "default" "certificationSecretName" }}
+      {{- if $certificationSecretName }}
       - name: kuiper-certification
         secret:
-          secretName: {{ .Values.kuiperConfig."mqtt_source.yaml".default.certificationSecretName }}
+          secretName: {{ $certificationSecretName }}
       {{- end }}
-      {{- if .Values.kuiperConfig."mqtt_source.yaml".default.privateKeySecretName }}
+      {{ $privateKeySecretName := index .Values "kuiperConfig" "mqtt_source.yaml" "default" "privateKeySecretName" }}
+      {{- if $privateKeySecretName }}
       - name: kuiper-private-key
         secret:
-          secretName: {{ .Values.kuiperConfig."mqtt_source.yaml".default.privateKeySecretName }}
+          secretName: {{ $privateKeySecretName }}
       {{- end }}
       containers:
         - name: kuiper
@@ -100,14 +102,16 @@ spec:
           - name: kuiper-config
             mountPath: "/kuiper/etc/sources/zmq.yaml"
             subPath: "zmq.yaml"
-          {{ if .Values.kuiperConfig."mqtt_source.yaml".default.certificationSecretName  }}
+          {{ $certificationSecretName := index .Values "kuiperConfig" "mqtt_source.yaml" "default" "certificationSecretName" }}
+          {{- if $certificationSecretName }}
           - name: kuiper-certification
-            mountPath: {{ .Values.kuiperConfig."mqtt_source.yaml".default.certificationPath | default "/var/kuiper/certificate.pem" }}
+            mountPath: {{ index .Values "kuiperConfig" "mqtt_source.yaml" "default" "certificationPath" | default "/var/kuiper/certificate.pem" }}
             readOnly: true
           {{ end }}
-          {{ if .Values.kuiperConfig."mqtt_source.yaml".default.privateKeySecretName  }}
+          {{ $privateKeySecretName := index .Values "kuiperConfig" "mqtt_source.yaml" "default" "privateKeySecretName" }}
+          {{- if $privateKeySecretName }}
           - name: kuiper-private-key
-            mountPath: {{ .Values.kuiperConfig."mqtt_source.yaml".default.privateKeyPath | default "/var/kuiper/private.pem.key" }}
+            mountPath: {{ index .Values "kuiperConfig" "mqtt_source.yaml" "default" "privateKeyPath" | default "/var/kuiper/private.pem.key" }}
             readOnly: true
           {{ end }}
           resources:

+ 18 - 1
deploy/chart/kuiper/templates/configmap.yaml

@@ -6,4 +6,21 @@ metadata:
   labels:
     {{- include "kuiper.labels" . | nindent 4 }}
 data:
-    {{- toYaml .Values.kuiperConfig | nindent 4 }}
+  "client.yaml": |
+    {{ $client := index .Values "kuiperConfig" "client.yaml" }}
+    {{- toYaml $client | nindent 6 }}
+  "kuiper.yaml": |
+    {{ $kuiper := index .Values "kuiperConfig" "kuiper.yaml" }}
+    {{- toYaml $kuiper | nindent 6 }}
+  "mqtt_source.yaml": |
+    {{ $mqtt := index .Values "kuiperConfig" "mqtt_source.yaml" }}
+    {{- toYaml $mqtt | nindent 6 }}
+  "edgex.yaml": |
+    {{ $edgex := index .Values "kuiperConfig" "sources/edgex.yaml" }}
+    {{- toYaml $edgex | nindent 6 }}
+  "random.yaml": |
+    {{ $random := index .Values "kuiperConfig" "sources/random.yaml" }}
+    {{- toYaml $random | nindent 6 }}
+  "zmq.yaml": |
+    {{ $zmq := index .Values "kuiperConfig" "sources/zmq.yaml" }}
+    {{- toYaml $zmq | nindent 6 }}

+ 3 - 3
deploy/chart/kuiper/values.yaml

@@ -66,7 +66,7 @@ kuiperConfig:
     demo_conf: #Conf_key
       qos: 0
       servers: [tcp://10.211.55.6:1883, tcp://127.0.0.1]
-  "edgex.yaml":
+  "sources/edgex.yaml":
     #Global Edgex configurations
     default:
       protocol: tcp
@@ -84,7 +84,7 @@ kuiperConfig:
       server: localhost
       port: 5571
       topic: application
-  "random.yaml":
+  "sources/random.yaml":
     default:
       interval: 1000
       pattern:
@@ -94,7 +94,7 @@ kuiperConfig:
       seed: 1
       pattern:
         count: 50
-  "zmq.yaml":
+  "sources/zmq.yaml":
     #Global Zmq configurations
     default:
       server: tcp://127.0.0.1:5563