From e4393ab4ad39ec63c0a2da8aa15890fe519c5ac8 Mon Sep 17 00:00:00 2001
From: ffilippopoulos <ffilippopoulos@uw.co.uk>
Date: Tue, 28 Nov 2023 08:41:30 +0000
Subject: [PATCH] Use ns/pod-name pattern for node id

Kyverno doesn't seem to work when escaping 2 env vars in the same string
and leaves a / which behind messes with the env var substitution from
kubernetes. Similarly `request.object.metadata.name` doesn't seem to be
available when creating pods via a replication controller. Thus using
both env vars and kyverno vars to achieve a node id pattern of:
`namespace/pod_name`.
---
 .../mutate-semaphore-xds-clients-env.yaml     | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/deploy/kustomize/kyverno/mutate/mutate-semaphore-xds-clients-env.yaml b/deploy/kustomize/kyverno/mutate/mutate-semaphore-xds-clients-env.yaml
index 62dd862..6945560 100644
--- a/deploy/kustomize/kyverno/mutate/mutate-semaphore-xds-clients-env.yaml
+++ b/deploy/kustomize/kyverno/mutate/mutate-semaphore-xds-clients-env.yaml
@@ -31,13 +31,19 @@ spec:
                 valueFrom:
                   fieldRef:
                     fieldPath: metadata.name
-              - name: POD_NAMESPACE
-                valueFrom:
-                  fieldRef:
-                    fieldPath: metadata.namespace
               - name: GRPC_XDS_BOOTSTRAP_CONFIG
                 value: >-
-                  {"xds_servers": [{"server_uri": "semaphore-xds.sys-semaphore.svc.cluster.local:18000", "channel_creds": [{"type": "insecure"}], "server_features": ["xds_v3"]}], "node":{"id":"\$(POD_NAME)-\$(POD_NAMESPACE)", "Locality":{}}}
+                  {
+                    "xds_servers":
+                      [{
+                        "server_uri": "semaphore-xds.sys-semaphore.svc.cluster.local:18000",
+                        "channel_creds": [{"type": "insecure"}],
+                        "server_features": ["xds_v3"]}
+                      ],
+                        "node":{
+                          "id":"{{request.object.metadata.namespace}}/\$(POD_NAME)",
+                          "Locality":{}}
+                      }
           containers:
             - (name): "*"
               env:
@@ -45,10 +51,16 @@ spec:
                 valueFrom:
                   fieldRef:
                     fieldPath: metadata.name
-              - name: POD_NAMESPACE
-                valueFrom:
-                  fieldRef:
-                    fieldPath: metadata.namespace
               - name: GRPC_XDS_BOOTSTRAP_CONFIG
                 value: >- 
-                  {"xds_servers": [{"server_uri": "semaphore-xds.sys-semaphore.svc.cluster.local:18000", "channel_creds": [{"type": "insecure"}], "server_features": ["xds_v3"]}], "node":{"id":"\$(POD_NAME)-\$(POD_NAMESPACE)", "locality":{}}}
+                  {
+                    "xds_servers":
+                      [{
+                        "server_uri": "semaphore-xds.sys-semaphore.svc.cluster.local:18000",
+                        "channel_creds": [{"type": "insecure"}],
+                        "server_features": ["xds_v3"]}
+                      ],
+                        "node":{
+                          "id":"{{request.object.metadata.namespace}}/\$(POD_NAME)",
+                          "Locality":{}}
+                      }