From 50feb5969dd37accc31eb71655f5b72290910b9b Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 30 Jun 2023 19:29:20 -0700 Subject: [PATCH] Update metrics chart to mount PVC for metrics saving Update MQ base chart to support PVC mounting --- neon_diana_utils/helm_charts/diana-backend/Chart.yaml | 2 +- neon_diana_utils/helm_charts/mq-services/Chart.yaml | 4 ++-- .../helm_charts/mq-services/charts/base-mq/Chart.yaml | 2 +- .../mq-services/charts/base-mq/templates/_deployment.tpl | 4 ++++ .../helm_charts/mq-services/charts/neon-api-proxy/Chart.yaml | 2 +- .../mq-services/charts/neon-brands-service/Chart.yaml | 2 +- .../mq-services/charts/neon-email-proxy/Chart.yaml | 2 +- .../mq-services/charts/neon-llm-chatgpt/Chart.yaml | 2 +- .../mq-services/charts/neon-llm-fastchat/Chart.yaml | 2 +- .../mq-services/charts/neon-metrics-service/Chart.yaml | 4 ++-- .../mq-services/charts/neon-metrics-service/values.yaml | 3 ++- .../mq-services/charts/neon-script-parser/Chart.yaml | 2 +- 12 files changed, 18 insertions(+), 13 deletions(-) diff --git a/neon_diana_utils/helm_charts/diana-backend/Chart.yaml b/neon_diana_utils/helm_charts/diana-backend/Chart.yaml index f91c1bf5..16bf03e7 100644 --- a/neon_diana_utils/helm_charts/diana-backend/Chart.yaml +++ b/neon_diana_utils/helm_charts/diana-backend/Chart.yaml @@ -35,5 +35,5 @@ dependencies: version: 0.0.1 repository: file://../http-services - name: diana-mq - version: 0.0.3 + version: 0.0.4 repository: file://../mq-services \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/Chart.yaml index 7dcf166d..2a3a81fb 100644 --- a/neon_diana_utils/helm_charts/mq-services/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/Chart.yaml @@ -3,7 +3,7 @@ name: diana-mq description: Deploy DIANA MQ Services type: application -version: 0.0.3 +version: 0.0.4 appVersion: "0.0.6a14" dependencies: - name: neon-api-proxy @@ -20,7 +20,7 @@ dependencies: repository: file://charts/neon-email-proxy - name: neon-metrics-service alias: neon-metrics-service - version: 0.0.1 + version: 0.0.2 repository: file://charts/neon-metrics-service - name: neon-script-parser alias: neon-script-parser diff --git a/neon_diana_utils/helm_charts/mq-services/charts/base-mq/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/base-mq/Chart.yaml index a04a6d40..332ccb2e 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/base-mq/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/base-mq/Chart.yaml @@ -3,5 +3,5 @@ name: base-mq description: Library chart for basic MQ Services type: library -version: 0.0.2 +version: 0.0.3 appVersion: "0.0.6a14" diff --git a/neon_diana_utils/helm_charts/mq-services/charts/base-mq/templates/_deployment.tpl b/neon_diana_utils/helm_charts/mq-services/charts/base-mq/templates/_deployment.tpl index 5c1a63a8..edf10dfe 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/base-mq/templates/_deployment.tpl +++ b/neon_diana_utils/helm_charts/mq-services/charts/base-mq/templates/_deployment.tpl @@ -28,6 +28,10 @@ spec: volumeMounts: - mountPath: /config/neon name: config + {{- if .Values.persistentVolumeClaim }} + - mountPath: {{ .Values.persistentVolumeClaim.containerPath }} + name: {{ .Values.persistentVolumeClaim.name }} + {{- end -}} {{- if .Values.resources }} resources: {{- toYaml $.Values.resources | nindent 12 -}} diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-api-proxy/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-api-proxy/Chart.yaml index 3ba1dfe1..017e7798 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-api-proxy/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-api-proxy/Chart.yaml @@ -8,5 +8,5 @@ appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-brands-service/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-brands-service/Chart.yaml index e091fc1e..a8612d43 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-brands-service/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-brands-service/Chart.yaml @@ -8,5 +8,5 @@ appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-email-proxy/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-email-proxy/Chart.yaml index 33cfa839..1e9f17d6 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-email-proxy/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-email-proxy/Chart.yaml @@ -8,5 +8,5 @@ appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-chatgpt/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-chatgpt/Chart.yaml index f9dd92bf..d7c20191 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-chatgpt/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-chatgpt/Chart.yaml @@ -8,5 +8,5 @@ appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-fastchat/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-fastchat/Chart.yaml index e3d67d67..677e1d33 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-fastchat/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-llm-fastchat/Chart.yaml @@ -8,5 +8,5 @@ appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/Chart.yaml index 37ab83a0..98326541 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/Chart.yaml @@ -3,10 +3,10 @@ name: neon-metrics-service description: Deploy a Metrics Collector Service type: application -version: 0.0.1 +version: 0.0.2 appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/values.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/values.yaml index 48b6f555..c30a8152 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/values.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-metrics-service/values.yaml @@ -6,4 +6,5 @@ image: tag: dev persistentVolumeClaim: name: metrics - claimName: metrics \ No newline at end of file + claimName: metrics + containerPath: /data \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/mq-services/charts/neon-script-parser/Chart.yaml b/neon_diana_utils/helm_charts/mq-services/charts/neon-script-parser/Chart.yaml index 995a04c5..3492c28e 100644 --- a/neon_diana_utils/helm_charts/mq-services/charts/neon-script-parser/Chart.yaml +++ b/neon_diana_utils/helm_charts/mq-services/charts/neon-script-parser/Chart.yaml @@ -8,5 +8,5 @@ appVersion: "0.0.6a14" dependencies: - name: base-mq - version: 0.0.2 + version: 0.0.3 repository: file://../base-mq \ No newline at end of file