github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #64973 from nokia/k8s-sctp 

Automatic merge from submit-queue (batch tested with PRs 67694, 64973, 67902). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

SCTP support implementation for Kubernetes

**What this PR does / why we need it**: This PR adds SCTP support to Kubernetes, including Service, Endpoint, and NetworkPolicy.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #44485

**Special notes for your reviewer**:

**Release note**:

```release-note

SCTP is now supported as additional protocol (alpha) alongside TCP and UDP in Pod, Service, Endpoint, and NetworkPolicy.  

```
pull/8/head
Kubernetes Submit Queue 2018-08-28 07:21:18 -07:00 committed by GitHub
parent 4007eed73e 5c7cc971f7
commit 2eb14e3007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
86 changed files with 1079 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/openapi-spec/swagger.json generated
View File

@ -80650,7 +80650,7 @@
"type": "string" "type": "string"
}, },
"protocol": { "protocol": {
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\".", "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\".",
"type": "string" "type": "string"
} }
} }
@ -80897,7 +80897,7 @@
"format": "int32" "format": "int32"
}, },
"protocol": { "protocol": {
"description": "The IP protocol for this port. Must be UDP or TCP. Default is TCP.", "description": "The IP protocol for this port. Must be UDP, TCP, or SCTP. Default is TCP.",
"type": "string" "type": "string"
} }
} }
@ -84386,7 +84386,7 @@
"format": "int32" "format": "int32"
}, },
"protocol": { "protocol": {
"description": "The IP protocol for this port. Supports \"TCP\" and \"UDP\". Default is TCP.", "description": "The IP protocol for this port. Supports \"TCP\", \"UDP\", and \"SCTP\". Default is TCP.",
"type": "string" "type": "string"
}, },
"targetPort": { "targetPort": {
@ -85882,7 +85882,7 @@
"$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString"
}, },
"protocol": { "protocol": {
"description": "Optional. The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP.", "description": "Optional. The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP.",
"type": "string" "type": "string"
} }
} }
@ -86553,7 +86553,7 @@
"$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString"
}, },
"protocol": { "protocol": {
"description": "The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP.", "description": "The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP.",
"type": "string" "type": "string"
} }
} }

2
api/swagger-spec/apps_v1.json generated
View File

@ -8018,7 +8018,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

2
api/swagger-spec/apps_v1beta1.json generated
View File

@ -5626,7 +5626,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

2
api/swagger-spec/apps_v1beta2.json generated
View File

@ -8018,7 +8018,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

2
api/swagger-spec/batch_v1.json generated
View File

@ -2933,7 +2933,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

2
api/swagger-spec/batch_v1beta1.json generated
View File

@ -2988,7 +2988,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

2
api/swagger-spec/batch_v2alpha1.json generated
View File

@ -2988,7 +2988,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

4
api/swagger-spec/extensions_v1beta1.json generated
View File

@ -8666,7 +8666,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",
@ -10280,7 +10280,7 @@
"properties": { "properties": {
"protocol": { "protocol": {
"$ref": "v1.Protocol", "$ref": "v1.Protocol",
"description": "Optional. The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP." "description": "Optional. The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP."
}, },
"port": { "port": {
"type": "string", "type": "string",

2
api/swagger-spec/networking.k8s.io_v1.json generated
View File

@ -1426,7 +1426,7 @@
"properties": { "properties": {
"protocol": { "protocol": {
"$ref": "v1.Protocol", "$ref": "v1.Protocol",
"description": "The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP." "description": "The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP."
}, },
"port": { "port": {
"type": "string", "type": "string",

6
api/swagger-spec/v1.json generated
View File

@ -18480,7 +18480,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "The IP protocol for this port. Must be UDP or TCP. Default is TCP." "description": "The IP protocol for this port. Must be UDP, TCP, or SCTP. Default is TCP."
} }
} }
}, },
@ -21466,7 +21466,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\"." "description": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\"."
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",
@ -23091,7 +23091,7 @@
}, },
"protocol": { "protocol": {
"type": "string", "type": "string",
"description": "The IP protocol for this port. Supports \"TCP\" and \"UDP\". Default is TCP." "description": "The IP protocol for this port. Supports \"TCP\", \"UDP\", and \"SCTP\". Default is TCP."
}, },
"port": { "port": {
"type": "integer", "type": "integer",

6
cluster/gce/gci/configure-helper.sh
View File

@ -51,18 +51,20 @@ function config-ip-firewall {
sysctl -w net.ipv4.conf.all.route_localnet=1 sysctl -w net.ipv4.conf.all.route_localnet=1
# The GCI image has host firewall which drop most inbound/forwarded packets. # The GCI image has host firewall which drop most inbound/forwarded packets.
# We need to add rules to accept all TCP/UDP/ICMP packets. # We need to add rules to accept all TCP/UDP/ICMP/SCTP packets.
if iptables -w -L INPUT | grep "Chain INPUT (policy DROP)" > /dev/null; then if iptables -w -L INPUT | grep "Chain INPUT (policy DROP)" > /dev/null; then
echo "Add rules to accept all inbound TCP/UDP/ICMP packets" echo "Add rules to accept all inbound TCP/UDP/ICMP packets"
iptables -A INPUT -w -p TCP -j ACCEPT iptables -A INPUT -w -p TCP -j ACCEPT
iptables -A INPUT -w -p UDP -j ACCEPT iptables -A INPUT -w -p UDP -j ACCEPT
iptables -A INPUT -w -p ICMP -j ACCEPT iptables -A INPUT -w -p ICMP -j ACCEPT
iptables -A INPUT -w -p SCTP -j ACCEPT
fi fi
if iptables -w -L FORWARD | grep "Chain FORWARD (policy DROP)" > /dev/null; then if iptables -w -L FORWARD | grep "Chain FORWARD (policy DROP)" > /dev/null; then
echo "Add rules to accept all forwarded TCP/UDP/ICMP packets" echo "Add rules to accept all forwarded TCP/UDP/ICMP/SCTP packets"
iptables -A FORWARD -w -p TCP -j ACCEPT iptables -A FORWARD -w -p TCP -j ACCEPT
iptables -A FORWARD -w -p UDP -j ACCEPT iptables -A FORWARD -w -p UDP -j ACCEPT
iptables -A FORWARD -w -p ICMP -j ACCEPT iptables -A FORWARD -w -p ICMP -j ACCEPT
iptables -A FORWARD -w -p SCTP -j ACCEPT
fi fi
# Flush iptables nat table # Flush iptables nat table

2
cmd/kube-proxy/app/server.go
View File

@ -339,7 +339,7 @@ func NewProxyCommand() *cobra.Command {
Use: "kube-proxy", Use: "kube-proxy",
Long: `The Kubernetes network proxy runs on each node. This Long: `The Kubernetes network proxy runs on each node. This
reflects services as defined in the Kubernetes API on each node and can do simple reflects services as defined in the Kubernetes API on each node and can do simple
TCP and UDP stream forwarding or round robin TCP and UDP forwarding across a set of backends. TCP, UDP, and SCTP stream forwarding or round robin TCP, UDP, and SCTP forwarding across a set of backends.
Service cluster IPs and ports are currently found through Docker-links-compatible Service cluster IPs and ports are currently found through Docker-links-compatible
environment variables specifying ports opened by the service proxy. There is an optional environment variables specifying ports opened by the service proxy. There is an optional
addon that provides cluster DNS for these cluster IPs. The user must create a service addon that provides cluster DNS for these cluster IPs. The user must create a service

2
docs/api-reference/apps/v1/definitions.html generated
View File

@ -4085,7 +4085,7 @@ When an object is created, the system will populate this list with the current s
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
docs/api-reference/apps/v1beta1/definitions.html generated
View File

@ -4138,7 +4138,7 @@ The StatefulSet guarantees that a given network identity will always map to the
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
docs/api-reference/apps/v1beta2/definitions.html generated
View File

@ -4754,7 +4754,7 @@ The StatefulSet guarantees that a given network identity will always map to the
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
docs/api-reference/batch/v1/definitions.html generated
View File

@ -3418,7 +3418,7 @@ When an object is created, the system will populate this list with the current s
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
docs/api-reference/batch/v1beta1/definitions.html generated
View File

@ -3452,7 +3452,7 @@ When an object is created, the system will populate this list with the current s
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
docs/api-reference/batch/v2alpha1/definitions.html generated
View File

@ -3425,7 +3425,7 @@ When an object is created, the system will populate this list with the current s
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

4
docs/api-reference/extensions/v1beta1/definitions.html generated
View File

@ -4784,7 +4784,7 @@ When an object is created, the system will populate this list with the current s
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
@ -8058,7 +8058,7 @@ If PodSelector is also set, then the NetworkPolicyPeer as a whole selects the Po
<tbody> <tbody>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Optional. The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_protocol">v1.Protocol</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_protocol">v1.Protocol</a></p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
docs/api-reference/networking.k8s.io/v1/definitions.html generated
View File

@ -676,7 +676,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tbody> <tbody>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_protocol">v1.Protocol</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_protocol">v1.Protocol</a></p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

6
docs/api-reference/v1/definitions.html generated
View File

@ -2780,7 +2780,7 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP or TCP. Defaults to "TCP".</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
@ -3770,7 +3770,7 @@ Examples:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The IP protocol for this port. Must be UDP or TCP. Default is TCP.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">The IP protocol for this port. Must be UDP, TCP, or SCTP. Default is TCP.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
@ -4405,7 +4405,7 @@ Examples:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">protocol</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The IP protocol for this port. Supports "TCP" and "UDP". Default is TCP.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">The IP protocol for this port. Supports "TCP", "UDP", and "SCTP". Default is TCP.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

2
pkg/apis/core/fuzzer/fuzzer.go
View File

@ -263,7 +263,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
*d = policies[c.Rand.Intn(len(policies))] *d = policies[c.Rand.Intn(len(policies))]
}, },
func(p *core.Protocol, c fuzz.Continue) { func(p *core.Protocol, c fuzz.Continue) {
protocols := []core.Protocol{core.ProtocolTCP, core.ProtocolUDP} protocols := []core.Protocol{core.ProtocolTCP, core.ProtocolUDP, core.ProtocolSCTP}
*p = protocols[c.Rand.Intn(len(protocols))] *p = protocols[c.Rand.Intn(len(protocols))]
}, },
func(p *core.ServiceAffinity, c fuzz.Continue) { func(p *core.ServiceAffinity, c fuzz.Continue) {

6
pkg/apis/core/types.go
View File

@ -564,6 +564,8 @@ const (
ProtocolTCP Protocol = "TCP" ProtocolTCP Protocol = "TCP"
// ProtocolUDP is the UDP protocol. // ProtocolUDP is the UDP protocol.
ProtocolUDP Protocol = "UDP" ProtocolUDP Protocol = "UDP"
// ProtocolSCTP is the SCTP protocol.
ProtocolSCTP Protocol = "SCTP"
) )
// Represents a Persistent Disk resource in Google Compute Engine. // Represents a Persistent Disk resource in Google Compute Engine.
@ -1570,7 +1572,7 @@ type ContainerPort struct {
HostPort int32 HostPort int32
// Required: This must be a valid port number, 0 < x < 65536. // Required: This must be a valid port number, 0 < x < 65536.
ContainerPort int32 ContainerPort int32
// Required: Supports "TCP" and "UDP". // Required: Supports "TCP", "UDP" and "SCTP"
// +optional // +optional
Protocol Protocol Protocol Protocol
// Optional: What host IP to bind the external port to. // Optional: What host IP to bind the external port to.
@ -3175,7 +3177,7 @@ type ServicePort struct {
// the 'Name' field in EndpointPort objects. // the 'Name' field in EndpointPort objects.
Name string Name string
// The IP protocol for this port. Supports "TCP" and "UDP". // The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
Protocol Protocol Protocol Protocol
// The port that will be exposed on the service. // The port that will be exposed on the service.

14
pkg/apis/core/validation/validation.go
View File

@ -1918,7 +1918,7 @@ func ValidatePersistentVolumeClaimStatusUpdate(newPvc, oldPvc *core.PersistentVo
return allErrs return allErrs
} }
var supportedPortProtocols = sets.NewString(string(core.ProtocolTCP), string(core.ProtocolUDP)) var supportedPortProtocols = sets.NewString(string(core.ProtocolTCP), string(core.ProtocolUDP), string(core.ProtocolSCTP))
func validateContainerPorts(ports []core.ContainerPort, fldPath *field.Path) field.ErrorList { func validateContainerPorts(ports []core.ContainerPort, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
@ -1951,6 +1951,8 @@ func validateContainerPorts(ports []core.ContainerPort, fldPath *field.Path) fie
} }
if len(port.Protocol) == 0 { if len(port.Protocol) == 0 {
allErrs = append(allErrs, field.Required(idxPath.Child("protocol"), "")) allErrs = append(allErrs, field.Required(idxPath.Child("protocol"), ""))
} else if !utilfeature.DefaultFeatureGate.Enabled(features.SCTPSupport) && port.Protocol == core.ProtocolSCTP {
allErrs = append(allErrs, field.NotSupported(idxPath.Child("protocol"), port.Protocol, []string{string(core.ProtocolTCP), string(core.ProtocolUDP)}))
} else if !supportedPortProtocols.Has(string(port.Protocol)) { } else if !supportedPortProtocols.Has(string(port.Protocol)) {
allErrs = append(allErrs, field.NotSupported(idxPath.Child("protocol"), port.Protocol, supportedPortProtocols.List())) allErrs = append(allErrs, field.NotSupported(idxPath.Child("protocol"), port.Protocol, supportedPortProtocols.List()))
} }
@ -3751,8 +3753,10 @@ func ValidateService(service *core.Service) field.ErrorList {
includeProtocols := sets.NewString() includeProtocols := sets.NewString()
for i := range service.Spec.Ports { for i := range service.Spec.Ports {
portPath := portsPath.Index(i) portPath := portsPath.Index(i)
if !supportedPortProtocols.Has(string(service.Spec.Ports[i].Protocol)) { if !utilfeature.DefaultFeatureGate.Enabled(features.SCTPSupport) && service.Spec.Ports[i].Protocol == core.ProtocolSCTP {
allErrs = append(allErrs, field.Invalid(portPath.Child("protocol"), service.Spec.Ports[i].Protocol, "cannot create an external load balancer with non-TCP/UDP ports")) allErrs = append(allErrs, field.NotSupported(portPath.Child("protocol"), service.Spec.Ports[i].Protocol, []string{string(core.ProtocolTCP), string(core.ProtocolUDP)}))
} else if !supportedPortProtocols.Has(string(service.Spec.Ports[i].Protocol)) {
allErrs = append(allErrs, field.Invalid(portPath.Child("protocol"), service.Spec.Ports[i].Protocol, "cannot create an external load balancer with non-TCP/UDP/SCTP ports"))
} else { } else {
includeProtocols.Insert(string(service.Spec.Ports[i].Protocol)) includeProtocols.Insert(string(service.Spec.Ports[i].Protocol))
} }
@ -3850,6 +3854,8 @@ func validateServicePort(sp *core.ServicePort, requireName, isHeadlessService bo
if len(sp.Protocol) == 0 { if len(sp.Protocol) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("protocol"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("protocol"), ""))
} else if !utilfeature.DefaultFeatureGate.Enabled(features.SCTPSupport) && sp.Protocol == core.ProtocolSCTP {
allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), sp.Protocol, []string{string(core.ProtocolTCP), string(core.ProtocolUDP)}))
} else if !supportedPortProtocols.Has(string(sp.Protocol)) { } else if !supportedPortProtocols.Has(string(sp.Protocol)) {
allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), sp.Protocol, supportedPortProtocols.List())) allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), sp.Protocol, supportedPortProtocols.List()))
} }
@ -5219,6 +5225,8 @@ func validateEndpointPort(port *core.EndpointPort, requireName bool, fldPath *fi
} }
if len(port.Protocol) == 0 { if len(port.Protocol) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("protocol"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("protocol"), ""))
} else if !utilfeature.DefaultFeatureGate.Enabled(features.SCTPSupport) && port.Protocol == core.ProtocolSCTP {
allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), port.Protocol, []string{string(core.ProtocolTCP), string(core.ProtocolUDP)}))
} else if !supportedPortProtocols.Has(string(port.Protocol)) { } else if !supportedPortProtocols.Has(string(port.Protocol)) {
allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), port.Protocol, supportedPortProtocols.List())) allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), port.Protocol, supportedPortProtocols.List()))
} }

