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

Kubernetes-commit: 4d9bb0428a649c9d587213bfb3f0f3c7d4e9589c
This commit is contained in:
Kubernetes Publisher
2018-09-04 00:05:19 +08:00
45 changed files with 3767 additions and 1831 deletions
+6
View File
@@ -297,6 +297,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;
}
// RunAsUserStrategyOptions defines the strategy type and any options used to create the strategy.