From 0267dcef0eec4358de876da781d133e9ab1af7e6 Mon Sep 17 00:00:00 2001
From: Kostya <53430368+kostyaplis@users.noreply.github.com>
Date: Mon, 14 Jun 2021 18:48:02 +0800
Subject: [PATCH] Expose TCP port (#40)

* Expose TCP port

* Revert service port name. Bump chart version. Upd readme
---
 charts/aws-xray/Chart.yaml               | 2 +-
 charts/aws-xray/README.md                | 2 +-
 charts/aws-xray/templates/configmap.yaml | 1 +
 charts/aws-xray/templates/daemonset.yaml | 4 ++++
 charts/aws-xray/templates/service.yaml   | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/aws-xray/Chart.yaml b/charts/aws-xray/Chart.yaml
index d537f9d..6ab76d6 100644
--- a/charts/aws-xray/Chart.yaml
+++ b/charts/aws-xray/Chart.yaml
@@ -12,4 +12,4 @@ maintainers:
 name: aws-xray
 sources:
   - https://github.com/aws/aws-xray-daemon
-version: 3.1.1
+version: 3.2.0
diff --git a/charts/aws-xray/README.md b/charts/aws-xray/README.md
index c63cd5b..0bd35e2 100644
--- a/charts/aws-xray/README.md
+++ b/charts/aws-xray/README.md
@@ -55,7 +55,7 @@ The following table lists the configurable parameters of the AWS X-Ray chart and
 | `xray.region`                        | AWS region you deploy AWS X-Ray to          | ``                                                         |
 | `xray.loglevel`                      | AWS X-Ray daemon log level                  | `prod`                                                     |
 | `xray.roleArn`                       | AWS IAM role to assume                      | ``                                                         |
-| `service.port`                       | Service UDP port                            | `2000`                                                     |
+| `service.port`                       | Service UDP and TCP port                    | `2000`                                                     |
 | `nodeSelector`                       | Node labels for pod assignment              | `{}`                                                       |
 | `tolerations`                        | List of node taints to tolerate             | `[]`                                                       |
 | `affinity`                           | Map of node/pod affinities                  | `{}`                                                       |
diff --git a/charts/aws-xray/templates/configmap.yaml b/charts/aws-xray/templates/configmap.yaml
index 7abf040..9f72044 100644
--- a/charts/aws-xray/templates/configmap.yaml
+++ b/charts/aws-xray/templates/configmap.yaml
@@ -21,6 +21,7 @@ data:
       # Change the address and port on which the daemon listens for UDP packets containing segment documents.
       # Make sure we listen on all IP's by default for the k8s setup
       UDPAddress: "0.0.0.0:2000"
+      TCPAddress: "0.0.0.0:2000"
     Logging:
       LogRotation: true
       # Change the log level, from most verbose to least: dev, debug, info, warn, error, prod (default).
diff --git a/charts/aws-xray/templates/daemonset.yaml b/charts/aws-xray/templates/daemonset.yaml
index 201f8e5..6d413df 100644
--- a/charts/aws-xray/templates/daemonset.yaml
+++ b/charts/aws-xray/templates/daemonset.yaml
@@ -38,6 +38,10 @@ spec:
           containerPort: 2000
           hostPort: 2000
           protocol: UDP
+        - name: xray-tcp
+          containerPort: 2000
+          hostPort: 2000
+          protocol: TCP
         volumeMounts:
         - name: config-volume
           mountPath: /aws/xray
diff --git a/charts/aws-xray/templates/service.yaml b/charts/aws-xray/templates/service.yaml
index d2890a8..37445a8 100644
--- a/charts/aws-xray/templates/service.yaml
+++ b/charts/aws-xray/templates/service.yaml
@@ -13,6 +13,9 @@ spec:
     - port: {{ .Values.service.port }}
       protocol: UDP
       name: incoming
+    - port: {{ .Values.service.port }}
+      protocol: TCP
+      name: xray-tcp
   selector:
     app.kubernetes.io/name: {{ include "aws-xray.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file