9
pkg/apis/core/validation/validation_test.go
View File

@ -4060,6 +4060,7 @@ func TestValidateResourceQuotaWithAlphaLocalStorageCapacityIsolation(t *testing.
} }
func TestValidatePorts(t *testing.T) { func TestValidatePorts(t *testing.T) {
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SCTPSupport, true)()
successCase := []core.ContainerPort{ successCase := []core.ContainerPort{
{Name: "abc", ContainerPort: 80, HostPort: 80, Protocol: "TCP"}, {Name: "abc", ContainerPort: 80, HostPort: 80, Protocol: "TCP"},
{Name: "easy", ContainerPort: 82, Protocol: "TCP"}, {Name: "easy", ContainerPort: 82, Protocol: "TCP"},
@ -4125,12 +4126,12 @@ func TestValidatePorts(t *testing.T) {
"invalid protocol case": { "invalid protocol case": {
[]core.ContainerPort{{ContainerPort: 80, Protocol: "tcp"}}, []core.ContainerPort{{ContainerPort: 80, Protocol: "tcp"}},
field.ErrorTypeNotSupported, field.ErrorTypeNotSupported,
"protocol", `supported values: "TCP", "UDP"`, "protocol", `supported values: "SCTP", "TCP", "UDP"`,
}, },
"invalid protocol": { "invalid protocol": {
[]core.ContainerPort{{ContainerPort: 80, Protocol: "ICMP"}}, []core.ContainerPort{{ContainerPort: 80, Protocol: "ICMP"}},
field.ErrorTypeNotSupported, field.ErrorTypeNotSupported,
"protocol", `supported values: "TCP", "UDP"`, "protocol", `supported values: "SCTP", "TCP", "UDP"`,
}, },
"protocol required": { "protocol required": {
[]core.ContainerPort{{Name: "abc", ContainerPort: 80}}, []core.ContainerPort{{Name: "abc", ContainerPort: 80}},
@ -8590,6 +8591,8 @@ func makeValidService() core.Service {
} }
func TestValidateService(t *testing.T) { func TestValidateService(t *testing.T) {
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SCTPSupport, true)()
testCases := []struct { testCases := []struct {
name string name string
tweakSvc func(svc *core.Service) // given a basic valid service, each test case can customize it tweakSvc func(svc *core.Service) // given a basic valid service, each test case can customize it
@ -8947,6 +8950,7 @@ func TestValidateService(t *testing.T) {
s.Spec.Type = core.ServiceTypeNodePort s.Spec.Type = core.ServiceTypeNodePort
s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "q", Port: 1, Protocol: "TCP", NodePort: 1, TargetPort: intstr.FromInt(1)}) s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "q", Port: 1, Protocol: "TCP", NodePort: 1, TargetPort: intstr.FromInt(1)})
s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "r", Port: 2, Protocol: "UDP", NodePort: 1, TargetPort: intstr.FromInt(2)}) s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "r", Port: 2, Protocol: "UDP", NodePort: 1, TargetPort: intstr.FromInt(2)})
s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "s", Port: 3, Protocol: "SCTP", NodePort: 1, TargetPort: intstr.FromInt(3)})
}, },
numErrs: 0, numErrs: 0,
}, },
@ -8965,6 +8969,7 @@ func TestValidateService(t *testing.T) {
s.Spec.Type = core.ServiceTypeClusterIP s.Spec.Type = core.ServiceTypeClusterIP
s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "q", Port: 12345, Protocol: "TCP", TargetPort: intstr.FromInt(8080)}) s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "q", Port: 12345, Protocol: "TCP", TargetPort: intstr.FromInt(8080)})
s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "r", Port: 12345, Protocol: "UDP", TargetPort: intstr.FromInt(80)}) s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "r", Port: 12345, Protocol: "UDP", TargetPort: intstr.FromInt(80)})
s.Spec.Ports = append(s.Spec.Ports, core.ServicePort{Name: "s", Port: 12345, Protocol: "SCTP", TargetPort: intstr.FromInt(8088)})
}, },
numErrs: 0, numErrs: 0,
}, },

2
pkg/apis/networking/types.go
View File

@ -134,7 +134,7 @@ type NetworkPolicyEgressRule struct {
// NetworkPolicyPort describes a port to allow traffic on // NetworkPolicyPort describes a port to allow traffic on
type NetworkPolicyPort struct { type NetworkPolicyPort struct {
// The protocol (TCP or UDP) which traffic must match. If not specified, this // The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this
// field defaults to TCP. // field defaults to TCP.
// +optional // +optional
Protocol *api.Protocol Protocol *api.Protocol

5
pkg/apis/networking/validation/BUILD
View File

@ -13,8 +13,11 @@ go_test(
deps = [ deps = [
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/networking:go_default_library", "//pkg/apis/networking:go_default_library",
"//pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
], ],
) )
@ -26,12 +29,14 @@ go_library(
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/core/validation:go_default_library", "//pkg/apis/core/validation:go_default_library",
"//pkg/apis/networking:go_default_library", "//pkg/apis/networking:go_default_library",
"//pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/validation:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
], ],
) )

9
pkg/apis/networking/validation/validation.go
View File

