chore: adding grpc endpoint config

kubeshop · Sep 30, 2024 · b309c30 · b309c30
1 parent 1c8835c
commit b309c30
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 6 deletions.
diff --git a/charts/tracetest-cloud/Chart.yaml b/charts/tracetest-cloud/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v1.33.0
+version: v1.34.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/tracetest-cloud/templates/configmap.yaml b/charts/tracetest-cloud/templates/configmap.yaml
@@ -30,6 +30,7 @@ data:
   NATS_URI: {{ include "tracetest-common.nats_endpoint" . }}
   OAUTH_ENABLED: "false"
   OSS_ENDPOINT: "http://{{ .Release.Name }}-tracetest-core.{{ .Release.Namespace }}:{{ .Values.global.tracetestCore.service.httpPort }}"
+  OSS_OTLP_ENDPOINT: "http://{{ .Release.Name }}-tracetest-core.{{ .Release.Namespace }}:{{ .Values.global.tracetestCore.service.otlpGrpcPort }}"
   ROOT_DOMAIN: "{{ .Values.global.urls.rootDomain }}"
   UI_ENDPOINT: "{{ include "tracetest-common.url" .Values.global.urls.web }}"
   DEMO_ORG_ID: "{{ .Values.config.demoOrgID }}"

diff --git a/charts/tracetest-cloud/templates/deployment.yaml b/charts/tracetest-cloud/templates/deployment.yaml
@@ -105,6 +105,11 @@ spec:
                 configMapKeyRef:
                   name: {{ include "tracetest-cloud.fullname" . }}-config
                   key: OSS_ENDPOINT
+            - name: OSS_OTLP_ENDPOINT
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ include "tracetest-cloud.fullname" . }}-config
+                  key: OSS_OTLP_ENDPOINT
             - name: ROOT_DOMAIN
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/tracetest-cloud/values.yaml b/charts/tracetest-cloud/values.yaml
@@ -6,6 +6,7 @@ global:
   tracetestCore:
     service:
       httpPort: 11633
+      otlpGrpcPort: 4317
 
   tracetestCloud:
     service:

diff --git a/charts/tracetest-core/Chart.yaml b/charts/tracetest-core/Chart.yaml
@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v1.26.0
+version: v1.27.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/tracetest-core/templates/service.yaml b/charts/tracetest-core/templates/service.yaml
@@ -12,6 +12,10 @@ spec:
       targetPort: http
       protocol: TCP
       port: {{ .Values.server.httpPort }}
+    - name: grpc-collector-entrypoint
+      protocol: TCP
+      port: {{ .Values.server.otlpGrpcPort }}
+      targetPort: 4317
   selector:
     {{- include "tracetest-core.selectorLabels" . | nindent 4 }}
     tracetest/component: api
diff --git a/charts/tracetest-core/values.yaml b/charts/tracetest-core/values.yaml
@@ -6,6 +6,7 @@ global:
   tracetestCore:
     service:
       httpPort: &httpPort 11633
+      otlpGrpcPort: &otlpGrpcPort 4317
 
   nats:
     endpoint: "nats://nats:4222"
@@ -36,7 +37,7 @@ config:
 
 server:
   httpPort: *httpPort
-
+  otlpGrpcPort: *otlpGrpcPort
 
 image:
   repository: kubeshop/tracetest-core
@@ -86,4 +87,4 @@ deployments:
     env:
       TRACETEST_SERVER_API_ENABLED: false
       TRACETEST_SERVER_WORKFLOW_ENABLED: true
-      TRACETEST_SERVER_WORKFLOW_STEPS: suite_runner
+      TRACETEST_SERVER_WORKFLOW_STEPS: suite_runner
diff --git a/charts/tracetest-onprem/Chart.yaml b/charts/tracetest-onprem/Chart.yaml
@@ -9,11 +9,11 @@ dependencies:
   repository: file://../tracetest-frontend
   condition: tracetest-frontend.enabled
 - name: tracetest-core
-  version: v1.26.0
+  version: v1.27.0
   repository: file://../tracetest-core
   condition: tracetest-core.enabled
 - name: tracetest-cloud
-  version: v1.33.0
+  version: v1.34.0
   repository: file://../tracetest-cloud
   condition: tracetest-cloud.enabled
 - name: tracetest-agent-operator