github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-04-12 00:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.12. Deleting CHANGELOG-1.11.md

Browse Source 
Kubernetes-commit: 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c
This commit is contained in:
Kubernetes Publisher
2018-09-04 00:05:19 +08:00
parent d6de82cef9 10721e2508
commit 927b78e23d
45 changed files with 3767 additions and 1831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/k8s.io/api/networking/v1/generated.proto
Generated Vendored
+1 -1
View File
@@ -138,7 +138,7 @@ message NetworkPolicyPeer {
// NetworkPolicyPort describes a port to allow traffic on
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.
// +optional
optional string protocol = 1;
vendor/k8s.io/api/networking/v1/types.go
Generated Vendored
+1 -1
View File
@@ -136,7 +136,7 @@ type NetworkPolicyEgressRule struct {
// NetworkPolicyPort describes a port to allow traffic on
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.
// +optional
Protocol *v1.Protocol `json:"protocol,omitempty" protobuf:"bytes,1,opt,name=protocol,casttype=k8s.io/api/core/v1.Protocol"`
vendor/k8s.io/api/networking/v1/types_swagger_doc_generated.go
Generated Vendored
+1 -1
View File
@@ -90,7 +90,7 @@ func (NetworkPolicyPeer) SwaggerDoc() map[string]string {
var map_NetworkPolicyPort = map[string]string{
"": "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.",
}