@ -23,9 +23,11 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
utilfeature "k8s.io/apiserver/pkg/util/feature"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
apivalidation "k8s.io/kubernetes/pkg/apis/core/validation" apivalidation "k8s.io/kubernetes/pkg/apis/core/validation"
"k8s.io/kubernetes/pkg/apis/networking" "k8s.io/kubernetes/pkg/apis/networking"
"k8s.io/kubernetes/pkg/features"
) )
// ValidateNetworkPolicyName can be used to check whether the given networkpolicy // ValidateNetworkPolicyName can be used to check whether the given networkpolicy
@ -37,8 +39,11 @@ func ValidateNetworkPolicyName(name string, prefix bool) []string {
// ValidateNetworkPolicyPort validates a NetworkPolicyPort // ValidateNetworkPolicyPort validates a NetworkPolicyPort
func ValidateNetworkPolicyPort(port *networking.NetworkPolicyPort, portPath *field.Path) field.ErrorList { func ValidateNetworkPolicyPort(port *networking.NetworkPolicyPort, portPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if utilfeature.DefaultFeatureGate.Enabled(features.SCTPSupport) {
if port.Protocol != nil && *port.Protocol != api.ProtocolTCP && *port.Protocol != api.ProtocolUDP { if port.Protocol != nil && *port.Protocol != api.ProtocolTCP && *port.Protocol != api.ProtocolUDP && *port.Protocol != api.ProtocolSCTP {
allErrs = append(allErrs, field.NotSupported(portPath.Child("protocol"), *port.Protocol, []string{string(api.ProtocolTCP), string(api.ProtocolUDP), string(api.ProtocolSCTP)}))
}
} else if port.Protocol != nil && *port.Protocol != api.ProtocolTCP && *port.Protocol != api.ProtocolUDP {
allErrs = append(allErrs, field.NotSupported(portPath.Child("protocol"), *port.Protocol, []string{string(api.ProtocolTCP), string(api.ProtocolUDP)})) allErrs = append(allErrs, field.NotSupported(portPath.Child("protocol"), *port.Protocol, []string{string(api.ProtocolTCP), string(api.ProtocolUDP)}))
} }
if port.Port != nil { if port.Port != nil {

15
pkg/apis/networking/validation/validation_test.go
View File

@ -21,14 +21,20 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/networking" "k8s.io/kubernetes/pkg/apis/networking"
"k8s.io/kubernetes/pkg/features"
) )
func TestValidateNetworkPolicy(t *testing.T) { func TestValidateNetworkPolicy(t *testing.T) {
protocolTCP := api.ProtocolTCP protocolTCP := api.ProtocolTCP
protocolUDP := api.ProtocolUDP protocolUDP := api.ProtocolUDP
protocolICMP := api.Protocol("ICMP") protocolICMP := api.Protocol("ICMP")
protocolSCTP := api.ProtocolSCTP
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SCTPSupport, true)()
successCases := []networking.NetworkPolicy{ successCases := []networking.NetworkPolicy{
{ {
@ -79,6 +85,10 @@ func TestValidateNetworkPolicy(t *testing.T) {
Protocol: &protocolUDP, Protocol: &protocolUDP,
Port: &intstr.IntOrString{Type: intstr.String, StrVal: "dns"}, Port: &intstr.IntOrString{Type: intstr.String, StrVal: "dns"},
}, },
{
Protocol: &protocolSCTP,
Port: &intstr.IntOrString{Type: intstr.Int, IntVal: 7777},
},
}, },
}, },
}, },
@ -262,6 +272,10 @@ func TestValidateNetworkPolicy(t *testing.T) {
Protocol: &protocolUDP, Protocol: &protocolUDP,
Port: &intstr.IntOrString{Type: intstr.String, StrVal: "dns"}, Port: &intstr.IntOrString{Type: intstr.String, StrVal: "dns"},
}, },
{
Protocol: &protocolSCTP,
Port: &intstr.IntOrString{Type: intstr.Int, IntVal: 7777},
},
}, },
}, },
}, },
@ -270,6 +284,7 @@ func TestValidateNetworkPolicy(t *testing.T) {
} }
// Success cases are expected to pass validation. // Success cases are expected to pass validation.
for k, v := range successCases { for k, v := range successCases {
if errs := ValidateNetworkPolicy(&v); len(errs) != 0 { if errs := ValidateNetworkPolicy(&v); len(errs) != 0 {
t.Errorf("Expected success for %d, got %v", k, errs) t.Errorf("Expected success for %d, got %v", k, errs)

13
pkg/cloudprovider/providers/azure/azure_loadbalancer.go
View File

@ -737,6 +737,13 @@ func (az *Cloud) reconcileLoadBalancer(clusterName string, service *v1.Service,
return nil, fmt.Errorf("services requiring health checks are incompatible with UDP ports") return nil, fmt.Errorf("services requiring health checks are incompatible with UDP ports")
} }
if port.Protocol == v1.ProtocolSCTP {
// ERROR: this isn't supported
// health check (aka source ip preservation) is not
// compatible with SCTP (it uses an HTTP check)
return nil, fmt.Errorf("services requiring health checks are incompatible with SCTP ports")
}
podPresencePath, podPresencePort := serviceapi.GetServiceHealthCheckPathPort(service) podPresencePath, podPresencePort := serviceapi.GetServiceHealthCheckPathPort(service)
expectedProbes = append(expectedProbes, network.Probe{ expectedProbes = append(expectedProbes, network.Probe{
@ -749,7 +756,7 @@ func (az *Cloud) reconcileLoadBalancer(clusterName string, service *v1.Service,
NumberOfProbes: to.Int32Ptr(2), NumberOfProbes: to.Int32Ptr(2),
}, },
}) })
} else if port.Protocol != v1.ProtocolUDP { } else if port.Protocol != v1.ProtocolUDP && port.Protocol != v1.ProtocolSCTP {
// we only add the expected probe if we're doing TCP // we only add the expected probe if we're doing TCP
expectedProbes = append(expectedProbes, network.Probe{ expectedProbes = append(expectedProbes, network.Probe{
Name: &lbRuleName, Name: &lbRuleName,
@ -787,8 +794,8 @@ func (az *Cloud) reconcileLoadBalancer(clusterName string, service *v1.Service,
expectedRule.LoadBalancingRulePropertiesFormat.IdleTimeoutInMinutes = lbIdleTimeout expectedRule.LoadBalancingRulePropertiesFormat.IdleTimeoutInMinutes = lbIdleTimeout
} }
// we didn't construct the probe objects for UDP because they're not used/needed/allowed // we didn't construct the probe objects for UDP or SCTP because they're not used/needed/allowed
if port.Protocol != v1.ProtocolUDP { if port.Protocol != v1.ProtocolUDP && port.Protocol != v1.ProtocolSCTP {
expectedRule.Probe = &network.SubResource{ expectedRule.Probe = &network.SubResource{
ID: to.StringPtr(az.getLoadBalancerProbeID(lbName, lbRuleName)), ID: to.StringPtr(az.getLoadBalancerProbeID(lbName, lbRuleName)),
} }

3
pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go
View File

@ -38,6 +38,9 @@ const (
func (gce *GCECloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) { func (gce *GCECloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
nm := types.NamespacedName{Name: svc.Name, Namespace: svc.Namespace} nm := types.NamespacedName{Name: svc.Name, Namespace: svc.Namespace}
ports, protocol := getPortsAndProtocol(svc.Spec.Ports) ports, protocol := getPortsAndProtocol(svc.Spec.Ports)
if protocol != v1.ProtocolTCP && protocol != v1.ProtocolUDP {
return nil, fmt.Errorf("Invalid protocol %s, only TCP and UDP are supported", string(protocol))
}
scheme := cloud.SchemeInternal scheme := cloud.SchemeInternal
loadBalancerName := gce.GetLoadBalancerName(context.TODO(), clusterName, svc) loadBalancerName := gce.GetLoadBalancerName(context.TODO(), clusterName, svc)
sharedBackend := shareBackendService(svc) sharedBackend := shareBackendService(svc)

6
pkg/cloudprovider/providers/gce/gce_util_test.go
View File

@ -103,11 +103,15 @@ func TestFirewallToGcloudArgs(t *testing.T) {
IPProtocol: "tcp", IPProtocol: "tcp",
Ports: []string{"321", "123-456", "123"}, Ports: []string{"321", "123-456", "123"},
}, },
{
IPProtocol: "sctp",
Ports: []string{"321", "123-456", "123"},
},
}, },
} }
got := firewallToGcloudArgs(&firewall, "my-project") got := firewallToGcloudArgs(&firewall, "my-project")
var e = `--description "Last Line of Defense" --allow tcp:123,tcp:123-456,tcp:321,udp:123,udp:123-456,udp:321 --source-ranges 1.1.1.1/20,2.2.2.2/20,3.3.3.3/20 --target-tags band-nodes,jock-nodes --project my-project` var e = `--description "Last Line of Defense" --allow sctp:123,sctp:123-456,sctp:321,tcp:123,tcp:123-456,tcp:321,udp:123,udp:123-456,udp:321 --source-ranges 1.1.1.1/20,2.2.2.2/20,3.3.3.3/20 --target-tags band-nodes,jock-nodes --project my-project`
if got != e { if got != e {
t.Errorf("%q does not equal %q", got, e) t.Errorf("%q does not equal %q", got, e)
} }

41
pkg/controller/endpoint/endpoints_controller_test.go
View File

@ -344,6 +344,47 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) {
endpointsHandler.ValidateRequest(t, testapi.Default.ResourcePath("endpoints", ns, "foo"), "PUT", &data) endpointsHandler.ValidateRequest(t, testapi.Default.ResourcePath("endpoints", ns, "foo"), "PUT", &data)
} }
func TestSyncEndpointsProtocolSCTP(t *testing.T) {
ns := "other"
testServer, endpointsHandler := makeTestServer(t, ns)
defer testServer.Close()
endpoints := newController(testServer.URL)
endpoints.endpointsStore.Add(&v1.Endpoints{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Namespace: ns,
ResourceVersion: "1",
},
Subsets: []v1.EndpointSubset{{
Addresses: []v1.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []v1.EndpointPort{{Port: 1000, Protocol: "SCTP"}},
}},
})
addPods(endpoints.podStore, ns, 1, 1, 0)
endpoints.serviceStore.Add(&v1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: ns},
Spec: v1.ServiceSpec{
Selector: map[string]string{},
Ports: []v1.ServicePort{{Port: 80, TargetPort: intstr.FromInt(8080), Protocol: "SCTP"}},
},
})
endpoints.syncService(ns + "/foo")
endpointsHandler.ValidateRequestCount(t, 1)
data := runtime.EncodeOrDie(testapi.Default.Codec(), &v1.Endpoints{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Namespace: ns,
ResourceVersion: "1",
},
Subsets: []v1.EndpointSubset{{
Addresses: []v1.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &v1.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []v1.EndpointPort{{Port: 8080, Protocol: "SCTP"}},
}},
})
endpointsHandler.ValidateRequest(t, testapi.Default.ResourcePath("endpoints", ns, "foo"), "PUT", &data)
}
func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) { func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) {
ns := "other" ns := "other"
testServer, endpointsHandler := makeTestServer(t, ns) testServer, endpointsHandler := makeTestServer(t, ns)

18
pkg/controller/service/service_controller_test.go
View File

@ -124,6 +124,24 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
expectErr: false, expectErr: false,
expectCreateAttempt: true, expectCreateAttempt: true,
}, },
{
service: &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "sctp-service",
Namespace: "default",
SelfLink: testapi.Default.SelfLink("services", "sctp-service"),
},
Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{{
Port: 80,
Protocol: v1.ProtocolSCTP,
}},
Type: v1.ServiceTypeLoadBalancer,
},
},
expectErr: false,
expectCreateAttempt: true,
},
} }
for _, item := range table { for _, item := range table {

7
pkg/features/kube_features.go
View File

@ -357,6 +357,12 @@ const (
// Kubelet uses the new Lease API to report node heartbeats, // Kubelet uses the new Lease API to report node heartbeats,
// (Kube) Node Lifecycle Controller uses these heartbeats as a node health signal. // (Kube) Node Lifecycle Controller uses these heartbeats as a node health signal.
NodeLease utilfeature.Feature = "NodeLease" NodeLease utilfeature.Feature = "NodeLease"
// owner: @janosi
// alpha: v1.12
//
// Enables SCTP as new protocol for Service ports, NetworkPolicy, and ContainerPort in Pod/Containers definition
SCTPSupport utilfeature.Feature = "SCTPSupport"
) )
func init() { func init() {
@ -417,6 +423,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
CSIBlockVolume: {Default: false, PreRelease: utilfeature.Alpha}, CSIBlockVolume: {Default: false, PreRelease: utilfeature.Alpha},
RuntimeClass: {Default: false, PreRelease: utilfeature.Alpha}, RuntimeClass: {Default: false, PreRelease: utilfeature.Alpha},
NodeLease: {Default: false, PreRelease: utilfeature.Alpha}, NodeLease: {Default: false, PreRelease: utilfeature.Alpha},
SCTPSupport: {Default: false, PreRelease: utilfeature.Alpha},
// inherited features from generic apiserver, relisted here to get a conflict if it is changed // inherited features from generic apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side: // unintentionally on either side:

2
pkg/kubectl/cmd/expose.go
View File

@ -126,7 +126,7 @@ func NewCmdExposeService(f cmdutil.Factory, streams genericclioptions.IOStreams)
} }
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "expose (-f FILENAME | TYPE NAME) [--port=port] [--protocol=TCP|UDP] [--target-port=number-or-name] [--name=name] [--external-ip=external-ip-of-service] [--type=type]", Use: "expose (-f FILENAME | TYPE NAME) [--port=port] [--protocol=TCP|UDP|SCTP] [--target-port=number-or-name] [--name=name] [--external-ip=external-ip-of-service] [--type=type]",
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
Short: i18n.T("Take a replication controller, service, deployment or pod and expose it as a new Kubernetes Service"), Short: i18n.T("Take a replication controller, service, deployment or pod and expose it as a new Kubernetes Service"),
Long: exposeLong, Long: exposeLong,

137
pkg/kubectl/cmd/expose_test.go
View File

@ -425,6 +425,11 @@ func TestRunExposeService(t *testing.T) {
Port: 8081, Port: 8081,
TargetPort: intstr.FromInt(8081), TargetPort: intstr.FromInt(8081),
}, },
{
Protocol: corev1.ProtocolSCTP,
Port: 8082,
TargetPort: intstr.FromInt(8082),
},
}, },
}, },
}, },
@ -451,12 +456,144 @@ func TestRunExposeService(t *testing.T) {
Port: 8081, Port: 8081,
TargetPort: intstr.FromInt(8081), TargetPort: intstr.FromInt(8081),
}, },
{
Name: "port-4",
Protocol: corev1.ProtocolSCTP,
Port: 8082,
TargetPort: intstr.FromInt(8082),
},
}, },
Selector: map[string]string{"svc": "fromfoo"}, Selector: map[string]string{"svc": "fromfoo"},
}, },
}, },
status: 200, status: 200,
}, },
{
name: "expose-service-from-service-no-selector-defined-sctp",
args: []string{"service", "baz"},
ns: "test",
calls: map[string]string{
"GET": "/namespaces/test/services/baz",
"POST": "/namespaces/test/services",
},
input: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
Spec: corev1.ServiceSpec{
Selector: map[string]string{"app": "go"},
},
},
flags: map[string]string{"protocol": "SCTP", "port": "14", "name": "foo", "labels": "svc=test"},
output: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{
{
Protocol: corev1.ProtocolSCTP,
Port: 14,
TargetPort: intstr.FromInt(14),
},
},
Selector: map[string]string{"app": "go"},
},
},
expected: "service/foo exposed",
status: 200,
},
{
name: "expose-service-from-service-sctp",
args: []string{"service", "baz"},
ns: "test",
calls: map[string]string{
"GET": "/namespaces/test/services/baz",
"POST": "/namespaces/test/services",
},
input: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
Spec: corev1.ServiceSpec{
Selector: map[string]string{"app": "go"},
},
},
flags: map[string]string{"selector": "func=stream", "protocol": "SCTP", "port": "14", "name": "foo", "labels": "svc=test"},
output: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{
{
Protocol: corev1.ProtocolSCTP,
Port: 14,
TargetPort: intstr.FromInt(14),
},
},
Selector: map[string]string{"func": "stream"},
},
},
expected: "service/foo exposed",
status: 200,
},
{
name: "expose-service-cluster-ip-sctp",
args: []string{"service", "baz"},
ns: "test",
calls: map[string]string{
"GET": "/namespaces/test/services/baz",
"POST": "/namespaces/test/services",
},
input: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
Spec: corev1.ServiceSpec{
Selector: map[string]string{"app": "go"},
},
},
flags: map[string]string{"selector": "func=stream", "protocol": "SCTP", "port": "14", "name": "foo", "labels": "svc=test", "cluster-ip": "10.10.10.10", "dry-run": "true"},
output: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{
{
Protocol: corev1.ProtocolSCTP,
Port: 14,
TargetPort: intstr.FromInt(14),
},
},
Selector: map[string]string{"func": "stream"},
ClusterIP: "10.10.10.10",
},
},
expected: "service /foo exposed",
status: 200,
},
{
name: "expose-headless-service-sctp",
args: []string{"service", "baz"},
ns: "test",
calls: map[string]string{
"GET": "/namespaces/test/services/baz",
"POST": "/namespaces/test/services",
},
input: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
Spec: corev1.ServiceSpec{
Selector: map[string]string{"app": "go"},
},
},
flags: map[string]string{"selector": "func=stream", "protocol": "SCTP", "port": "14", "name": "foo", "labels": "svc=test", "cluster-ip": "None", "dry-run": "true"},
output: &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{
{
Protocol: corev1.ProtocolSCTP,
Port: 14,
TargetPort: intstr.FromInt(14),
},
},
Selector: map[string]string{"func": "stream"},
ClusterIP: corev1.ClusterIPNone,
},
},
expected: "service/foo exposed",
status: 200,
},
} }
for _, test := range tests { for _, test := range tests {

4
pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/3.response vendored
View File

@ -3,7 +3,7 @@
"apiVersion": "v1", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"status": "Failure", "status": "Failure",
"message": "Service \"svc2\" is invalid: [spec.ports[0].protocol: Unsupported value: \"VHF\": supported values: TCP, UDP, spec.clusterIP: Invalid value: \"10.0.0.182.1\": must be empty, 'None', or a valid IP address]", "message": "Service \"svc2\" is invalid: [spec.ports[0].protocol: Unsupported value: \"VHF\": supported values: TCP, UDP, SCTP, spec.clusterIP: Invalid value: \"10.0.0.182.1\": must be empty, 'None', or a valid IP address]",
"reason": "Invalid", "reason": "Invalid",
"details": { "details": {
"name": "svc2", "name": "svc2",
@ -11,7 +11,7 @@
"causes": [ "causes": [
{ {
"reason": "FieldValueNotSupported", "reason": "FieldValueNotSupported",
"message": "Unsupported value: \"VHF\": supported values: TCP, UDP", "message": "Unsupported value: \"VHF\": supported values: TCP, UDP, SCTP",
"field": "spec.ports[0].protocol" "field": "spec.ports[0].protocol"
}, },
{ {

4
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/3.response vendored
View File

@ -3,7 +3,7 @@
"apiVersion": "v1", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"status": "Failure", "status": "Failure",
"message": "Service \"svc1\" is invalid: [spec.clusterIP: Invalid value: \"10.0.0.10\": field is immutable, spec.ports[0].protocol: Unsupported value: \"VHF\": supported values: TCP, UDP]", "message": "Service \"svc1\" is invalid: [spec.clusterIP: Invalid value: \"10.0.0.10\": field is immutable, spec.ports[0].protocol: Unsupported value: \"VHF\": supported values: TCP, UDP, SCTP]",
"reason": "Invalid", "reason": "Invalid",
"details": { "details": {
"name": "svc1", "name": "svc1",
@ -16,7 +16,7 @@
}, },
{ {
"reason": "FieldValueNotSupported", "reason": "FieldValueNotSupported",
"message": "Unsupported value: \"VHF\": supported values: TCP, UDP", "message": "Unsupported value: \"VHF\": supported values: TCP, UDP, SCTP",
"field": "spec.ports[0].protocol" "field": "spec.ports[0].protocol"
} }
] ]

2
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/5.edited vendored
View File

@ -4,7 +4,7 @@
# #
# services "svc1" was not valid: # services "svc1" was not valid:
# * spec.clusterIP: Invalid value: "10.0.0.10": field is immutable # * spec.clusterIP: Invalid value: "10.0.0.10": field is immutable
# * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP # * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP, SCTP
# #
apiVersion: v1 apiVersion: v1
items: items:

2
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/5.original vendored
View File

@ -4,7 +4,7 @@
# #
# services "svc1" was not valid: # services "svc1" was not valid:
# * spec.clusterIP: Invalid value: "10.0.0.10": field is immutable # * spec.clusterIP: Invalid value: "10.0.0.10": field is immutable
# * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP # * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP, SCTP
# #
apiVersion: v1 apiVersion: v1
items: items:

4
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/6.response vendored
View File

@ -3,7 +3,7 @@
"apiVersion": "v1", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"status": "Failure", "status": "Failure",
"message": "Service \"svc1\" is invalid: spec.ports[0].protocol: Unsupported value: \"VHF\": supported values: TCP, UDP", "message": "Service \"svc1\" is invalid: spec.ports[0].protocol: Unsupported value: \"VHF\": supported values: TCP, UDP, SCTP",
"reason": "Invalid", "reason": "Invalid",
"details": { "details": {
"name": "svc1", "name": "svc1",
@ -11,7 +11,7 @@
"causes": [ "causes": [
{ {
"reason": "FieldValueNotSupported", "reason": "FieldValueNotSupported",
"message": "Unsupported value: \"VHF\": supported values: TCP, UDP", "message": "Unsupported value: \"VHF\": supported values: TCP, UDP, SCTP",
"field": "spec.ports[0].protocol" "field": "spec.ports[0].protocol"
} }
] ]

2
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/8.edited vendored
View File

@ -3,7 +3,7 @@
# reopened with the relevant failures. # reopened with the relevant failures.
# #
# services "svc1" was not valid: # services "svc1" was not valid:
# * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP # * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP, SCTP
# #
apiVersion: v1 apiVersion: v1
items: items:

2
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/8.original vendored
View File

@ -3,7 +3,7 @@
# reopened with the relevant failures. # reopened with the relevant failures.
# #
# services "svc1" was not valid: # services "svc1" was not valid:
# * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP # * spec.ports[0].protocol: Unsupported value: "VHF": supported values: TCP, UDP, SCTP
# #
apiVersion: v1 apiVersion: v1
items: items:

2
pkg/kubectl/generate_test.go
View File

@ -366,10 +366,12 @@ func TestMakeParseProtocols(t *testing.T) {
protocols: map[string]string{ protocols: map[string]string{
"102": "UDP", "102": "UDP",
"101": "TCP", "101": "TCP",
"103": "SCTP",
}, },
expected: map[string]string{ expected: map[string]string{
"102": "UDP", "102": "UDP",
"101": "TCP", "101": "TCP",
"103": "SCTP",
}, },
}, },
} }

349
pkg/kubectl/service_test.go
View File

@ -598,6 +598,355 @@ func TestGenerateService(t *testing.T) {
}, },
}, },
}, },
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"name": "test",
"port": "80",
"protocol": "SCTP",
"container-port": "1234",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{
{
Port: 80,
Protocol: "SCTP",
TargetPort: intstr.FromInt(1234),
},
},
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"labels": "key1=value1,key2=value2",
"name": "test",
"port": "80",
"protocol": "SCTP",
"container-port": "1234",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
Labels: map[string]string{
"key1": "value1",
"key2": "value2",
},
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{
{
Port: 80,
Protocol: "SCTP",
TargetPort: intstr.FromInt(1234),
},
},
},
},
},
{
generator: ServiceGeneratorV1{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"name": "test",
"port": "80",
"protocol": "SCTP",
"container-port": "1234",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{
{
Name: "default",
Port: 80,
Protocol: "SCTP",
TargetPort: intstr.FromInt(1234),
},
},
},
},
},
{
generator: ServiceGeneratorV1{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"name": "test",
"port": "80",
"protocol": "SCTP",
"container-port": "1234",
"session-affinity": "ClientIP",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{
{
Name: "default",
Port: 80,
Protocol: "SCTP",
TargetPort: intstr.FromInt(1234),
},
},
SessionAffinity: v1.ServiceAffinityClientIP,
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"name": "test",
"port": "80",
"protocol": "SCTP",
"container-port": "1234",
"cluster-ip": "10.10.10.10",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{
{
Port: 80,
Protocol: "SCTP",
TargetPort: intstr.FromInt(1234),
},
},
ClusterIP: "10.10.10.10",
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"name": "test",
"port": "80",
"protocol": "SCTP",
"container-port": "1234",
"cluster-ip": "None",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{
{
Port: 80,
Protocol: "SCTP",
TargetPort: intstr.FromInt(1234),
},
},
ClusterIP: v1.ClusterIPNone,
},
},
},
{
generator: ServiceGeneratorV1{},
params: map[string]interface{}{
"selector": "foo=bar",
"name": "test",
"ports": "80,443",
"protocol": "SCTP",
"container-port": "foobar",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
Ports: []v1.ServicePort{
{
Name: "port-1",
Port: 80,
Protocol: v1.ProtocolSCTP,
TargetPort: intstr.FromString("foobar"),
},
{
Name: "port-2",
Port: 443,
Protocol: v1.ProtocolSCTP,
TargetPort: intstr.FromString("foobar"),
},
},
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar",
"name": "test",
"ports": "80,443",
"protocol": "SCTP",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
Ports: []v1.ServicePort{
{
Name: "port-1",
Port: 80,
Protocol: v1.ProtocolSCTP,
TargetPort: intstr.FromInt(80),
},
{
Name: "port-2",
Port: 443,
Protocol: v1.ProtocolSCTP,
TargetPort: intstr.FromInt(443),
},
},
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar",
"name": "test",
"ports": "80,8080",
"protocols": "8080/SCTP",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
Ports: []v1.ServicePort{
{
Name: "port-1",
Port: 80,
Protocol: v1.ProtocolTCP,
TargetPort: intstr.FromInt(80),
},
{
Name: "port-2",
Port: 8080,
Protocol: v1.ProtocolSCTP,
TargetPort: intstr.FromInt(8080),
},
},
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar",
"name": "test",
"ports": "80,8080,8081,8082",
"protocols": "8080/UDP,8081/TCP,8082/SCTP",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
Ports: []v1.ServicePort{
{
Name: "port-1",
Port: 80,
Protocol: v1.ProtocolTCP,
TargetPort: intstr.FromInt(80),
},
{
Name: "port-2",
Port: 8080,
Protocol: v1.ProtocolUDP,
TargetPort: intstr.FromInt(8080),
},
{
Name: "port-3",
Port: 8081,
Protocol: v1.ProtocolTCP,
TargetPort: intstr.FromInt(8081),
},
{
Name: "port-4",
Port: 8082,
Protocol: v1.ProtocolSCTP,
TargetPort: intstr.FromInt(8082),
},
},
},
},
},
{
generator: ServiceGeneratorV2{},
params: map[string]interface{}{
"selector": "foo=bar,baz=blah",
"name": "test",
"protocol": "SCTP",
"container-port": "1234",
"cluster-ip": "None",
},
expected: v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
},
Spec: v1.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
"baz": "blah",
},
Ports: []v1.ServicePort{},
ClusterIP: v1.ClusterIPNone,
},
},
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {

11
pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go
View File

@ -160,17 +160,20 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type Protocol int32 type Protocol int32
const ( const (
Protocol_TCP Protocol = 0 Protocol_TCP Protocol = 0
Protocol_UDP Protocol = 1 Protocol_UDP Protocol = 1
Protocol_SCTP Protocol = 2
) )
var Protocol_name = map[int32]string{ var Protocol_name = map[int32]string{
0: "TCP", 0: "TCP",
1: "UDP", 1: "UDP",
2: "SCTP",
} }
var Protocol_value = map[string]int32{ var Protocol_value = map[string]int32{
"TCP": 0, "TCP": 0,
"UDP": 1, "UDP": 1,
"SCTP": 2,
} }
func (x Protocol) String() string { func (x Protocol) String() string {

1
pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto
View File

@ -143,6 +143,7 @@ message DNSConfig {
enum Protocol { enum Protocol {
TCP = 0; TCP = 0;
UDP = 1; UDP = 1;
SCTP = 2;
} }
// PortMapping specifies the port mapping configurations of a sandbox. // PortMapping specifies the port mapping configurations of a sandbox.

1
pkg/kubelet/dockershim/docker_checkpoint.go
View File

@ -28,6 +28,7 @@ const (
sandboxCheckpointDir = "sandbox" sandboxCheckpointDir = "sandbox"
protocolTCP = Protocol("tcp") protocolTCP = Protocol("tcp")
protocolUDP = Protocol("udp") protocolUDP = Protocol("udp")
protocolSCTP = Protocol("sctp")
schemaVersion = "v1" schemaVersion = "v1"
) )

2
pkg/kubelet/dockershim/docker_sandbox.go
View File

@ -672,6 +672,8 @@ func toCheckpointProtocol(protocol runtimeapi.Protocol) Protocol {
return protocolTCP return protocolTCP
case runtimeapi.Protocol_UDP: case runtimeapi.Protocol_UDP:
return protocolUDP return protocolUDP
case runtimeapi.Protocol_SCTP:
return protocolSCTP
} }
glog.Warningf("Unknown protocol %q: defaulting to TCP", protocol) glog.Warningf("Unknown protocol %q: defaulting to TCP", protocol)
return protocolTCP return protocolTCP

2
pkg/kubelet/dockershim/docker_service.go
View File

@ -515,6 +515,8 @@ func toAPIProtocol(protocol Protocol) v1.Protocol {
return v1.ProtocolTCP return v1.ProtocolTCP
case protocolUDP: case protocolUDP:
return v1.ProtocolUDP return v1.ProtocolUDP
case protocolSCTP:
return v1.ProtocolSCTP
} }
glog.Warningf("Unknown protocol %q: defaulting to TCP", protocol) glog.Warningf("Unknown protocol %q: defaulting to TCP", protocol)
return v1.ProtocolTCP return v1.ProtocolTCP

2
pkg/kubelet/dockershim/helpers.go
View File

@ -172,6 +172,8 @@ func makePortsAndBindings(pm []*runtimeapi.PortMapping) (dockernat.PortSet, map[
protocol = "/udp" protocol = "/udp"
case runtimeapi.Protocol_TCP: case runtimeapi.Protocol_TCP:
protocol = "/tcp" protocol = "/tcp"
case runtimeapi.Protocol_SCTP:
protocol = "/sctp"
default: default:
glog.Warningf("Unknown protocol %q: defaulting to TCP", port.Protocol) glog.Warningf("Unknown protocol %q: defaulting to TCP", port.Protocol)
protocol = "/tcp" protocol = "/tcp"

6
pkg/kubelet/dockershim/network/hostport/hostport_manager.go
View File

@ -264,6 +264,12 @@ func (hm *hostportManager) openHostports(podPortMapping *PodPortMapping) (map[ho
if pm.HostPort <= 0 { if pm.HostPort <= 0 {
continue continue
} }
// We do not open host ports for SCTP ports, as we agreed in the Support of SCTP KEP
if pm.Protocol == v1.ProtocolSCTP {
continue
}
hp := portMappingToHostport(pm) hp := portMappingToHostport(pm)
socket, err := hm.portOpener(&hp) socket, err := hm.portOpener(&hp)
if err != nil { if err != nil {

67
pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go
View File

@ -83,6 +83,16 @@ func TestOpenCloseHostports(t *testing.T) {
}, },
false, false,
}, },
{
&PodPortMapping{
Namespace: "ns1",
Name: "n4",
PortMappings: []*PortMapping{
{HostPort: 7777, Protocol: v1.Protocol("STCP")},
},
},
false,
},
} }
iptables := NewFakeIPTables() iptables := NewFakeIPTables()
@ -142,6 +152,11 @@ func TestOpenCloseHostports(t *testing.T) {
{HostPort: 7070, Protocol: v1.Protocol("TCP")}, {HostPort: 7070, Protocol: v1.Protocol("TCP")},
}, },
}, },
{
portMappings: []*PortMapping{
{HostPort: 7777, Protocol: v1.Protocol("SCTP")},
},
},
} }
for _, tc := range closePortCases { for _, tc := range closePortCases {
@ -187,6 +202,11 @@ func TestHostportManager(t *testing.T) {
ContainerPort: 81, ContainerPort: 81,
Protocol: v1.ProtocolUDP, Protocol: v1.ProtocolUDP,
}, },
{
HostPort: 8083,
ContainerPort: 83,
Protocol: v1.ProtocolSCTP,
},
}, },
}, },
expectError: false, expectError: false,
@ -208,6 +228,11 @@ func TestHostportManager(t *testing.T) {
ContainerPort: 81, ContainerPort: 81,
Protocol: v1.ProtocolUDP, Protocol: v1.ProtocolUDP,
}, },
{
HostPort: 8083,
ContainerPort: 83,
Protocol: v1.ProtocolSCTP,
},
}, },
}, },
expectError: true, expectError: true,
@ -262,25 +287,29 @@ func TestHostportManager(t *testing.T) {
lines := strings.Split(string(raw.Bytes()), "\n") lines := strings.Split(string(raw.Bytes()), "\n")
expectedLines := map[string]bool{ expectedLines := map[string]bool{
`*nat`: true, `*nat`: true,
`:KUBE-HOSTPORTS - [0:0]`: true, `:KUBE-HOSTPORTS - [0:0]`: true,
`:OUTPUT - [0:0]`: true, `:OUTPUT - [0:0]`: true,
`:PREROUTING - [0:0]`: true, `:PREROUTING - [0:0]`: true,
`:POSTROUTING - [0:0]`: true, `:POSTROUTING - [0:0]`: true,
`:KUBE-HP-IJHALPHTORMHHPPK - [0:0]`: true, `:KUBE-HP-IJHALPHTORMHHPPK - [0:0]`: true,
`:KUBE-HP-63UPIDJXVRSZGSUZ - [0:0]`: true, `:KUBE-HP-63UPIDJXVRSZGSUZ - [0:0]`: true,
`:KUBE-HP-WFBOALXEP42XEMJK - [0:0]`: true, `:KUBE-HP-WFBOALXEP42XEMJK - [0:0]`: true,
"-A KUBE-HOSTPORTS -m comment --comment \"pod3_ns1 hostport 8443\" -m tcp -p tcp --dport 8443 -j KUBE-HP-WFBOALXEP42XEMJK": true, `:KUBE-HP-XU6AWMMJYOZOFTFZ - [0:0]`: true,
"-A KUBE-HOSTPORTS -m comment --comment \"pod1_ns1 hostport 8081\" -m udp -p udp --dport 8081 -j KUBE-HP-63UPIDJXVRSZGSUZ": true, "-A KUBE-HOSTPORTS -m comment --comment \"pod3_ns1 hostport 8443\" -m tcp -p tcp --dport 8443 -j KUBE-HP-WFBOALXEP42XEMJK": true,
"-A KUBE-HOSTPORTS -m comment --comment \"pod1_ns1 hostport 8080\" -m tcp -p tcp --dport 8080 -j KUBE-HP-IJHALPHTORMHHPPK": true, "-A KUBE-HOSTPORTS -m comment --comment \"pod1_ns1 hostport 8081\" -m udp -p udp --dport 8081 -j KUBE-HP-63UPIDJXVRSZGSUZ": true,
"-A OUTPUT -m comment --comment \"kube hostport portals\" -m addrtype --dst-type LOCAL -j KUBE-HOSTPORTS": true, "-A KUBE-HOSTPORTS -m comment --comment \"pod1_ns1 hostport 8080\" -m tcp -p tcp --dport 8080 -j KUBE-HP-IJHALPHTORMHHPPK": true,
"-A PREROUTING -m comment --comment \"kube hostport portals\" -m addrtype --dst-type LOCAL -j KUBE-HOSTPORTS": true, "-A KUBE-HOSTPORTS -m comment --comment \"pod1_ns1 hostport 8083\" -m sctp -p sctp --dport 8083 -j KUBE-HP-XU6AWMMJYOZOFTFZ": true,
"-A POSTROUTING -m comment --comment \"SNAT for localhost access to hostports\" -o cbr0 -s 127.0.0.0/8 -j MASQUERADE": true, "-A OUTPUT -m comment --comment \"kube hostport portals\" -m addrtype --dst-type LOCAL -j KUBE-HOSTPORTS": true,
"-A KUBE-HP-IJHALPHTORMHHPPK -m comment --comment \"pod1_ns1 hostport 8080\" -s 10.1.1.2/32 -j KUBE-MARK-MASQ": true, "-A PREROUTING -m comment --comment \"kube hostport portals\" -m addrtype --dst-type LOCAL -j KUBE-HOSTPORTS": true,
"-A KUBE-HP-IJHALPHTORMHHPPK -m comment --comment \"pod1_ns1 hostport 8080\" -m tcp -p tcp -j DNAT --to-destination 10.1.1.2:80": true, "-A POSTROUTING -m comment --comment \"SNAT for localhost access to hostports\" -o cbr0 -s 127.0.0.0/8 -j MASQUERADE": true,
"-A KUBE-HP-63UPIDJXVRSZGSUZ -m comment --comment \"pod1_ns1 hostport 8081\" -s 10.1.1.2/32 -j KUBE-MARK-MASQ": true, "-A KUBE-HP-IJHALPHTORMHHPPK -m comment --comment \"pod1_ns1 hostport 8080\" -s 10.1.1.2/32 -j KUBE-MARK-MASQ": true,
"-A KUBE-HP-63UPIDJXVRSZGSUZ -m comment --comment \"pod1_ns1 hostport 8081\" -m udp -p udp -j DNAT --to-destination 10.1.1.2:81": true, "-A KUBE-HP-IJHALPHTORMHHPPK -m comment --comment \"pod1_ns1 hostport 8080\" -m tcp -p tcp -j DNAT --to-destination 10.1.1.2:80": true,
"-A KUBE-HP-WFBOALXEP42XEMJK -m comment --comment \"pod3_ns1 hostport 8443\" -s 10.1.1.4/32 -j KUBE-MARK-MASQ": true, "-A KUBE-HP-63UPIDJXVRSZGSUZ -m comment --comment \"pod1_ns1 hostport 8081\" -s 10.1.1.2/32 -j KUBE-MARK-MASQ": true,
"-A KUBE-HP-WFBOALXEP42XEMJK -m comment --comment \"pod3_ns1 hostport 8443\" -m tcp -p tcp -j DNAT --to-destination 10.1.1.4:443": true, "-A KUBE-HP-63UPIDJXVRSZGSUZ -m comment --comment \"pod1_ns1 hostport 8081\" -m udp -p udp -j DNAT --to-destination 10.1.1.2:81": true,
"-A KUBE-HP-XU6AWMMJYOZOFTFZ -m comment --comment \"pod1_ns1 hostport 8083\" -s 10.1.1.2/32 -j KUBE-MARK-MASQ": true,
"-A KUBE-HP-XU6AWMMJYOZOFTFZ -m comment --comment \"pod1_ns1 hostport 8083\" -m sctp -p sctp -j DNAT --to-destination 10.1.1.2:83": true,
"-A KUBE-HP-WFBOALXEP42XEMJK -m comment --comment \"pod3_ns1 hostport 8443\" -s 10.1.1.4/32 -j KUBE-MARK-MASQ": true,
"-A KUBE-HP-WFBOALXEP42XEMJK -m comment --comment \"pod3_ns1 hostport 8443\" -m tcp -p tcp -j DNAT --to-destination 10.1.1.4:443": true,
`COMMIT`: true, `COMMIT`: true,
} }
for _, line := range lines { for _, line := range lines {

7
pkg/kubelet/dockershim/network/hostport/hostport_syncer.go
View File

@ -27,6 +27,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/api/core/v1"
iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables" iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables"
utiliptables "k8s.io/kubernetes/pkg/util/iptables" utiliptables "k8s.io/kubernetes/pkg/util/iptables"
) )
@ -74,6 +75,12 @@ func (h *hostportSyncer) openHostports(podHostportMapping *PodPortMapping) error
// Assume hostport is not specified in this portmapping. So skip // Assume hostport is not specified in this portmapping. So skip
continue continue
} }
// We do not open host ports for SCTP ports, as we agreed in the Support of SCTP KEP
if port.Protocol == v1.ProtocolSCTP {
continue
}
hp := hostport{ hp := hostport{
port: port.HostPort, port: port.HostPort,
protocol: strings.ToLower(string(port.Protocol)), protocol: strings.ToLower(string(port.Protocol)),

17
pkg/kubelet/envvars/envvars_test.go
View File

@ -90,6 +90,16 @@ func TestFromServices(t *testing.T) {
}, },
}, },
}, },
{
ObjectMeta: metav1.ObjectMeta{Name: "sctp-1"},
Spec: v1.ServiceSpec{
Selector: map[string]string{"bar": "sctp-sel"},
ClusterIP: "1.2.3.4",
Ports: []v1.ServicePort{
{Port: 777, Protocol: "SCTP"},
},
},
},
} }
vars := envvars.FromServices(sl) vars := envvars.FromServices(sl)
expected := []v1.EnvVar{ expected := []v1.EnvVar{
@ -138,6 +148,13 @@ func TestFromServices(t *testing.T) {
{Name: "SUPER_IPV6_PORT_8084_TCP_PROTO", Value: "tcp"}, {Name: "SUPER_IPV6_PORT_8084_TCP_PROTO", Value: "tcp"},
{Name: "SUPER_IPV6_PORT_8084_TCP_PORT", Value: "8084"}, {Name: "SUPER_IPV6_PORT_8084_TCP_PORT", Value: "8084"},
{Name: "SUPER_IPV6_PORT_8084_TCP_ADDR", Value: "2001:DB8::"}, {Name: "SUPER_IPV6_PORT_8084_TCP_ADDR", Value: "2001:DB8::"},
{Name: "SCTP_1_SERVICE_HOST", Value: "1.2.3.4"},
{Name: "SCTP_1_SERVICE_PORT", Value: "777"},
{Name: "SCTP_1_PORT", Value: "sctp://1.2.3.4:777"},
{Name: "SCTP_1_PORT_777_SCTP", Value: "sctp://1.2.3.4:777"},
{Name: "SCTP_1_PORT_777_SCTP_PROTO", Value: "sctp"},
{Name: "SCTP_1_PORT_777_SCTP_PORT", Value: "777"},
{Name: "SCTP_1_PORT_777_SCTP_ADDR", Value: "1.2.3.4"},
} }
if len(vars) != len(expected) { if len(vars) != len(expected) {
t.Errorf("Expected %d env vars, got: %+v", len(expected), vars) t.Errorf("Expected %d env vars, got: %+v", len(expected), vars)

2
pkg/kubelet/kuberuntime/helpers.go
View File

@ -79,6 +79,8 @@ func toRuntimeProtocol(protocol v1.Protocol) runtimeapi.Protocol {
return runtimeapi.Protocol_TCP return runtimeapi.Protocol_TCP
case v1.ProtocolUDP: case v1.ProtocolUDP:
return runtimeapi.Protocol_UDP return runtimeapi.Protocol_UDP
case v1.ProtocolSCTP:
return runtimeapi.Protocol_SCTP
} }
glog.Warningf("Unknown protocol %q: defaulting to TCP", protocol) glog.Warningf("Unknown protocol %q: defaulting to TCP", protocol)

14
pkg/master/controller_test.go
View File

@ -372,6 +372,20 @@ func TestReconcileEndpoints(t *testing.T) {
}}, }},
}, },
}, },
{
testName: "no existing sctp endpoints",
serviceName: "boo",
ip: "1.2.3.4",
endpointPorts: []api.EndpointPort{{Name: "boo", Port: 7777, Protocol: "SCTP"}},
endpoints: nil,
expectCreate: &api.Endpoints{
ObjectMeta: om("boo"),
Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
Ports: []api.EndpointPort{{Name: "boo", Port: 7777, Protocol: "SCTP"}},
}},
},
},
} }
for _, test := range reconcile_tests { for _, test := range reconcile_tests {
fakeClient := fake.NewSimpleClientset() fakeClient := fake.NewSimpleClientset()

4
pkg/printers/internalversion/printers_test.go
View File

@ -1152,6 +1152,10 @@ func TestPrintHumanReadableService(t *testing.T) {
Port: 8000, Port: 8000,
Protocol: "TCP", Protocol: "TCP",
}, },
{
Port: 7777,
Protocol: "SCTP",
},
}, },
}, },
}, },

