Use ns/pod-name pattern for node id

utilitywarehouse · Nov 28, 2023 · a91f364 · a91f364
1 parent fe378bc
commit a91f364
Showing 1 changed file with 22 additions and 2 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
@@ -37,7 +37,17 @@ spec:
                     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":"\$(POD_NAMESPACE)/\$(POD_NAME)",
+                          "Locality":{}}
+                      }
           containers:
             - (name): "*"
               env:
@@ -51,4 +61,14 @@ spec:
                     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.namespace }}/{{ request.object.metadata.name }}",
+                          "Locality":{}}
+                      }