removing todos

Author: rjdenney

cns/middlewares/k8sSwiftV2.go

@@ -38,7 +38,6 @@ var _ cns.IPConfigsHandlerMiddleware = (*K8sSWIFTv2Middleware)(nil)
 
 // IPConfigsRequestHandlerWrapper is the middleware function for handling SWIFT v2 IP configs requests for AKS-SWIFT. This function wrapped the default SWIFT request
 // and release IP configs handlers.
-// TODO: this will need to changed or add a new function to also work for a delegated NIC with multiple pods
 func (k *K8sSWIFTv2Middleware) IPConfigsRequestHandlerWrapper(defaultHandler, failureHandler cns.IPConfigsHandlerFunc) cns.IPConfigsHandlerFunc {
 	return func(ctx context.Context, req cns.IPConfigsRequest) (*cns.IPConfigsResponse, error) {
 		podInfo, respCode, message := k.validateIPConfigsRequest(ctx, &req)
@@ -53,11 +52,9 @@ func (k *K8sSWIFTv2Middleware) IPConfigsRequestHandlerWrapper(defaultHandler, fa
 		}
 		ipConfigsResp, err := defaultHandler(ctx, req)
 		// If the pod is not v2, return the response from the handler
-		// we need to add the secondary Interface. Our current POC cluster is returning here
 		if !req.SecondaryInterfacesExist {
 			return ipConfigsResp, err
 		}
-		// TODO: the pod itself won't be "V2" as we aren't using multitenancy pods
 		// If the pod is v2, get the infra IP configs from the handler first and then add the SWIFTv2 IP config
 		defer func() {
 			// Release the default IP config if there is an error
@@ -103,7 +100,6 @@ func (k *K8sSWIFTv2Middleware) IPConfigsRequestHandlerWrapper(defaultHandler, fa
 	}
 }
 
-// TODO: we will not be using multitenant pods. Need to look into what labels we are currently seeing and maybe compare to Vanilla swiftv2
 // For our purposes we would skip over this logic or need to replace it with something to check the delegated NIC
 // validateIPConfigsRequest validates if pod is multitenant by checking the pod labels, used in SWIFT V2 AKS scenario.
 // nolint

cns/middlewares/k8sSwiftV2_linux.go

@@ -18,9 +18,6 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 	var routes []cns.Route
 
 	switch podIPInfo.NICType {
-	// TODO: We may want to create a new type of NIC. Currently we are using delegated NICs but this set routes method only
-	// takes in for the multitenant scenario. We should have a new case that behaves similarly to InfraNIC but for a delegated NIC
-	// Q: Does the code currently see the kube pods as Infra or Delegated? They currently use the delegated pod subnet for IPs
 	case cns.DelegatedVMNIC:
 		virtualGWRoute := cns.Route{
 			IPAddress: fmt.Sprintf("%s/%d", virtualGW, prefixLength),
@@ -68,7 +65,6 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 			return errors.Wrapf(err, "failed to parse podIPConfig IP address %s", podIPInfo.PodIPConfig.IPAddress)
 		}
 
-		//This function is called per IP so we shouldn't have to worry about adding both v4 and v6 at once
 		if ip.Is4() {
 			routes = append(routes, addRoutes(podCIDRsV4, overlayGatewayv4)...)
 			routes = append(routes, addRoutes(serviceCIDRsV4, overlayGatewayv4)...)

cns/middlewares/k8sSwiftV2_windows.go

@@ -27,8 +27,6 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 
 // assignSubnetPrefixLengthFields will assign the subnet-prefix length to some fields of podipinfo
 // this is required for the windows scenario so that HNS programming is successful for pods
-// TODO: This is being used for the delegated NIC for Windows solution. Once we are testing Windows we will
-// Need to confirm that this assigns the whole pod subnet that we expect for both v4 and v6
 func (k *K8sSWIFTv2Middleware) assignSubnetPrefixLengthFields(podIPInfo *cns.PodIpInfo, interfaceInfo v1alpha1.InterfaceInfo, ip string) error {
 	// Parse MTPNC SubnetAddressSpace to get the subnet prefix length
 	subnet, subnetPrefix, err := utils.ParseIPAndPrefix(interfaceInfo.SubnetAddressSpace)

cns/restserver/ipam.go

@@ -283,7 +283,6 @@ func (service *HTTPRestService) RequestIPConfigsHandler(w http.ResponseWriter, r
 	}
 	var ipConfigsResp *cns.IPConfigsResponse
 
-	// TODO: Decide what middleware option we need to singetenancy swift v2
 	// Check if IPConfigsHandlerMiddleware is set
 	if service.IPConfigsHandlerMiddleware != nil {
 		// Wrap the default datapath handlers with the middleware depending on middleware type

cns/service/main.go

@@ -1404,7 +1404,6 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 
 	// Start building the NNC Reconciler
 
-	// TODO: We need to return the IPFamilies from the reconciler so that they can be added to the Service struct
 	// get CNS Node IP to compare NC Node IP with this Node IP to ensure NCs were created for this node
 	nodeIP := configuration.NodeIP()
 	nncReconciler := nncctrl.NewReconciler(httpRestServiceImplementation, poolMonitor, nodeIP)
@@ -1435,7 +1434,6 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 		}
 	}
 
-	// TODO: If we need special middleware this is where we would be setting it
 	if cnsconfig.EnableSwiftV2 {
 		if err := mtpncctrl.SetupWithManager(manager); err != nil {
 			return errors.Wrapf(err, "failed to setup mtpnc reconciler with manager")