Skip to content

Adding PortMapping support to Azure cni for Windows (Rebase). #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2018
Merged

Adding PortMapping support to Azure cni for Windows (Rebase). #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 43 additions & 40 deletions cni/azure-windows.conflist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,46 @@
{
"cniVersion":"0.3.0",
"name":"azure",
"plugins":[
{
"type":"azure-vnet",
"mode":"bridge",
"bridge":"azure0",
"ipam":{
"type":"azure-vnet-ipam"
},
"dns":{
"Nameservers":[
"10.0.0.10",
"168.63.129.16"
],
"Search":[
"svc.cluster.local"
]
},
"AdditionalArgs":[
{
"Name":"EndpointPolicy",
"Value":{
"Type":"OutBoundNAT",
"ExceptionList":[
"10.240.0.0/16",
"10.0.0.0/8"
]
}
"cniVersion": "0.3.0",
"name": "azure",
"plugins": [
{
"type": "azure-vnet",
"mode": "bridge",
"bridge": "azure0",
"capabilities": {
"portMappings": true
},
"ipam": {
"type": "azure-vnet-ipam"
},
{
"Name":"EndpointPolicy",
"Value":{
"Type":"ROUTE",
"DestinationPrefix":"10.0.0.0/8",
"NeedEncap":true
}
}
]
}
]
"dns": {
"Nameservers": [
"10.0.0.10",
"168.63.129.16"
],
"Search": [
"svc.cluster.local"
]
},
"AdditionalArgs": [
{
"Name": "EndpointPolicy",
"Value": {
"Type": "OutBoundNAT",
"ExceptionList": [
"10.240.0.0/16",
"10.0.0.0/8"
]
}
},
{
"Name": "EndpointPolicy",
"Value": {
"Type": "ROUTE",
"DestinationPrefix": "10.0.0.0/8",
"NeedEncap": true
}
}
]
}
]
}
14 changes: 13 additions & 1 deletion cni/netconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ type KVPair struct {
Value json.RawMessage `json:"value"`
}

type PortMapping struct {
HostPort int `json:"hostPort"`
ContainerPort int `json:"containerPort"`
Protocol string `json:"protocol"`
HostIp string `json:"hostIP,omitempty"`
}

type RuntimeConfig struct {
PortMappings []PortMapping `json:"portMappings,omitempty"`
}

// NetworkConfig represents Azure CNI plugin network configuration.
type NetworkConfig struct {
CNIVersion string `json:"cniVersion"`
Expand All @@ -45,7 +56,8 @@ type NetworkConfig struct {
Address string `json:"ipAddress,omitempty"`
QueryInterval string `json:"queryInterval,omitempty"`
}
DNS cniTypes.DNS `json:"dns"`
DNS cniTypes.DNS `json:"dns"`
RuntimeConfig RuntimeConfig `json:"runtimeConfig"`
AdditionalArgs []KVPair
}

Expand Down
5 changes: 5 additions & 0 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,11 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
DNS: epDNSInfo,
Policies: policies,
}

epPolicies := getPoliciesFromRuntimeCfg(nwCfg)
for _, epPolicy := range epPolicies {
epInfo.Policies = append(epInfo.Policies, epPolicy)
}

// Populate addresses.
for _, ipconfig := range result.IPs {
Expand Down
7 changes: 7 additions & 0 deletions cni/network/network_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/Azure/azure-container-networking/cns"
"github.com/Azure/azure-container-networking/log"
"github.com/Azure/azure-container-networking/network"
"github.com/Azure/azure-container-networking/network/policy"
cniTypes "github.com/containernetworking/cni/pkg/types"
cniTypesCurr "github.com/containernetworking/cni/pkg/types/current"
)
Expand Down Expand Up @@ -101,3 +102,9 @@ func getNetworkDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result
func getEndpointDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Result, namespace string) (network.DNSInfo, error) {
return getNetworkDNSSettings(nwCfg, result, namespace)
}

// getPoliciesFromRuntimeCfg returns network policies from network config.
// getPoliciesFromRuntimeCfg is a dummy function for Linux platform.
func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig) []policy.Policy {
return nil
}
26 changes: 26 additions & 0 deletions cni/network/network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package network

import (
"encoding/json"
"fmt"
"net"
"strings"
Expand All @@ -9,6 +10,7 @@ import (
"github.com/Azure/azure-container-networking/cns"
"github.com/Azure/azure-container-networking/log"
"github.com/Azure/azure-container-networking/network"
"github.com/Azure/azure-container-networking/network/policy"
"github.com/Microsoft/hcsshim"

cniTypes "github.com/containernetworking/cni/pkg/types"
Expand Down Expand Up @@ -120,3 +122,27 @@ func getEndpointDNSSettings(nwCfg *cni.NetworkConfig, result *cniTypesCurr.Resul

return epDNS, nil
}

// getPoliciesFromRuntimeCfg returns network policies from network config.
func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig) []policy.Policy {
log.Printf("[net] RuntimeConfigs: %+v", nwCfg.RuntimeConfig)
var policies []policy.Policy
for _, mapping := range nwCfg.RuntimeConfig.PortMappings {
rawPolicy, _ := json.Marshal(&hcsshim.NatPolicy{
Type: "NAT",
ExternalPort: uint16(mapping.HostPort),
InternalPort: uint16(mapping.ContainerPort),
Protocol: mapping.Protocol,
})

policy := policy.Policy{
Type: policy.EndpointPolicy,
Data: rawPolicy,
}
log.Printf("[net] Creating port mapping policy: %+v", policy)

policies = append(policies, policy)
}

return policies
}