make changes from code review

Author: Jim Ryan

examples/custom-resources/transport-server-sni/README.md

@@ -1,14 +1,17 @@
 # TransportServer SNI
 
 In this example we create two different TransportServers that listen on the same interface, which are distinguished by their Host field.
+The applications (a TCP echo server, and MongoDB) will be accessed via `ncat` and `mongosh`.
+The `ncat` binary is available via `nmap`. On mac/linux this can be installed via homebrew/linuxbrew with `brew install nmap`
+`mongosh` installation instructions are [available here](https://www.mongodb.com/docs/mongodb-shell/install/).
 
 ## Create a GlobalConfiguration resource with the following listener
 
 ```yaml
-     listeners:
-      - name: tcp-listener
-        port: 7000 
-        protocol: TCP
+listeners:
+    - name: tcp-listener
+      port: 7000 
+      protocol: TCP
 ```
 
 ## Add a custom port to the NGINX Ingress Controller pod with the Helm chart
@@ -24,10 +27,10 @@ controller.customPorts:
 
 ```yaml
 controller.service.customPorts:
-          - name: tcp-port 
-            port: 7000 
-            protocol: TCP
-            targetPort: 7000 
+    - name: tcp-port 
+      port: 7000 
+      protocol: TCP
+      targetPort: 7000 
 ```
 
 ## Use `kubectl` to create the cafe-secret, and mongo-secret. These secrets are used for TLS in the TransportServers

examples/custom-resources/transport-server-sni/tcp-echo-server.yaml

@@ -18,10 +18,7 @@
          command: ["/bin/sh"]
          args:
          - -c
-         - |
-           apk add --no-cache socat
-           echo "TCP Echo Server starting..."
-           socat -v tcp-listen:7000,fork,reuseaddr,keepalive exec:'/bin/cat'
+         - nc -lk -p 7000 -e /bin/cat
          ports:
          - containerPort: 7000
 ---

internal/configs/version2/__snapshots__/templates_test.snap

@@ -8,7 +8,6 @@ upstream cafe-upstream {
 server {
     listen 1234 ssl;
     listen [::]:1234 ssl;
-
     server_name "cafe.example.com";
     ssl_certificate cafe-secret.pem;
     ssl_certificate_key cafe-secret.pem;
@@ -37,7 +36,6 @@ upstream cafe-upstream {
 server {
     listen 1234 ssl;
     listen [::]:1234 ssl;
-
     server_name "cafe.example.com";
     ssl_certificate cafe-secret.pem;
     ssl_certificate_key cafe-secret.pem;
@@ -161,7 +159,6 @@ server {
     listen 127.0.0.1:1234 ssl udp;
     listen [::1]:1234 ssl udp;
 
-    
     ssl_certificate cafe-secret.pem;
     ssl_certificate_key cafe-secret.pem;
 
@@ -207,7 +204,6 @@ server {
     listen 127.0.0.1:1234 ssl;
     listen [::1]:1234 ssl;
 
-    
     ssl_certificate cafe-secret.pem;
     ssl_certificate_key cafe-secret.pem;
 
@@ -7973,7 +7969,6 @@ server {
     listen 1234 ssl udp;
     listen [::]:1234 ssl udp;
 
-    
     ssl_certificate cafe-secret.pem;
     ssl_certificate_key cafe-secret.pem;
 

internal/configs/version2/nginx-plus.transportserver.tmpl

@@ -40,7 +40,7 @@ server {
     set_real_ip_from unix:;
         {{- else }}
     {{ makeTransportListener $s | printf }}
-    {{ makeServerName $s | printf }}
+    {{- with makeServerName $s }}{{ printf "\t%s" . }}{{- end }}
         {{- end }}
 
         {{- if $ssl.Enabled }}

internal/configs/version2/nginx.transportserver.tmpl

@@ -24,7 +24,7 @@ server {
     set_real_ip_from unix:;
         {{- else }}
     {{ makeTransportListener $s | printf }}
-    {{ makeServerName $s | printf }}
+    {{- with makeServerName $s }}{{ printf "\t%s" . }}{{- end }}
         {{- end }}
 
         {{- if $ssl.Enabled }}