fix: set correct orchestratorType and orchestratorContext

cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler.go

@@ -2,6 +2,7 @@ package multitenantoperator
 
 import (
 	"context"
+	"encoding/json"
 	"net"
 	"strings"
 
@@ -88,6 +89,17 @@ func (r *multiTenantCrdReconciler) Reconcile(request reconcile.Request) (reconci
 		return ctrl.Result{}, err
 	}
 
+	// Parse KubernetesPodInfo as orchestratorContext.
+	podInfo := cns.KubernetesPodInfo{
+		PodName:      nc.Name,
+		PodNamespace: nc.Namespace,
+	}
+	orchestratorContext, err := json.Marshal(podInfo)
+	if err != nil {
+		logger.Errorf("Failed to marshal podInfo (%v): %v", podInfo, err)
+		return ctrl.Result{}, err
+	}
+
 	// Persist NC states into CNS.
 	_, ipNet, err := net.ParseCIDR(nc.Status.IPSubnet)
 	if err != nil {
@@ -96,7 +108,8 @@ func (r *multiTenantCrdReconciler) Reconcile(request reconcile.Request) (reconci
 	}
 	prefixLength, _ := ipNet.Mask.Size()
 	networkContainerRequest := cns.CreateNetworkContainerRequest{
-		NetworkContainerid: nc.Spec.UUID,
+		NetworkContainerid:  nc.Spec.UUID,
+		OrchestratorContext: orchestratorContext,
 		IPConfiguration: cns.IPConfiguration{
 			IPSubnet: cns.IPSubnet{
 				IPAddress:    nc.Status.IP,

cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go

@@ -1,6 +1,7 @@
 package multitenantoperator
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/Azure/azure-container-networking/cns"
@@ -138,6 +139,10 @@ var _ = Describe("multiTenantCrdReconciler", func() {
 		It("Should succeed when the NC subnet is in correct format", func() {
 			var uuid = "uuid"
 			var nc ncapi.MultiTenantNetworkContainer = ncapi.MultiTenantNetworkContainer{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      namespacedName.Name,
+					Namespace: namespacedName.Namespace,
+				},
 				Spec: ncapi.MultiTenantNetworkContainerSpec{
 					UUID: uuid,
 				},
@@ -146,13 +151,31 @@ var _ = Describe("multiTenantCrdReconciler", func() {
 					IPSubnet: "1.2.3.0/24",
 				},
 			}
+
+			orchestratorContext, err := json.Marshal(cns.KubernetesPodInfo{
+				PodName:      namespacedName.Name,
+				PodNamespace: namespacedName.Namespace,
+			})
+			Expect(err).To(BeNil())
+			var networkContainerRequest = cns.CreateNetworkContainerRequest{
+				NetworkContainerid:  nc.Spec.UUID,
+				OrchestratorContext: orchestratorContext,
+				IPConfiguration: cns.IPConfiguration{
+					IPSubnet: cns.IPSubnet{
+						IPAddress:    nc.Status.IP,
+						PrefixLength: uint8(24),
+					},
+					GatewayIPAddress: nc.Status.Gateway,
+				},
+			}
+
 			kubeClient.EXPECT().Get(gomock.Any(), namespacedName, gomock.Any()).SetArg(2, nc)
 			statusWriter := mockclients.NewMockStatusWriter(mockCtl)
 			statusWriter.EXPECT().Update(gomock.Any(), gomock.Any()).Return(nil)
 			kubeClient.EXPECT().Status().Return(statusWriter)
 			cnsClient.EXPECT().GetNC(cns.GetNetworkContainerRequest{NetworkContainerid: uuid}).Return(cns.GetNetworkContainerResponse{}, fmt.Errorf("NotFound"))
-			cnsClient.EXPECT().CreateOrUpdateNC(gomock.Any()).Return(nil)
-			_, err := reconciler.Reconcile(reconcile.Request{
+			cnsClient.EXPECT().CreateOrUpdateNC(networkContainerRequest).Return(nil)
+			_, err = reconciler.Reconcile(reconcile.Request{
 				NamespacedName: namespacedName,
 			})
 			Expect(err).To(BeNil())

cns/service/main.go

@@ -718,7 +718,7 @@ func InitializeMultiTenantController(httpRestService cns.HTTPService, cnsconfig
 
 	// Set orchestrator type
 	orchestrator := cns.SetOrchestratorTypeRequest{
-		OrchestratorType: cns.KubernetesCRD,
+		OrchestratorType: cns.Kubernetes,
 	}
 	httpRestServiceImpl.SetNodeOrchestrator(&orchestrator)