Skip to content

Commit 6a1ace3

Browse files
committed
only deploy dataservice and mysql when nacos is enabled
1 parent 13512fe commit 6a1ace3

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

charts/opentelemetry-demo-lite/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: opentelemetry-demo-lite
33
type: application
4-
version: 1.0.3
4+
version: 1.0.4
55
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
66
description: A helm chart for openTelemetry community demo application integration with other component(lite version).
77
sources:

charts/opentelemetry-demo-lite/templates/_help.tpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ java dataservice opt
9292
{{- end }}
9393

9494
{{/*
95-
common java adService opt bug
95+
common java adservice opt bug
9696
*/}}
9797
{{- define "java.adservice.opt" -}}
9898
{{- $opt := "-Dmeter.port=8888" -}}
@@ -104,7 +104,13 @@ common java adService opt bug
104104
{{- $opt = cat $opt "-Dotel.exporter.prometheus.port=9464" -}}
105105
{{- end }}
106106

107+
{{/* check nacos is enable */}}
108+
{{- if .Values.global.microservices.nacos.enabled }}
107109
{{- $opt = cat $opt "-Dspring.dataService.enabled=true" -}}
110+
{{- else }}
111+
{{- $opt = cat $opt "-Dspring.dataService.enabled=false" -}}
112+
{{- end }}
113+
108114
{{- $opt = cat $opt "-Dspring.extraAdLabel=Daocloud" -}}
109115
{{- $opt = cat $opt "-Dspring.randomError=false" -}}
110116
{{- $opt = cat $opt "-Dspring.matrixRow=200" -}}

charts/opentelemetry-demo-lite/templates/dataservice/dataservice.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.extensions.dataservice.enabled -}}
1+
{{- if and .Values.extensions.dataservice.enabled .Values.global.microservices.nacos.enabled -}}
22
---
33
apiVersion: apps/v1
44
kind: Deployment

charts/opentelemetry-demo-lite/templates/dataservice/mysql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.extensions.mysql.enabled -}}
1+
{{- if and .Values.extensions.mysql.enabled .Values.global.microservices.nacos.enabled -}}
22
apiVersion: v1
33
kind: Service
44
metadata:

charts/opentelemetry-demo-lite/templates/serviceMonitor/dataservice-service-monitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.global.serviceMonitor.dataservice.enabled -}}
1+
{{- if and .Values.global.serviceMonitor.dataservice.enabled .Values.global.microservices.nacos.enabled -}}
22
apiVersion: monitoring.coreos.com/v1
33
kind: ServiceMonitor
44
metadata:

0 commit comments

Comments
 (0)