Merge pull request #2277 from denis-tingaikin/actualize-interdoain-ex…

…amples-with-latest-changes

fix: Actualize interdomain examples with latest changes in interdomain

apps/nsmgr-proxy/nsmgr-proxy.yaml

@@ -57,6 +57,10 @@ spec:
           env:
             - name: NSM_OUTPUTPATH
               value: "/etc/mapip/config.yaml"
+            - name: NSM_NODENAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           volumeMounts:
             - name: mapip-volume
               mountPath: /etc/mapip

apps/registry-memory/registry-memory.yaml

@@ -22,7 +22,7 @@ spec:
             - name: REGISTRY_MEMORY_LISTEN_ON
               value: tcp://:5002
             - name: REGISTRY_MEMORY_PROXY_REGISTRY_URL
-              value: registry-proxy-svc:5003
+              value: nsmgr-proxy:5004
           imagePullPolicy: IfNotPresent
           name: registry
           ports:

examples/floating/dns/service.yaml

@@ -0,0 +1,31 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kube-dns
+  namespace: kube-system
+  annotations:
+    prometheus.io/port: "9153"
+    prometheus.io/scrape: "true"
+  labels:
+    k8s-app: kube-dns
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "CoreDNS"
+spec:
+  type: NodePort
+  selector:
+    k8s-app: kube-dns
+  clusterIP: 10.96.0.10
+  ports:
+  - name: dns
+    port: 53
+    nodePort: 30053
+    protocol: UDP
+  - name: dns-tcp
+    port: 53
+    nodePort: 30053
+    protocol: TCP
+  - name: metrics
+    port: 9153
+    protocol: TCP
+    nodePort: 30153

examples/floating/usecases/Kernel2Vxlan2Kernel/README.md

@@ -43,7 +43,7 @@ kind: Kustomization
 namespace: ${NAMESPACE1}
 
 bases:
-- ../../../apps/nse-kernel
+- ../../../../apps/nse-kernel
 
 patchesStrategicMerge:
 - patch-nse.yaml
@@ -60,16 +60,21 @@ metadata:
   name: nse-kernel
 spec:
   template:
+    metadata:
+      annotations:
+        registration-name: icmp-server@my.cluster3
     spec:
       containers:
         - name: nse
           env:
-            - name: NSM_CIDR_PREFIX
-              value: 172.16.1.2/31
-            - name: NSM_SERVICE_NAMES
-              value: icmp-responder@my.cluster3
-            - name: NSM_NAME
-              value: icmp-server@my.cluster3
+          - name: NSM_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.annotations['registration-name']
+          - name: NSM_CIDR_PREFIX
+            value: 172.16.1.2/31
+          - name: NSM_SERVICE_NAMES
+            value: icmp-responder@my.cluster3
 EOF
 ```
 
@@ -117,7 +122,7 @@ kind: Kustomization
 namespace: ${NAMESPACE2}
 
 bases:
-- ../../../apps/nsc-kernel
+- ../../../../apps/nsc-kernel
 
 patchesStrategicMerge:
 - patch-nsc.yaml
@@ -185,18 +190,18 @@ kubectl exec ${NSE} -n ${NAMESPACE1} -- ping -c 4 172.16.1.3
 
 ## Cleanup
 
-1. Cleanup resources for *cluster1*:
+1. Cleanup resources for *cluster2*:
 ```bash
-export KUBECONFIG=$KUBECONFIG1
+export KUBECONFIG=$KUBECONFIG2
 ```
 ```bash
-kubectl delete ns ${NAMESPACE2}
+kubectl delete ns ${NAMESPACE1}
 ```
 
-2. Cleanup resources for *cluster2*:
+2. Cleanup resources for *cluster1*:
 ```bash
-export KUBECONFIG=$KUBECONFIG2
+export KUBECONFIG=$KUBECONFIG1
 ```
 ```bash
-kubectl delete ns ${NAMESPACE1}
-```
+kubectl delete ns ${NAMESPACE2}
+```

examples/interdomain/basic/README.md

@@ -1,5 +1,10 @@
 # Basic interdomain examples
 
+The NSM interdomain functionality provides the ability for clients in one domain to connect to endpoints in another domain. Each domain has its own installation of NSM and domain specific configuration such that all the NSM control-planes are able to communicate with the NSM components required for connection setup.
+
+
+![NSM interdomain Scheme](./interdomain_concept.png "NSM interdomain Scheme")
+
 
 ## Requires