4
pkg/proxy/iptables/proxier.go
View File

@ -847,7 +847,7 @@ func (proxier *Proxier) syncProxyRules() {
// (because the socket might open but it would never work). // (because the socket might open but it would never work).
if local, err := utilproxy.IsLocalIP(externalIP); err != nil { if local, err := utilproxy.IsLocalIP(externalIP); err != nil {
glog.Errorf("can't determine if IP is local, assuming not: %v", err) glog.Errorf("can't determine if IP is local, assuming not: %v", err)
} else if local { } else if local && (svcInfo.GetProtocol() != v1.ProtocolSCTP) {
lp := utilproxy.LocalPort{ lp := utilproxy.LocalPort{
Description: "externalIP for " + svcNameString, Description: "externalIP for " + svcNameString,
IP: externalIP, IP: externalIP,
@ -1016,7 +1016,7 @@ func (proxier *Proxier) syncProxyRules() {
if proxier.portsMap[lp] != nil { if proxier.portsMap[lp] != nil {
glog.V(4).Infof("Port %s was open before and is still needed", lp.String()) glog.V(4).Infof("Port %s was open before and is still needed", lp.String())
replacementPortsMap[lp] = proxier.portsMap[lp] replacementPortsMap[lp] = proxier.portsMap[lp]
} else { } else if svcInfo.GetProtocol() != v1.ProtocolSCTP {
socket, err := proxier.portMapper.OpenLocalPort(&lp) socket, err := proxier.portMapper.OpenLocalPort(&lp)
if err != nil { if err != nil {
glog.Errorf("can't open %s, skipping this nodePort: %v", lp.String(), err) glog.Errorf("can't open %s, skipping this nodePort: %v", lp.String(), err)

25
pkg/proxy/iptables/proxier_test.go
View File

@ -161,8 +161,9 @@ func newFakeServiceInfo(service proxy.ServicePortName, ip net.IP, port int, prot
func TestDeleteEndpointConnections(t *testing.T) { func TestDeleteEndpointConnections(t *testing.T) {
const ( const (
UDP = v1.ProtocolUDP UDP = v1.ProtocolUDP
TCP = v1.ProtocolTCP TCP = v1.ProtocolTCP
SCTP = v1.ProtocolSCTP
) )
testCases := []struct { testCases := []struct {
description string description string
@ -188,6 +189,13 @@ func TestDeleteEndpointConnections(t *testing.T) {
svcPort: 80, svcPort: 80,
protocol: TCP, protocol: TCP,
endpoint: "10.240.0.4:80", endpoint: "10.240.0.4:80",
}, {
description: "V4 SCTP",
svcName: "v4-sctp",
svcIP: "10.96.3.3",
svcPort: 80,
protocol: SCTP,
endpoint: "10.240.0.5:80",
}, { }, {
description: "V4 UDP, nothing to delete, benign error", description: "V4 UDP, nothing to delete, benign error",
svcName: "v4-udp-nothing-to-delete", svcName: "v4-udp-nothing-to-delete",
@ -218,6 +226,13 @@ func TestDeleteEndpointConnections(t *testing.T) {
svcPort: 80, svcPort: 80,
protocol: TCP, protocol: TCP,
endpoint: "[2001:db8::3]:80", endpoint: "[2001:db8::3]:80",
}, {
description: "V6 SCTP",
svcName: "v6-sctp",
svcIP: "fd00:1234::40",
svcPort: 80,
protocol: SCTP,
endpoint: "[2001:db8::4]:80",
}, },
} }
@ -1061,12 +1076,14 @@ func TestBuildServiceMapAddRemove(t *testing.T) {
svc.Spec.ClusterIP = "172.16.55.4" svc.Spec.ClusterIP = "172.16.55.4"
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "something", "UDP", 1234, 4321, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "something", "UDP", 1234, 4321, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "somethingelse", "UDP", 1235, 5321, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "somethingelse", "UDP", 1235, 5321, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "sctpport", "SCTP", 1236, 6321, 0)
}), }),
makeTestService("somewhere-else", "node-port", func(svc *v1.Service) { makeTestService("somewhere-else", "node-port", func(svc *v1.Service) {
svc.Spec.Type = v1.ServiceTypeNodePort svc.Spec.Type = v1.ServiceTypeNodePort
svc.Spec.ClusterIP = "172.16.55.10" svc.Spec.ClusterIP = "172.16.55.10"
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "blahblah", "UDP", 345, 678, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "blahblah", "UDP", 345, 678, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "moreblahblah", "TCP", 344, 677, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "moreblahblah", "TCP", 344, 677, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "muchmoreblah", "SCTP", 343, 676, 0)
}), }),
makeTestService("somewhere", "load-balancer", func(svc *v1.Service) { makeTestService("somewhere", "load-balancer", func(svc *v1.Service) {
svc.Spec.Type = v1.ServiceTypeLoadBalancer svc.Spec.Type = v1.ServiceTypeLoadBalancer
@ -1100,8 +1117,8 @@ func TestBuildServiceMapAddRemove(t *testing.T) {
fp.OnServiceAdd(services[i]) fp.OnServiceAdd(services[i])
} }
result := proxy.UpdateServiceMap(fp.serviceMap, fp.serviceChanges) result := proxy.UpdateServiceMap(fp.serviceMap, fp.serviceChanges)
if len(fp.serviceMap) != 8 { if len(fp.serviceMap) != 10 {
t.Errorf("expected service map length 8, got %v", fp.serviceMap) t.Errorf("expected service map length 10, got %v", fp.serviceMap)
} }
// The only-local-loadbalancer ones get added // The only-local-loadbalancer ones get added

6
pkg/proxy/ipvs/ipset.go
View File

@ -64,6 +64,12 @@ const (
kubeNodePortLocalSetUDPComment = "Kubernetes nodeport UDP port with externalTrafficPolicy=local" kubeNodePortLocalSetUDPComment = "Kubernetes nodeport UDP port with externalTrafficPolicy=local"
kubeNodePortLocalSetUDP = "KUBE-NODE-PORT-LOCAL-UDP" kubeNodePortLocalSetUDP = "KUBE-NODE-PORT-LOCAL-UDP"
kubeNodePortSetSCTPComment = "Kubernetes nodeport SCTP port for masquerade purpose"
kubeNodePortSetSCTP = "KUBE-NODE-PORT-SCTP"
kubeNodePortLocalSetSCTPComment = "Kubernetes nodeport SCTP port with externalTrafficPolicy=local"
kubeNodePortLocalSetSCTP = "KUBE-NODE-PORT-LOCAL-SCTP"
) )
// IPSetVersioner can query the current ipset version. // IPSetVersioner can query the current ipset version.

20
pkg/proxy/ipvs/ipset_test.go
View File

@ -179,6 +179,26 @@ func TestSyncIPSetEntries(t *testing.T) {
currentEntries: []string{"80", "9090", "8081", "8082"}, currentEntries: []string{"80", "9090", "8081", "8082"},
expectedEntries: []string{"8080"}, expectedEntries: []string{"8080"},
}, },
{ // case 12
set: &utilipset.IPSet{
Name: "sctp-1",
},
setType: utilipset.HashIPPort,
ipv6: false,
activeEntries: []string{"172.17.0.4,sctp:80"},
currentEntries: nil,
expectedEntries: []string{"172.17.0.4,sctp:80"},
},
{ // case 1
set: &utilipset.IPSet{
Name: "sctp-2",
},
setType: utilipset.HashIPPort,
ipv6: true,
activeEntries: []string{"FE80::0202:B3FF:FE1E:8329,sctp:80"},
currentEntries: []string{"FE80::0202:B3FF:FE1E:8329,sctp:80"},
expectedEntries: []string{"FE80::0202:B3FF:FE1E:8329,sctp:80"},
},
} }
for i := range testCases { for i := range testCases {

16
pkg/proxy/ipvs/proxier.go
View File

@ -128,6 +128,8 @@ var ipsetInfo = []struct {
{kubeNodePortLocalSetTCP, utilipset.BitmapPort, false, kubeNodePortLocalSetTCPComment}, {kubeNodePortLocalSetTCP, utilipset.BitmapPort, false, kubeNodePortLocalSetTCPComment},
{kubeNodePortSetUDP, utilipset.BitmapPort, false, kubeNodePortSetUDPComment}, {kubeNodePortSetUDP, utilipset.BitmapPort, false, kubeNodePortSetUDPComment},
{kubeNodePortLocalSetUDP, utilipset.BitmapPort, false, kubeNodePortLocalSetUDPComment}, {kubeNodePortLocalSetUDP, utilipset.BitmapPort, false, kubeNodePortLocalSetUDPComment},
{kubeNodePortSetSCTP, utilipset.BitmapPort, false, kubeNodePortSetSCTPComment},
{kubeNodePortLocalSetSCTP, utilipset.BitmapPort, false, kubeNodePortLocalSetSCTPComment},
} }
// ipsetWithIptablesChain is the ipsets list with iptables source chain and the chain jump to // ipsetWithIptablesChain is the ipsets list with iptables source chain and the chain jump to
@ -152,6 +154,8 @@ var ipsetWithIptablesChain = []struct {
{kubeNodePortSetTCP, string(KubeNodePortChain), string(KubeMarkMasqChain), "dst", "tcp"}, {kubeNodePortSetTCP, string(KubeNodePortChain), string(KubeMarkMasqChain), "dst", "tcp"},
{kubeNodePortLocalSetUDP, string(KubeNodePortChain), "RETURN", "dst", "udp"}, {kubeNodePortLocalSetUDP, string(KubeNodePortChain), "RETURN", "dst", "udp"},
{kubeNodePortSetUDP, string(KubeNodePortChain), string(KubeMarkMasqChain), "dst", "udp"}, {kubeNodePortSetUDP, string(KubeNodePortChain), string(KubeMarkMasqChain), "dst", "udp"},
{kubeNodePortSetSCTP, string(kubeServicesChain), string(KubeNodePortChain), "dst", "sctp"},
{kubeNodePortLocalSetSCTP, string(KubeNodePortChain), "RETURN", "dst", "sctp"},
} }
var ipvsModules = []string{ var ipvsModules = []string{
@ -805,7 +809,9 @@ func (proxier *Proxier) syncProxyRules() {
for _, externalIP := range svcInfo.ExternalIPs { for _, externalIP := range svcInfo.ExternalIPs {
if local, err := utilproxy.IsLocalIP(externalIP); err != nil { if local, err := utilproxy.IsLocalIP(externalIP); err != nil {
glog.Errorf("can't determine if IP is local, assuming not: %v", err) glog.Errorf("can't determine if IP is local, assuming not: %v", err)
} else if local { // We do not start listening on SCTP ports, according to our agreement in the
// SCTP support KEP
} else if local && (svcInfo.GetProtocol() != v1.ProtocolSCTP) {
lp := utilproxy.LocalPort{ lp := utilproxy.LocalPort{
Description: "externalIP for " + svcNameString, Description: "externalIP for " + svcNameString,
IP: externalIP, IP: externalIP,
@ -1004,7 +1010,9 @@ func (proxier *Proxier) syncProxyRules() {
if proxier.portsMap[lp] != nil { if proxier.portsMap[lp] != nil {
glog.V(4).Infof("Port %s was open before and is still needed", lp.String()) glog.V(4).Infof("Port %s was open before and is still needed", lp.String())
replacementPortsMap[lp] = proxier.portsMap[lp] replacementPortsMap[lp] = proxier.portsMap[lp]
} else { // We do not start listening on SCTP ports, according to our agreement in the
// SCTP support KEP
} else if svcInfo.GetProtocol() != v1.ProtocolSCTP {
socket, err := proxier.portMapper.OpenLocalPort(&lp) socket, err := proxier.portMapper.OpenLocalPort(&lp)
if err != nil { if err != nil {
glog.Errorf("can't open %s, skipping this nodePort: %v", lp.String(), err) glog.Errorf("can't open %s, skipping this nodePort: %v", lp.String(), err)
@ -1032,6 +1040,8 @@ func (proxier *Proxier) syncProxyRules() {
nodePortSet = proxier.ipsetList[kubeNodePortSetTCP] nodePortSet = proxier.ipsetList[kubeNodePortSetTCP]
case "udp": case "udp":
nodePortSet = proxier.ipsetList[kubeNodePortSetUDP] nodePortSet = proxier.ipsetList[kubeNodePortSetUDP]
case "sctp":
nodePortSet = proxier.ipsetList[kubeNodePortSetSCTP]
default: default:
// It should never hit // It should never hit
glog.Errorf("Unsupported protocol type: %s", protocol) glog.Errorf("Unsupported protocol type: %s", protocol)
@ -1052,6 +1062,8 @@ func (proxier *Proxier) syncProxyRules() {
nodePortLocalSet = proxier.ipsetList[kubeNodePortLocalSetTCP] nodePortLocalSet = proxier.ipsetList[kubeNodePortLocalSetTCP]
case "udp": case "udp":
nodePortLocalSet = proxier.ipsetList[kubeNodePortLocalSetUDP] nodePortLocalSet = proxier.ipsetList[kubeNodePortLocalSetUDP]
case "sctp":
nodePortLocalSet = proxier.ipsetList[kubeNodePortLocalSetSCTP]
default: default:
// It should never hit // It should never hit
glog.Errorf("Unsupported protocol type: %s", protocol) glog.Errorf("Unsupported protocol type: %s", protocol)

83
pkg/proxy/ipvs/proxier_test.go
View File

@ -1345,12 +1345,14 @@ func TestBuildServiceMapAddRemove(t *testing.T) {
svc.Spec.ClusterIP = "172.16.55.4" svc.Spec.ClusterIP = "172.16.55.4"
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "something", "UDP", 1234, 4321, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "something", "UDP", 1234, 4321, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "somethingelse", "UDP", 1235, 5321, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "somethingelse", "UDP", 1235, 5321, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "somesctp", "SCTP", 1236, 6321, 0)
}), }),
makeTestService("somewhere-else", "node-port", func(svc *v1.Service) { makeTestService("somewhere-else", "node-port", func(svc *v1.Service) {
svc.Spec.Type = v1.ServiceTypeNodePort svc.Spec.Type = v1.ServiceTypeNodePort
svc.Spec.ClusterIP = "172.16.55.10" svc.Spec.ClusterIP = "172.16.55.10"
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "blahblah", "UDP", 345, 678, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "blahblah", "UDP", 345, 678, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "moreblahblah", "TCP", 344, 677, 0) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "moreblahblah", "TCP", 344, 677, 0)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "sctpblah", "SCTP", 343, 676, 0)
}), }),
makeTestService("somewhere", "load-balancer", func(svc *v1.Service) { makeTestService("somewhere", "load-balancer", func(svc *v1.Service) {
svc.Spec.Type = v1.ServiceTypeLoadBalancer svc.Spec.Type = v1.ServiceTypeLoadBalancer
@ -1358,6 +1360,7 @@ func TestBuildServiceMapAddRemove(t *testing.T) {
svc.Spec.LoadBalancerIP = "5.6.7.8" svc.Spec.LoadBalancerIP = "5.6.7.8"
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "foobar", "UDP", 8675, 30061, 7000) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "foobar", "UDP", 8675, 30061, 7000)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "baz", "UDP", 8676, 30062, 7001) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "baz", "UDP", 8676, 30062, 7001)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "sctpfoo", "SCTP", 8677, 30063, 7002)
svc.Status.LoadBalancer = v1.LoadBalancerStatus{ svc.Status.LoadBalancer = v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{ Ingress: []v1.LoadBalancerIngress{
{IP: "10.1.2.4"}, {IP: "10.1.2.4"},
@ -1370,6 +1373,7 @@ func TestBuildServiceMapAddRemove(t *testing.T) {
svc.Spec.LoadBalancerIP = "5.6.7.8" svc.Spec.LoadBalancerIP = "5.6.7.8"
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "foobar2", "UDP", 8677, 30063, 7002) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "foobar2", "UDP", 8677, 30063, 7002)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "baz", "UDP", 8678, 30064, 7003) svc.Spec.Ports = addTestPort(svc.Spec.Ports, "baz", "UDP", 8678, 30064, 7003)
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "sctpbaz", "SCTP", 8679, 30065, 7004)
svc.Status.LoadBalancer = v1.LoadBalancerStatus{ svc.Status.LoadBalancer = v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{ Ingress: []v1.LoadBalancerIngress{
{IP: "10.1.2.3"}, {IP: "10.1.2.3"},
@ -1384,8 +1388,8 @@ func TestBuildServiceMapAddRemove(t *testing.T) {
fp.OnServiceAdd(services[i]) fp.OnServiceAdd(services[i])
} }
result := proxy.UpdateServiceMap(fp.serviceMap, fp.serviceChanges) result := proxy.UpdateServiceMap(fp.serviceMap, fp.serviceChanges)
if len(fp.serviceMap) != 8 { if len(fp.serviceMap) != 12 {
t.Errorf("expected service map length 8, got %v", fp.serviceMap) t.Errorf("expected service map length 12, got %v", fp.serviceMap)
} }
// The only-local-loadbalancer ones get added // The only-local-loadbalancer ones get added
@ -1455,6 +1459,11 @@ func TestBuildServiceMapServiceHeadless(t *testing.T) {
svc.Spec.Type = v1.ServiceTypeClusterIP svc.Spec.Type = v1.ServiceTypeClusterIP
svc.Spec.ClusterIP = v1.ClusterIPNone svc.Spec.ClusterIP = v1.ClusterIPNone
}), }),
makeTestService("somewhere-else", "headless-sctp", func(svc *v1.Service) {
svc.Spec.Type = v1.ServiceTypeClusterIP
svc.Spec.ClusterIP = v1.ClusterIPNone
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "sip", "SCTP", 1235, 0, 0)
}),
) )
// Headless service should be ignored // Headless service should be ignored
@ -2620,6 +2629,76 @@ func Test_syncService(t *testing.T) {
}, },
bindAddr: true, bindAddr: true,
}, },
{
// case 4, SCTP, old virtual server is same as new virtual server
oldVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 80,
Scheduler: "rr",
Flags: utilipvs.FlagHashed,
},
svcName: "foo",
newVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 80,
Scheduler: "rr",
Flags: utilipvs.FlagHashed,
},
bindAddr: false,
},
{
// case 5, old virtual server is different from new virtual server
oldVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 8080,
Scheduler: "rr",
Flags: utilipvs.FlagHashed,
},
svcName: "bar",
newVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 8080,
Scheduler: "rr",
Flags: utilipvs.FlagPersistent,
},
bindAddr: false,
},
{
// case 6, old virtual server is different from new virtual server
oldVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 8080,
Scheduler: "rr",
Flags: utilipvs.FlagHashed,
},
svcName: "bar",
newVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 8080,
Scheduler: "wlc",
Flags: utilipvs.FlagHashed,
},
bindAddr: false,
},
{
// case 7, old virtual server is nil, and create new virtual server
oldVirtualServer: nil,
svcName: "baz",
newVirtualServer: &utilipvs.VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: string(v1.ProtocolSCTP),
Port: 53,
Scheduler: "rr",
Flags: utilipvs.FlagHashed,
},
bindAddr: true,
},
} }
for i := range testCases { for i := range testCases {

9
pkg/proxy/service_test.go
View File

@ -114,6 +114,15 @@ func TestServiceToServiceMap(t *testing.T) {
}), }),
expected: map[ServicePortName]*BaseServiceInfo{}, expected: map[ServicePortName]*BaseServiceInfo{},
}, },
{
desc: "headless sctp service",
service: makeTestService("ns2", "headless", func(svc *v1.Service) {
svc.Spec.Type = v1.ServiceTypeClusterIP
svc.Spec.ClusterIP = v1.ClusterIPNone
svc.Spec.Ports = addTestPort(svc.Spec.Ports, "sip", "SCTP", 7777, 0, 0)
}),
expected: map[ServicePortName]*BaseServiceInfo{},
},
{ {
desc: "headless service without port", desc: "headless service without port",
service: makeTestService("ns2", "headless-without-port", func(svc *v1.Service) { service: makeTestService("ns2", "headless-without-port", func(svc *v1.Service) {

2
pkg/proxy/userspace/proxysocket.go
View File

@ -68,6 +68,8 @@ func newProxySocket(protocol v1.Protocol, ip net.IP, port int) (ProxySocket, err
return nil, err return nil, err
} }
return &udpProxySocket{UDPConn: conn, port: port}, nil return &udpProxySocket{UDPConn: conn, port: port}, nil
case "SCTP":
return nil, fmt.Errorf("SCTP is not supported for user space proxy")
} }
return nil, fmt.Errorf("unknown protocol %q", protocol) return nil, fmt.Errorf("unknown protocol %q", protocol)
} }

2
pkg/proxy/util/port_test.go
View File

@ -38,6 +38,8 @@ func TestLocalPortString(t *testing.T) {
{"IPv4 UDP", "1.2.3.4", 9999, "udp", "\"IPv4 UDP\" (1.2.3.4:9999/udp)"}, {"IPv4 UDP", "1.2.3.4", 9999, "udp", "\"IPv4 UDP\" (1.2.3.4:9999/udp)"},
{"IPv4 TCP", "5.6.7.8", 1053, "tcp", "\"IPv4 TCP\" (5.6.7.8:1053/tcp)"}, {"IPv4 TCP", "5.6.7.8", 1053, "tcp", "\"IPv4 TCP\" (5.6.7.8:1053/tcp)"},
{"IPv6 TCP", "2001:db8::1", 80, "tcp", "\"IPv6 TCP\" ([2001:db8::1]:80/tcp)"}, {"IPv6 TCP", "2001:db8::1", 80, "tcp", "\"IPv6 TCP\" ([2001:db8::1]:80/tcp)"},
{"IPv4 SCTP", "9.10.11.12", 7777, "sctp", "\"IPv4 SCTP\" (9.10.11.12:7777/sctp)"},
{"IPv6 SCTP", "2001:db8::2", 80, "sctp", "\"IPv6 SCTP\" ([2001:db8::2]:80/sctp)"},
} }
for _, tc := range testCases { for _, tc := range testCases {

3
pkg/proxy/winkernel/proxier.go
View File

@ -428,6 +428,9 @@ func Enum(p v1.Protocol) uint16 {
if p == v1.ProtocolUDP { if p == v1.ProtocolUDP {
return 17 return 17
} }
if p == v1.ProtocolSCTP {
return 132
}
return 0 return 0
} }

2
pkg/proxy/winuserspace/proxysocket.go
View File

@ -101,6 +101,8 @@ func newProxySocket(protocol v1.Protocol, ip net.IP, port int) (proxySocket, err
return nil, err return nil, err
} }
return &udpProxySocket{UDPConn: conn, port: port}, nil return &udpProxySocket{UDPConn: conn, port: port}, nil
case "SCTP":
return nil, fmt.Errorf("SCTP is not supported for user space proxy")
} }
return nil, fmt.Errorf("unknown protocol %q", protocol) return nil, fmt.Errorf("unknown protocol %q", protocol)
} }

