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/extensions/v1beta1/generated.proto
Generated Vendored
+7 -1
View File
@@ -712,7 +712,7 @@ message NetworkPolicyPeer {
// DEPRECATED 1.9 - This group version of NetworkPolicyPort is deprecated by networking/v1/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.
// +optional
optional string protocol = 1;
@@ -902,6 +902,12 @@ message PodSecurityPolicySpec {
// e.g. "foo.*" forbids "foo.bar", "foo.baz", etc.
// +optional
repeated string forbiddenSysctls = 20;
// AllowedProcMountTypes is a whitelist of allowed ProcMountTypes.
// Empty or nil indicates that only the DefaultProcMountType may be used.
// This requires the ProcMountType feature flag to be enabled.
// +optional
repeated string allowedProcMountTypes = 21;
}
// DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1beta2/ReplicaSet. See the release notes for