Portmapping support related modifications

genie/genie-controller.go

@@ -368,7 +368,7 @@ func (gc *GenieController) delegateAddNetwork(pluginInfo *utils.PluginInfo, cniA
 	if err := os.Unsetenv("CNI_ARGS"); err != nil {
 		fmt.Fprintf(os.Stderr, "CNI Genie Error while unsetting env variable CNI_Args: %v\n", err)
 	}
-	rtConf, err := runtimeConf(cniArgs, pluginInfo.IfName, pluginInfo.OptionalArgs)
+	rtConf, err := runtimeConf(cniArgs, pluginInfo.IfName, pluginInfo.OptionalArgs, pluginInfo.RuntimeConfig)
 	if err != nil {
 		return nil, fmt.Errorf("Error generating runtime conf: %v", err)
 	}
@@ -411,7 +411,7 @@ func (gc *GenieController) deleteNetwork(pluginElements []*utils.PluginInfo, cni
 }
 
 func (gc *GenieController) delegateDelNetwork(pluginInfo *utils.PluginInfo, cniArgs *utils.CNIArgs) error {
-	rtConf, err := runtimeConf(cniArgs, pluginInfo.IfName, pluginInfo.OptionalArgs)
+	rtConf, err := runtimeConf(cniArgs, pluginInfo.IfName, pluginInfo.OptionalArgs, pluginInfo.RuntimeConfig)
 	if err != nil {
 		return fmt.Errorf("CNI Genie couldn't convert cniArgs to RuntimeConf: %v", err)
 	}
@@ -794,7 +794,7 @@ func (gc *GenieController) getK8sPodAnnotations(k8sArgs *utils.K8sArgs) (map[str
 	return pod.Annotations, nil
 }
 
-func runtimeConf(cniArgs *utils.CNIArgs, iface string, optionalArgs map[string]string) (*libcni.RuntimeConf, error) {
+func runtimeConf(cniArgs *utils.CNIArgs, iface string, optionalArgs map[string]string, runtimeConfig *utils.RuntimeConfig) (*libcni.RuntimeConf, error) {
 	k8sArgs, err := loadArgs(cniArgs)
 	if err != nil {
 		return nil, err
@@ -815,11 +815,20 @@ func runtimeConf(cniArgs *utils.CNIArgs, iface string, optionalArgs map[string]s
 
 	args = append(args, setOptionalArgs(optionalArgs)...)
 
-	return &libcni.RuntimeConf{
+	rt := &libcni.RuntimeConf{
 		ContainerID: cniArgs.ContainerID,
 		NetNS:       cniArgs.Netns,
 		IfName:      iface,
-		Args:        args}, nil
+		Args:        args}
+
+	if runtimeConfig != nil {
+		rt.CapabilityArgs = map[string]interface{}{
+			"portMappings": runtimeConfig.PortMapEntries,
+		}
+		fmt.Fprintf(os.Stderr, "CNI Genie runtime config = %v\n", rt.CapabilityArgs)
+	}
+
+	return rt, nil
 }
 
 func setOptionalArgs(optionalParam map[string]string) [][2]string {
@@ -830,6 +839,7 @@ func setOptionalArgs(optionalParam map[string]string) [][2]string {
 	if optionalParam["mac"] != "" {
 		args = append(args, [2]string{"MAC", optionalParam["mac"]})
 	}
+
 	return args
 }
 

genie/genie-netattachdef-controller.go

@@ -40,6 +40,9 @@ func (gc *GenieController) parseNetAttachDefAnnot(annot string, k8sArgs *utils.K
 			return nil, err
 		}
 
+		pluginInfo.RuntimeConfig = netElem.RuntimeConfig
+		fmt.Fprintf(os.Stderr, "CNI Genie runtime config : %+v\n", pluginInfo.RuntimeConfig)
+
 		pluginInfo.OptionalArgs = make(map[string]string, 0)
 
 		if len(netElem.IPs) > 0 {

networkcrd/types.go

@@ -1,6 +1,7 @@
 package networkcrd
 
 import (
+	"github.com/cni-genie/CNI-Genie/utils"
 	"github.com/containernetworking/cni/pkg/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -51,6 +52,10 @@ type NetworkSelectionElement struct {
 	// to the container by this network attachment
 	// +optional
 	Interface string `json:"interface,omitempty"`
+
+	//Runtime configuration to be passed to CNI
+	// +optional
+	RuntimeConfig *utils.RuntimeConfig `json:"runtimeConfig,omitempty"`
 }
 
 // NetworkStatus describes the status to be updated in pod
@@ -61,4 +66,4 @@ type NetworkStatus struct {
 	Mac       string    `json:"mac,omitempty"`
 	Default   bool      `json:"default,omitempty"`
 	DNS       types.DNS `json:"dns,omitempty"`
-}
+}

utils/types.go

@@ -155,6 +155,18 @@ type PhysicalNetworkList struct {
 
 type ValidateResult func(types.Result, interface{}) error
 
+// RuntimeConfig specifies CNI RuntimeConfig
+type RuntimeConfig struct {
+	PortMapEntries []PortMapping `json:"portMappings,omitempty"`
+}
+
+// PortMapping for CNI
+type PortMapping struct {
+	HostPort      int    `json:"hostPort"`
+	ContainerPort int    `json:"containerPort"`
+	Protocol      string `json:"protocol"`
+}
+
 // PluginInfo describes the details of plugin info for user pod
 type PluginInfo struct {
 	PluginName       string
@@ -163,6 +175,7 @@ type PluginInfo struct {
 	Refer_nic        string
 	Config           *libcni.NetworkConfigList
 	OptionalArgs     map[string]string
+	RuntimeConfig    *RuntimeConfig
 	ValidationParams interface{}
 	ValidateRes      ValidateResult
 }