6
pkg/util/ipset/ipset.go
View File

@ -153,7 +153,7 @@ type Entry struct {
// Port is the entry's Port. // Port is the entry's Port.
Port int Port int
// Protocol is the entry's Protocol. The protocols of entries in the same ip set are all // Protocol is the entry's Protocol. The protocols of entries in the same ip set are all
// the same. The accepted protocols are TCP and UDP. // the same. The accepted protocols are TCP, UDP and SCTP.
Protocol string Protocol string
// Net is the entry's IP network address. Network address with zero prefix size can NOT // Net is the entry's IP network address. Network address with zero prefix size can NOT
// be stored. // be stored.
@ -482,10 +482,10 @@ func IsNotFoundError(err error) bool {
// checks if given protocol is supported in entry // checks if given protocol is supported in entry
func validateProtocol(protocol string) bool { func validateProtocol(protocol string) bool {
if protocol == ProtocolTCP || protocol == ProtocolUDP { if protocol == ProtocolTCP || protocol == ProtocolUDP || protocol == ProtocolSCTP {
return true return true
} }
glog.Errorf("Invalid entry's protocol: %s, supported protocols are [%s, %s]", protocol, ProtocolTCP, ProtocolUDP) glog.Errorf("Invalid entry's protocol: %s, supported protocols are [%s, %s]", protocol, ProtocolTCP, ProtocolUDP, ProtocolSCTP)
return false return false
} }

38
pkg/util/ipset/ipset_test.go
View File

@ -346,6 +346,22 @@ var testCases = []struct {
}, },
delCombinedOutputLog: []string{"ipset", "del", "SIX", "80"}, delCombinedOutputLog: []string{"ipset", "del", "SIX", "80"},
}, },
{ // case 7
entry: &Entry{
IP: "192.168.1.2",
Port: 80,
Protocol: ProtocolSCTP,
SetType: HashIPPort,
},
set: &IPSet{
Name: "SETTE",
},
addCombinedOutputLog: [][]string{
{"ipset", "add", "SETTE", "192.168.1.2,sctp:80"},
{"ipset", "add", "SETTE", "192.168.1.2,sctp:80", "-exist"},
},
delCombinedOutputLog: []string{"ipset", "del", "SETTE", "192.168.1.2,sctp:80"},
},
} }
func TestAddEntry(t *testing.T) { func TestAddEntry(t *testing.T) {
@ -755,6 +771,10 @@ func Test_validateFamily(t *testing.T) {
family: "", family: "",
valid: false, valid: false,
}, },
{ // case[8]
family: "sctp",
valid: false,
},
} }
for i := range testCases { for i := range testCases {
valid := validateHashFamily(testCases[i].family) valid := validateHashFamily(testCases[i].family)
@ -804,6 +824,10 @@ func Test_validateProtocol(t *testing.T) {
protocol: "", protocol: "",
valid: false, valid: false,
}, },
{ // case[8]
protocol: ProtocolSCTP,
valid: true,
},
} }
for i := range testCases { for i := range testCases {
valid := validateProtocol(testCases[i].protocol) valid := validateProtocol(testCases[i].protocol)
@ -1401,16 +1425,16 @@ func TestValidateEntry(t *testing.T) {
}, },
{ // case[19] { // case[19]
entry: &Entry{ entry: &Entry{
SetType: HashIPPortIP, SetType: HashIPPortIP,
IP: "10.20.30.40", IP: "10.20.30.40",
Protocol: "SCTP ", Protocol: ProtocolSCTP,
Port: 8090, Port: 8090,
IP2: "10.20.30.41", IP2: "10.20.30.41",
}, },
set: &IPSet{ set: &IPSet{
Name: "unsupported-protocol", Name: "sctp",
}, },
valid: false, valid: true,
}, },
{ // case[20] { // case[20]
entry: &Entry{ entry: &Entry{

2
pkg/util/ipset/types.go
View File

@ -49,6 +49,8 @@ const (
ProtocolTCP = "tcp" ProtocolTCP = "tcp"
// ProtocolUDP represents UDP protocol. // ProtocolUDP represents UDP protocol.
ProtocolUDP = "udp" ProtocolUDP = "udp"
// ProtocolSCTP represents SCTP protocol.
ProtocolSCTP = "sctp"
) )
// ValidIPSetTypes defines the supported ip set type. // ValidIPSetTypes defines the supported ip set type.

4
pkg/util/ipvs/ipvs_linux.go
View File

@ -252,6 +252,8 @@ func stringToProtocol(protocol string) uint16 {
return uint16(syscall.IPPROTO_TCP) return uint16(syscall.IPPROTO_TCP)
case "udp": case "udp":
return uint16(syscall.IPPROTO_UDP) return uint16(syscall.IPPROTO_UDP)
case "sctp":
return uint16(syscall.IPPROTO_SCTP)
} }
return uint16(0) return uint16(0)
} }
@ -263,6 +265,8 @@ func protocolToString(proto Protocol) string {
return "TCP" return "TCP"
case syscall.IPPROTO_UDP: case syscall.IPPROTO_UDP:
return "UDP" return "UDP"
case syscall.IPPROTO_SCTP:
return "SCTP"
} }
return "" return ""
} }

