Merge pull request #135 from openinsight-proj/otel-demo-lite-version-up

bump up opentelemetry demo lite to 1.1.10
openinsight-proj · Jul 15, 2024 · c61ad69 · c61ad69
2 parents b4eedfe + f5792bf
commit c61ad69
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 28 deletions.
diff --git a/charts/opentelemetry-demo-lite/Chart.yaml b/charts/opentelemetry-demo-lite/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: opentelemetry-demo-lite
 type: application
-version: 1.1.9
+version: 1.1.10
 icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
 description: A helm chart for openTelemetry community demo application integration with other component(lite version).
 sources:

diff --git a/charts/opentelemetry-demo-lite/templates/adservice.yaml b/charts/opentelemetry-demo-lite/templates/adservice.yaml
@@ -9,9 +9,9 @@ metadata:
 spec:
   selector:
     matchLabels:
-          app.kubernetes.io/component: adservice
-          app.kubernetes.io/instance: {{ .Release.Name }}
-          app.kubernetes.io/name: {{ .Release.Name }}-adservice
+      app.kubernetes.io/component: adservice
+      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}-adservice
   template:
     metadata:
       labels:
@@ -34,9 +34,9 @@ spec:
           {{- if .Values.extensions.adservice.ports }}
           ports:
           {{- range $port := .Values.extensions.adservice.ports }}
-          - name: {{ $port.name}}
-            containerPort: {{ $port.containerPort }}
-            protocol: {{ $port.protocol }}
+            - name: {{ $port.name}}
+              containerPort: {{ $port.containerPort }}
+              protocol: {{ $port.protocol }}
           {{- end }}
           {{- end }}
           env:
@@ -62,6 +62,33 @@ spec:
             limits:
               cpu: "1"
               memory: 1024Mi
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: http
+              scheme: HTTP
+            timeoutSeconds: 1
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: http
+              scheme: HTTP
+            timeoutSeconds: 1
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+          startupProbe:
+            httpGet:
+              path: /healthz
+              port: http
+              scheme: HTTP
+            timeoutSeconds: 1
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 20
 ---
 apiVersion: v1
 kind: Service
@@ -74,10 +101,10 @@ spec:
   {{- if .Values.extensions.adservice.ports }}
   ports:
   {{- range $port := .Values.extensions.adservice.ports }}
-  - name: {{ $port.name}}
-    port: {{ $port.containerPort }}
-    protocol: {{ $port.protocol }}
-    targetPort: {{ $port.containerPort }}
+    - name: {{ $port.name}}
+      port: {{ $port.containerPort }}
+      protocol: {{ $port.protocol }}
+      targetPort: {{ $port.containerPort }}
   {{- end }}
   {{- end }}
   selector:

diff --git a/charts/opentelemetry-demo-lite/values.yaml b/charts/opentelemetry-demo-lite/values.yaml
@@ -49,24 +49,24 @@ extensions:
   redis:
     redisCRResource:
       redisExporterImage:
-        registry: quay.m.daocloud.io
-        repository: opstree/redis-exporter
-        tag: "v1.44.0"
+        registry: docker.m.daocloud.io
+        repository: oliver006/redis_exporter
+        tag: "v1.45.0"
       image:
-        registry: quay.m.daocloud.io
-        repository: opstree/redis
-        tag: "v7.0.5"
+        registry: ghcr.m.daocloud.io
+        repository: ksmartdata/ot-redis
+        tag: "v6.2.12-alpine"
     image:
-      registry: docker.m.daocloud.io
-      repository: library/redis
-      tag: "alpine"
+      registry: ghcr.m.daocloud.io
+      repository: ksmartdata/ot-redis
+      tag: "v6.2.12-alpine"
   dataservice:
     # this value is not in used, it replaces by global.microservices.nacos.enabled
     enabled: true
     image:
       registry: ghcr.io
       repository: openinsight-proj/demo
-      tag: "fb41b4c0f323f929300ca2769e34f41fda8f9c25-dataservice"
+      tag: "db802043e29ceb4205af968a6d6f324c8929d543-dataservice"
       pullPolicy: Always
     servcie:
       type: ClusterIP
@@ -122,20 +122,17 @@ extensions:
     image:
       registry: ghcr.io
       repository: openinsight-proj/demo
-      tag: "fb41b4c0f323f929300ca2769e34f41fda8f9c25-adservice-v2"
+      tag: "db802043e29ceb4205af968a6d6f324c8929d543-adservice-v2"
       pullPolicy: Always
     servcie:
-      type: NodePort
+      type: ClusterIP
     ports:
-      - name: service-grpc
+      - name: grpc
         containerPort: 8080
         protocol: TCP
-      - name: rest-http
+      - name: http
         containerPort: 8081
         protocol: TCP
-      - name: health-http
-        containerPort: 8999
-        protocol: TCP
       - name: jmx-metrics
         containerPort: 12345
         protocol: TCP