a6da2b1472
The requested Service Protocol is checked against the supported protocols of GCE Internal LB. The supported protocols are TCP and UDP. SCTP is not supported by OpenStack LBaaS. If SCTP is requested in a Service with type=LoadBalancer, the request is rejected. Comment style is also corrected. SCTP is not allowed for LoadBalancer Service and for HostPort. Kube-proxy can be configured not to start listening on the host port for SCTP: see the new SCTPUserSpaceNode parameter changed the vendor github.com/nokia/sctp to github.com/ishidawataru/sctp. I.e. from now on we use the upstream version. netexec.go compilation fixed. Various test cases fixed SCTP related conformance tests removed. Netexec's pod definition and Dockerfile are updated to expose the new SCTP port(8082) SCTP related e2e test cases are removed as the e2e test systems do not support SCTP sctp related firewall config is removed from cluster/gce/util.sh. Variable name sctp_addr is corrected to sctpAddr in pkg/proxy/ipvs/proxier.go cluster/gce/util.sh is copied from master
97 lines
3.0 KiB
Go
97 lines
3.0 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package dockershim
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
|
|
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum"
|
|
)
|
|
|
|
const (
|
|
// default directory to store pod sandbox checkpoint files
|
|
sandboxCheckpointDir = "sandbox"
|
|
protocolTCP = Protocol("tcp")
|
|
protocolUDP = Protocol("udp")
|
|
protocolSCTP = Protocol("sctp")
|
|
schemaVersion = "v1"
|
|
)
|
|
|
|
type DockershimCheckpoint interface {
|
|
checkpointmanager.Checkpoint
|
|
GetData() (string, string, string, []*PortMapping, bool)
|
|
}
|
|
|
|
type Protocol string
|
|
|
|
// PortMapping is the port mapping configurations of a sandbox.
|
|
type PortMapping struct {
|
|
// Protocol of the port mapping.
|
|
Protocol *Protocol `json:"protocol,omitempty"`
|
|
// Port number within the container.
|
|
ContainerPort *int32 `json:"container_port,omitempty"`
|
|
// Port number on the host.
|
|
HostPort *int32 `json:"host_port,omitempty"`
|
|
}
|
|
|
|
// CheckpointData contains all types of data that can be stored in the checkpoint.
|
|
type CheckpointData struct {
|
|
PortMappings []*PortMapping `json:"port_mappings,omitempty"`
|
|
HostNetwork bool `json:"host_network,omitempty"`
|
|
}
|
|
|
|
// PodSandboxCheckpoint is the checkpoint structure for a sandbox
|
|
type PodSandboxCheckpoint struct {
|
|
// Version of the pod sandbox checkpoint schema.
|
|
Version string `json:"version"`
|
|
// Pod name of the sandbox. Same as the pod name in the PodSpec.
|
|
Name string `json:"name"`
|
|
// Pod namespace of the sandbox. Same as the pod namespace in the PodSpec.
|
|
Namespace string `json:"namespace"`
|
|
// Data to checkpoint for pod sandbox.
|
|
Data *CheckpointData `json:"data,omitempty"`
|
|
// Checksum is calculated with fnv hash of the checkpoint object with checksum field set to be zero
|
|
Checksum checksum.Checksum `json:"checksum"`
|
|
}
|
|
|
|
func NewPodSandboxCheckpoint(namespace, name string, data *CheckpointData) DockershimCheckpoint {
|
|
return &PodSandboxCheckpoint{
|
|
Version: schemaVersion,
|
|
Namespace: namespace,
|
|
Name: name,
|
|
Data: data,
|
|
}
|
|
}
|
|
|
|
func (cp *PodSandboxCheckpoint) MarshalCheckpoint() ([]byte, error) {
|
|
cp.Checksum = checksum.New(*cp.Data)
|
|
return json.Marshal(*cp)
|
|
}
|
|
|
|
func (cp *PodSandboxCheckpoint) UnmarshalCheckpoint(blob []byte) error {
|
|
return json.Unmarshal(blob, cp)
|
|
}
|
|
|
|
func (cp *PodSandboxCheckpoint) VerifyChecksum() error {
|
|
return cp.Checksum.Verify(*cp.Data)
|
|
}
|
|
|
|
func (cp *PodSandboxCheckpoint) GetData() (string, string, string, []*PortMapping, bool) {
|
|
return cp.Version, cp.Name, cp.Namespace, cp.Data.PortMappings, cp.Data.HostNetwork
|
|
}
|