32
pkg/util/ipvs/ipvs_linux_test.go
View File

@ -147,6 +147,30 @@ func Test_toVirtualServer(t *testing.T) {
false, false,
"", "",
}, },
{
libipvs.Service{
Protocol: syscall.IPPROTO_SCTP,
Port: 80,
FWMark: 0,
SchedName: "",
Flags: uint32(FlagPersistent + FlagHashed),
Timeout: 0,
Netmask: 0xffffffff,
AddressFamily: syscall.AF_INET,
Address: nil,
PEName: "",
},
VirtualServer{
Address: net.ParseIP("0.0.0.0"),
Protocol: "SCTP",
Port: 80,
Scheduler: "",
Flags: ServiceFlags(FlagPersistent),
Timeout: 0,
},
false,
"",
},
} }
for i := range Tests { for i := range Tests {
@ -359,10 +383,10 @@ func Test_toIPVSDestination(t *testing.T) {
func Test_stringToProtocol(t *testing.T) { func Test_stringToProtocol(t *testing.T) {
tests := []string{ tests := []string{
"TCP", "UDP", "ICMP", "TCP", "UDP", "ICMP", "SCTP",
} }
expected := []uint16{ expected := []uint16{
uint16(syscall.IPPROTO_TCP), uint16(syscall.IPPROTO_UDP), uint16(0), uint16(syscall.IPPROTO_TCP), uint16(syscall.IPPROTO_UDP), uint16(0), uint16(syscall.IPPROTO_SCTP),
} }
for i := range tests { for i := range tests {
got := stringToProtocol(tests[i]) got := stringToProtocol(tests[i])
@ -375,10 +399,10 @@ func Test_stringToProtocol(t *testing.T) {
func Test_protocolToString(t *testing.T) { func Test_protocolToString(t *testing.T) {
tests := []Protocol{ tests := []Protocol{
syscall.IPPROTO_TCP, syscall.IPPROTO_UDP, Protocol(0), syscall.IPPROTO_TCP, syscall.IPPROTO_UDP, Protocol(0), syscall.IPPROTO_SCTP,
} }
expected := []string{ expected := []string{
"TCP", "UDP", "", "TCP", "UDP", "", "SCTP",
} }
for i := range tests { for i := range tests {
got := protocolToString(tests[i]) got := protocolToString(tests[i])

40
pkg/util/ipvs/ipvs_test.go
View File

@ -188,6 +188,46 @@ func TestVirtualServerEqual(t *testing.T) {
equal: true, equal: true,
reason: "All fields equal", reason: "All fields equal",
}, },
{
svcA: &VirtualServer{
Address: net.ParseIP("2012::beef"),
Protocol: "TCP",
Port: 0,
Scheduler: "wrr",
Flags: 0,
Timeout: 0,
},
svcB: &VirtualServer{
Address: net.ParseIP("2012::beeef"),
Protocol: "SCTP",
Port: 0,
Scheduler: "wrr",
Flags: 0,
Timeout: 0,
},
equal: false,
reason: "Protocol not equal",
},
{
svcA: &VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: "SCTP",
Port: 80,
Scheduler: "rr",
Flags: 0x1,
Timeout: 10800,
},
svcB: &VirtualServer{
Address: net.ParseIP("1.2.3.4"),
Protocol: "SCTP",
Port: 80,
Scheduler: "rr",
Flags: 0x1,
Timeout: 10800,
},
equal: true,
reason: "All fields equal",
},
} }
for i := range Tests { for i := range Tests {

12
pkg/util/ipvs/testing/fake_test.go
View File

@ -71,12 +71,22 @@ func TestVirtualServer(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Unexpected error when add virtual server, error: %v", err) t.Errorf("Unexpected error when add virtual server, error: %v", err)
} }
// Add another virtual server
vs3 := &utilipvs.VirtualServer{
Address: net.ParseIP("10::40"),
Port: uint16(7777),
Protocol: string("SCTP"),
}
err = fake.AddVirtualServer(vs3)
if err != nil {
t.Errorf("Unexpected error when add virtual server, error: %v", err)
}
// List all virtual servers // List all virtual servers
list, err := fake.GetVirtualServers() list, err := fake.GetVirtualServers()
if err != nil { if err != nil {
t.Errorf("Fail to list virtual servers, error: %v", err) t.Errorf("Fail to list virtual servers, error: %v", err)
} }
if len(list) != 2 { if len(list) != 3 {
t.Errorf("Expect 2 virtual servers, got: %d", len(list)) t.Errorf("Expect 2 virtual servers, got: %d", len(list))
} }
// Delete a virtual server // Delete a virtual server

6
staging/src/k8s.io/api/core/v1/generated.proto
View File

@ -749,7 +749,7 @@ message ContainerPort {
// This must be a valid port number, 0 < x < 65536. // This must be a valid port number, 0 < x < 65536.
optional int32 containerPort = 3; optional int32 containerPort = 3;
// Protocol for port. Must be UDP or TCP. // Protocol for port. Must be UDP, TCP, or SCTP.
// Defaults to "TCP". // Defaults to "TCP".
// +optional // +optional
optional string protocol = 4; optional string protocol = 4;
@ -968,7 +968,7 @@ message EndpointPort {
optional int32 port = 2; optional int32 port = 2;
// The IP protocol for this port. // The IP protocol for this port.
// Must be UDP or TCP. // Must be UDP, TCP, or SCTP.
// Default is TCP. // Default is TCP.
// +optional // +optional
optional string protocol = 3; optional string protocol = 3;
@ -4148,7 +4148,7 @@ message ServicePort {
// +optional // +optional
optional string name = 1; optional string name = 1;
// The IP protocol for this port. Supports "TCP" and "UDP". // The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
// Default is TCP. // Default is TCP.
// +optional // +optional
optional string protocol = 2; optional string protocol = 2;

8
staging/src/k8s.io/api/core/v1/types.go
View File

@ -861,6 +861,8 @@ const (
ProtocolTCP Protocol = "TCP" ProtocolTCP Protocol = "TCP"
// ProtocolUDP is the UDP protocol. // ProtocolUDP is the UDP protocol.
ProtocolUDP Protocol = "UDP" ProtocolUDP Protocol = "UDP"
// ProtocolSCTP is the SCTP protocol.
ProtocolSCTP Protocol = "SCTP"
) )
// Represents a Persistent Disk resource in Google Compute Engine. // Represents a Persistent Disk resource in Google Compute Engine.
@ -1662,7 +1664,7 @@ type ContainerPort struct {
// Number of port to expose on the pod's IP address. // Number of port to expose on the pod's IP address.
// This must be a valid port number, 0 < x < 65536. // This must be a valid port number, 0 < x < 65536.
ContainerPort int32 `json:"containerPort" protobuf:"varint,3,opt,name=containerPort"` ContainerPort int32 `json:"containerPort" protobuf:"varint,3,opt,name=containerPort"`
// Protocol for port. Must be UDP or TCP. // Protocol for port. Must be UDP, TCP, or SCTP.
// Defaults to "TCP". // Defaults to "TCP".
// +optional // +optional
Protocol Protocol `json:"protocol,omitempty" protobuf:"bytes,4,opt,name=protocol,casttype=Protocol"` Protocol Protocol `json:"protocol,omitempty" protobuf:"bytes,4,opt,name=protocol,casttype=Protocol"`
@ -3515,7 +3517,7 @@ type ServicePort struct {
// +optional // +optional
Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"` Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"`
// The IP protocol for this port. Supports "TCP" and "UDP". // The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
// Default is TCP. // Default is TCP.
// +optional // +optional
Protocol Protocol `json:"protocol,omitempty" protobuf:"bytes,2,opt,name=protocol,casttype=Protocol"` Protocol Protocol `json:"protocol,omitempty" protobuf:"bytes,2,opt,name=protocol,casttype=Protocol"`
@ -3729,7 +3731,7 @@ type EndpointPort struct {
Port int32 `json:"port" protobuf:"varint,2,opt,name=port"` Port int32 `json:"port" protobuf:"varint,2,opt,name=port"`
// The IP protocol for this port. // The IP protocol for this port.
// Must be UDP or TCP. // Must be UDP, TCP, or SCTP.
// Default is TCP. // Default is TCP.
// +optional // +optional
Protocol Protocol `json:"protocol,omitempty" protobuf:"bytes,3,opt,name=protocol,casttype=Protocol"` Protocol Protocol `json:"protocol,omitempty" protobuf:"bytes,3,opt,name=protocol,casttype=Protocol"`

6
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go generated
View File

@ -353,7 +353,7 @@ var map_ContainerPort = map[string]string{
"name": "If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.", "name": "If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.",
"hostPort": "Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.", "hostPort": "Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.",
"containerPort": "Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536.", "containerPort": "Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536.",
"protocol": "Protocol for port. Must be UDP or TCP. Defaults to \"TCP\".", "protocol": "Protocol for port. Must be UDP, TCP, or SCTP. Defaults to \"TCP\".",
"hostIP": "What host IP to bind the external port to.", "hostIP": "What host IP to bind the external port to.",
} }
@ -488,7 +488,7 @@ var map_EndpointPort = map[string]string{
"": "EndpointPort is a tuple that describes a single port.", "": "EndpointPort is a tuple that describes a single port.",
"name": "The name of this port (corresponds to ServicePort.Name). Must be a DNS_LABEL. Optional only if one port is defined.", "name": "The name of this port (corresponds to ServicePort.Name). Must be a DNS_LABEL. Optional only if one port is defined.",
"port": "The port number of the endpoint.", "port": "The port number of the endpoint.",
"protocol": "The IP protocol for this port. Must be UDP or TCP. Default is TCP.", "protocol": "The IP protocol for this port. Must be UDP, TCP, or SCTP. Default is TCP.",
} }
func (EndpointPort) SwaggerDoc() map[string]string { func (EndpointPort) SwaggerDoc() map[string]string {
@ -2058,7 +2058,7 @@ func (ServiceList) SwaggerDoc() map[string]string {
var map_ServicePort = map[string]string{ var map_ServicePort = map[string]string{
"": "ServicePort contains information on service's port.", "": "ServicePort contains information on service's port.",
"name": "The name of this port within the service. This must be a DNS_LABEL. All ports within a ServiceSpec must have unique names. This maps to the 'Name' field in EndpointPort objects. Optional if only one ServicePort is defined on this service.", "name": "The name of this port within the service. This must be a DNS_LABEL. All ports within a ServiceSpec must have unique names. This maps to the 'Name' field in EndpointPort objects. Optional if only one ServicePort is defined on this service.",
"protocol": "The IP protocol for this port. Supports \"TCP\" and \"UDP\". Default is TCP.", "protocol": "The IP protocol for this port. Supports \"TCP\", \"UDP\", and \"SCTP\". Default is TCP.",
"port": "The port that will be exposed by this service.", "port": "The port that will be exposed by this service.",
"targetPort": "Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod's container ports. If this is not specified, the value of the 'port' field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the 'port' field. More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service", "targetPort": "Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod's container ports. If this is not specified, the value of the 'port' field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the 'port' field. More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service",
"nodePort": "The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport", "nodePort": "The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport",

2
staging/src/k8s.io/api/extensions/v1beta1/generated.proto
View File

@ -712,7 +712,7 @@ message NetworkPolicyPeer {
// DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/NetworkPolicyPort. // DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/NetworkPolicyPort.
message NetworkPolicyPort { message NetworkPolicyPort {
// Optional. The protocol (TCP or UDP) which traffic must match. // Optional. The protocol (TCP, UDP, or SCTP) which traffic must match.
// If not specified, this field defaults to TCP. // If not specified, this field defaults to TCP.
// +optional // +optional
optional string protocol = 1; optional string protocol = 1;

2
staging/src/k8s.io/api/extensions/v1beta1/types.go
View File

@ -1275,7 +1275,7 @@ type NetworkPolicyEgressRule struct {
// DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/NetworkPolicyPort. // DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/NetworkPolicyPort.
type NetworkPolicyPort struct { type NetworkPolicyPort struct {
// Optional. The protocol (TCP or UDP) which traffic must match. // Optional. The protocol (TCP, UDP, or SCTP) which traffic must match.
// If not specified, this field defaults to TCP. // If not specified, this field defaults to TCP.
// +optional // +optional
Protocol *v1.Protocol `json:"protocol,omitempty" protobuf:"bytes,1,opt,name=protocol,casttype=k8s.io/api/core/v1.Protocol"` Protocol *v1.Protocol `json:"protocol,omitempty" protobuf:"bytes,1,opt,name=protocol,casttype=k8s.io/api/core/v1.Protocol"`

2
staging/src/k8s.io/api/extensions/v1beta1/types_swagger_doc_generated.go generated
View File

@ -419,7 +419,7 @@ func (NetworkPolicyPeer) SwaggerDoc() map[string]string {
var map_NetworkPolicyPort = map[string]string{ var map_NetworkPolicyPort = map[string]string{
"": "DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/NetworkPolicyPort.", "": "DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/NetworkPolicyPort.",
"protocol": "Optional. The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP.", "protocol": "Optional. The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP.",
"port": "If specified, the port on the given protocol. This can either be a numerical or named port on a pod. If this field is not provided, this matches all port names and numbers. If present, only traffic on the specified protocol AND port will be matched.", "port": "If specified, the port on the given protocol. This can either be a numerical or named port on a pod. If this field is not provided, this matches all port names and numbers. If present, only traffic on the specified protocol AND port will be matched.",
} }

2
staging/src/k8s.io/api/networking/v1/generated.proto
View File

@ -138,7 +138,7 @@ message NetworkPolicyPeer {
// NetworkPolicyPort describes a port to allow traffic on // NetworkPolicyPort describes a port to allow traffic on
message NetworkPolicyPort { message NetworkPolicyPort {
// The protocol (TCP or UDP) which traffic must match. If not specified, this // The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this
// field defaults to TCP. // field defaults to TCP.
// +optional // +optional
optional string protocol = 1; optional string protocol = 1;

2
staging/src/k8s.io/api/networking/v1/types.go
View File

@ -136,7 +136,7 @@ type NetworkPolicyEgressRule struct {
// NetworkPolicyPort describes a port to allow traffic on // NetworkPolicyPort describes a port to allow traffic on
type NetworkPolicyPort struct { type NetworkPolicyPort struct {
// The protocol (TCP or UDP) which traffic must match. If not specified, this // The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this
// field defaults to TCP. // field defaults to TCP.
// +optional // +optional
Protocol *v1.Protocol `json:"protocol,omitempty" protobuf:"bytes,1,opt,name=protocol,casttype=k8s.io/api/core/v1.Protocol"` Protocol *v1.Protocol `json:"protocol,omitempty" protobuf:"bytes,1,opt,name=protocol,casttype=k8s.io/api/core/v1.Protocol"`

2
staging/src/k8s.io/api/networking/v1/types_swagger_doc_generated.go generated
View File

@ -90,7 +90,7 @@ func (NetworkPolicyPeer) SwaggerDoc() map[string]string {
var map_NetworkPolicyPort = map[string]string{ var map_NetworkPolicyPort = map[string]string{
"": "NetworkPolicyPort describes a port to allow traffic on", "": "NetworkPolicyPort describes a port to allow traffic on",
"protocol": "The protocol (TCP or UDP) which traffic must match. If not specified, this field defaults to TCP.", "protocol": "The protocol (TCP, UDP, or SCTP) which traffic must match. If not specified, this field defaults to TCP.",
"port": "The port on the given protocol. This can either be a numerical or named port on a pod. If this field is not provided, this matches all port names and numbers.", "port": "The port on the given protocol. This can either be a numerical or named port on a pod. If this field is not provided, this matches all port names and numbers.",
} }