version bump up (#91)

Author: Frapschen

charts/opentelemetry-demo/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: opentelemetry-demo
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.12.2
+  version: 0.21.1
 - name: redis-operator
   repository: https://ot-container-kit.github.io/helm-charts
   version: 0.11.2
-digest: sha256:13eb245afb148619719d76061148177538f61fb45f1683c752bbea92f6a29187
-generated: "2022-11-22T11:40:59.86156+08:00"
+digest: sha256:d0beda407f314b68fe2b9706945a3fd6daa2f5246d894383a708bad4edc7521d
+generated: "2023-04-10T16:57:36.822397+08:00"

charts/opentelemetry-demo/Chart.yaml

@@ -1,17 +1,17 @@
 apiVersion: v2
 name: opentelemetry-demo
 type: application
-version: 0.6.4
+version: 0.6.5
 description: A helm chart for openTelemetry community demo application integration with other component.
 sources:
   - https://github.com/openinsight-proj/openinsight-helm-charts
 maintainers:
   - name: JaredTan95
   - name: Frapschen
-appVersion: "1.3.2"
+appVersion: "v1.4.0-beta-daocloud"
 dependencies:
   - name: opentelemetry-demo
-    version: 0.19.0
+    version: 0.21.1
     repository: "https://open-telemetry.github.io/opentelemetry-helm-charts"
     condition: opentelemetry-demo.enabled
   - name: redis-operator

charts/opentelemetry-demo/templates/cartservice.yaml

@@ -1,19 +1,24 @@
+{{- if .Values.extensions.cartservice.enabled -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "otel-demo.name" . }}-cartservice
   labels:
-    {{- include "otel-demo.labels" . | nindent 4 }}
+    opentelemetry.io/name: {{ .Release.Name }}-cartservice
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: cartservice
+    app.kubernetes.io/name: {{ .Release.Name }}-cartservice
 spec:
   selector:
     matchLabels:
-          app.kubernetes.io/component: cartservice
-          app.kubernetes.io/instance: {{ .Release.Name }}
-          app.kubernetes.io/name: {{ .Release.Name }}-cartservice
+      app.kubernetes.io/component: cartservice
+      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}-cartservice
   template:
     metadata:
       labels:
+        opentelemetry.io/name: {{ .Release.Name }}-cartservice
         app.kubernetes.io/component: cartservice
         app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/name: {{ .Release.Name }}-cartservice
@@ -39,6 +44,14 @@ spec:
           resources:
             limits:
               memory: 160Mi
+      initContainers:
+        - command:
+            - sh
+            - -c
+            - until nc -z -v -w30 {{ include "redis.addr" . }}; do echo waiting
+              for redis; sleep 2; done;
+          image: docker.m.daocloud.io/busybox:1.36.0
+          name: wait-for-redis
 ---
 apiVersion: v1
 kind: Service
@@ -54,5 +67,5 @@ spec:
       port: 8080
       targetPort: 8080
   selector:
-    {{- include "otel-demo.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: cartservice
+    opentelemetry.io/name: {{ .Release.Name }}-cartservice
+{{- end }}

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

@@ -1,3 +1,4 @@
+{{- if .Values.extensions.dataservice.enabled -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -40,8 +41,6 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.namespace
-            - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: 'http://{{ include "otel-demo.name" . }}-otelcol:4317'
             - name: MYSQL_HOST
               value: '{{ include "otel-demo.name" . }}-mysql'
             {{- with .Values.extensions.dataservice.env }}
@@ -70,4 +69,5 @@ spec:
   {{- end }}
   {{- end }}
   selector:
-    app.kubernetes.io/component: dataservice
+    app.kubernetes.io/name: {{ .Release.Name }}-dataservice
+{{- end }}

…opentelemetry-demo/templates/ui-svc.yaml …emo/templates/frontend-nodeport-svc.yamlcharts/opentelemetry-demo/templates/ui-svc.yaml renamed to charts/opentelemetry-demo/templates/frontend-nodeport-svc.yaml charts/opentelemetry-demo/templates/ui-svc.yaml renamed to charts/opentelemetry-demo/templates/frontend-nodeport-svc.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.extensions.frontendNodePortSvc.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -14,5 +15,5 @@ spec:
       port: 8080
       targetPort: 8080
   selector:
-    app.kubernetes.io/component: frontendproxy
-    {{- include "otel-demo-ui.selectorLabels" . | nindent 4 }}
+    opentelemetry.io/name: {{ .Release.Name }}-frontendproxy
+{{- end }}