From 9989ed59227fc3de1e7ab049d5a7e623956c328d Mon Sep 17 00:00:00 2001 From: ericsyh Date: Wed, 18 Oct 2023 15:40:36 +0800 Subject: [PATCH 1/3] feat: support extra configures for detector Signed-off-by: ericsyh --- .../templates/detector/pulsar-detector-deployment.yaml | 9 +++++++++ charts/sn-platform-slim/values.yaml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml b/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml index 6b6af2d2d..3bc674396 100644 --- a/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml +++ b/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml @@ -124,4 +124,13 @@ spec: name: {{ .Release.Name }}-token-admin key: TOKEN {{- end }} + {{- toYaml .Values.pulsar_detector.extraEnv | nindent 10 }} + {{- if .Values.pulsar_detector.extraVolumeMounts }} + volumeMounts: + {{- toYaml .Values.pulsar_detector.extraVolumeMounts | nindent 10 }} + {{- end }} + {{- if .Values.pulsar_detector.extraVolumes }} + volumes: + {{- toYaml .Values.pulsar_detector.extraVolumes | nindent 8 }} + {{- end }} {{- end }} diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml index e86f6442c..70f7b5753 100644 --- a/charts/sn-platform-slim/values.yaml +++ b/charts/sn-platform-slim/values.yaml @@ -1396,6 +1396,9 @@ pulsar_detector: limits: {} # memory: "1Gi" # cpu: "0.4" + extraVolumes: [] + extraVolumeMounts: [] + extraEnv: [] ## Proxy service ## templates/pulsar-detector-service.yaml ## From 72027068b93300ac1633b2e7730aa0f028c64977 Mon Sep 17 00:00:00 2001 From: ericsyh Date: Wed, 18 Oct 2023 15:44:09 +0800 Subject: [PATCH 2/3] apply to the sn-platform chart Signed-off-by: ericsyh --- .../templates/detector/pulsar-detector-deployment.yaml | 9 +++++++++ charts/sn-platform/values.yaml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml b/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml index 37ae5c3cb..45c8707d3 100644 --- a/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml +++ b/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml @@ -131,4 +131,13 @@ spec: name: {{ .Release.Name }}-token-admin key: TOKEN {{- end }} + {{- toYaml .Values.pulsar_detector.extraEnv | nindent 10 }} + {{- if .Values.pulsar_detector.extraVolumeMounts }} + volumeMounts: + {{- toYaml .Values.pulsar_detector.extraVolumeMounts | nindent 10 }} + {{- end }} + {{- if .Values.pulsar_detector.extraVolumes }} + volumes: + {{- toYaml .Values.pulsar_detector.extraVolumes | nindent 8 }} + {{- end }} {{- end }} diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml index f5ba881f2..b14d24af3 100644 --- a/charts/sn-platform/values.yaml +++ b/charts/sn-platform/values.yaml @@ -1471,6 +1471,9 @@ pulsar_detector: limits: {} # memory: "1Gi" # cpu: "0.4" + extraVolumes: [] + extraVolumeMounts: [] + extraEnv: [] ## Proxy service ## templates/pulsar-detector-service.yaml ## From 1cd9f94e1d6fb3dc6ae16359d4d93f2926f03351 Mon Sep 17 00:00:00 2001 From: ericsyh Date: Wed, 18 Oct 2023 16:18:03 +0800 Subject: [PATCH 3/3] fix ci Signed-off-by: ericsyh --- .../templates/detector/pulsar-detector-deployment.yaml | 2 ++ .../templates/detector/pulsar-detector-deployment.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml b/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml index 3bc674396..e0e859ff4 100644 --- a/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml +++ b/charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml @@ -124,7 +124,9 @@ spec: name: {{ .Release.Name }}-token-admin key: TOKEN {{- end }} + {{- if .Values.pulsar_detector.extraEnv }} {{- toYaml .Values.pulsar_detector.extraEnv | nindent 10 }} + {{- end }} {{- if .Values.pulsar_detector.extraVolumeMounts }} volumeMounts: {{- toYaml .Values.pulsar_detector.extraVolumeMounts | nindent 10 }} diff --git a/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml b/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml index 45c8707d3..e153c3db5 100644 --- a/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml +++ b/charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml @@ -131,7 +131,9 @@ spec: name: {{ .Release.Name }}-token-admin key: TOKEN {{- end }} + {{- if .Values.pulsar_detector.extraEnv }} {{- toYaml .Values.pulsar_detector.extraEnv | nindent 10 }} + {{- end }} {{- if .Values.pulsar_detector.extraVolumeMounts }} volumeMounts: {{- toYaml .Values.pulsar_detector.extraVolumeMounts | nindent 10 }}