diff --git a/charts/gateway-addons-helm/README.md b/charts/gateway-addons-helm/README.md index bd1c5adce9..ad9bd969a6 100644 --- a/charts/gateway-addons-helm/README.md +++ b/charts/gateway-addons-helm/README.md @@ -149,6 +149,11 @@ To uninstall the chart: | opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | | | opentelemetry-collector.image.tag | string | `"0.121.0"` | | | opentelemetry-collector.mode | string | `"deployment"` | | +| opentelemetry-collector.ports.datadog.containerPort | int | `8126` | | +| opentelemetry-collector.ports.datadog.enabled | bool | `true` | | +| opentelemetry-collector.ports.datadog.hostPort | int | `8126` | | +| opentelemetry-collector.ports.datadog.protocol | string | `"TCP"` | | +| opentelemetry-collector.ports.datadog.servicePort | int | `8126` | | | opentelemetry-collector.ports.envoy-als.appProtocol | string | `"grpc"` | | | opentelemetry-collector.ports.envoy-als.containerPort | int | `9000` | | | opentelemetry-collector.ports.envoy-als.enabled | bool | `true` | | diff --git a/charts/gateway-addons-helm/values.yaml b/charts/gateway-addons-helm/values.yaml index b491b506a0..309b6ee924 100644 --- a/charts/gateway-addons-helm/values.yaml +++ b/charts/gateway-addons-helm/values.yaml @@ -814,6 +814,12 @@ opentelemetry-collector: hostPort: 9000 protocol: TCP appProtocol: grpc + datadog: + enabled: true + containerPort: 8126 + servicePort: 8126 + hostPort: 8126 + protocol: TCP fullnameOverride: otel-collector mode: deployment image: diff --git a/site/content/en/latest/install/gateway-addons-helm-api.md b/site/content/en/latest/install/gateway-addons-helm-api.md index 75e2be7301..df002772cf 100644 --- a/site/content/en/latest/install/gateway-addons-helm-api.md +++ b/site/content/en/latest/install/gateway-addons-helm-api.md @@ -128,6 +128,11 @@ An Add-ons Helm chart for Envoy Gateway | opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | | | opentelemetry-collector.image.tag | string | `"0.121.0"` | | | opentelemetry-collector.mode | string | `"deployment"` | | +| opentelemetry-collector.ports.datadog.containerPort | int | `8126` | | +| opentelemetry-collector.ports.datadog.enabled | bool | `true` | | +| opentelemetry-collector.ports.datadog.hostPort | int | `8126` | | +| opentelemetry-collector.ports.datadog.protocol | string | `"TCP"` | | +| opentelemetry-collector.ports.datadog.servicePort | int | `8126` | | | opentelemetry-collector.ports.envoy-als.appProtocol | string | `"grpc"` | | | opentelemetry-collector.ports.envoy-als.containerPort | int | `9000` | | | opentelemetry-collector.ports.envoy-als.enabled | bool | `true` | | diff --git a/test/e2e/testdata/tracing-datadog.yaml b/test/e2e/testdata/tracing-datadog.yaml index e3c2a1b6b9..d39f5e1fa5 100644 --- a/test/e2e/testdata/tracing-datadog.yaml +++ b/test/e2e/testdata/tracing-datadog.yaml @@ -18,21 +18,6 @@ spec: kind: EnvoyProxy name: datadog-tracing --- -apiVersion: v1 -kind: Service -metadata: - name: datadog-agent - namespace: monitoring -spec: - selector: - app.kubernetes.io/instance: eg-addons - app.kubernetes.io/name: opentelemetry-collector - component: standalone-collector - ports: - - protocol: TCP - port: 8126 - targetPort: 8126 ---- apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: @@ -48,9 +33,8 @@ spec: provider: type: Datadog backendRefs: - - name: backend-fqdn - kind: Backend - group: gateway.envoyproxy.io + - name: otel-collector + namespace: monitoring port: 8126 customTags: "provider": @@ -75,17 +59,6 @@ spec: drainTimeout: 5s minDrainDuration: 1s --- -apiVersion: gateway.envoyproxy.io/v1alpha1 -kind: Backend -metadata: - name: backend-fqdn - namespace: gateway-conformance-infra -spec: - endpoints: - - fqdn: - hostname: datadog-agent.monitoring.svc.cluster.local - port: 8126 ---- apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: diff --git a/test/helm/gateway-addons-helm/e2e.out.yaml b/test/helm/gateway-addons-helm/e2e.out.yaml index 60c1ec512d..6684b559a1 100644 --- a/test/helm/gateway-addons-helm/e2e.out.yaml +++ b/test/helm/gateway-addons-helm/e2e.out.yaml @@ -9747,6 +9747,10 @@ spec: type: ClusterIP ports: + - name: datadog + port: 8126 + targetPort: 8126 + protocol: TCP - name: envoy-als port: 9000 targetPort: 9000 @@ -9997,6 +10001,9 @@ spec: imagePullPolicy: IfNotPresent ports: + - name: datadog + containerPort: 8126 + protocol: TCP - name: envoy-als containerPort: 9000 protocol: TCP