Skip to content

Commit 7401f8e

Browse files
authored
Merge pull request kubernetes#91927 from wangkai1994/fix/replace_whitelist_to_allowed
replace whitelist to allowlist
2 parents 98f250f + 8d68452 commit 7401f8e

File tree

10 files changed

+84
-84
lines changed

10 files changed

+84
-84
lines changed

api/openapi-spec/swagger.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/policy/types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ type PodSecurityPolicySpec struct {
157157
// To allow all capabilities you may use '*'.
158158
// +optional
159159
AllowedCapabilities []api.Capability
160-
// Volumes is a white list of allowed volume plugins. Empty indicates that
160+
// Volumes is an allowlist of volume plugins. Empty indicates that
161161
// no volumes may be used. To allow all volumes you may use '*'.
162162
// +optional
163163
Volumes []FSType
@@ -200,23 +200,23 @@ type PodSecurityPolicySpec struct {
200200
// privilege escalation. If unspecified, defaults to true.
201201
// +optional
202202
AllowPrivilegeEscalation bool
203-
// AllowedHostPaths is a white list of allowed host paths. Empty indicates that all host paths may be used.
203+
// AllowedHostPaths is an allowlist of host paths. Empty indicates that all host paths may be used.
204204
// +optional
205205
AllowedHostPaths []AllowedHostPath
206-
// AllowedFlexVolumes is a whitelist of allowed Flexvolumes. Empty or nil indicates that all
206+
// AllowedFlexVolumes is an allowlist of Flexvolumes. Empty or nil indicates that all
207207
// Flexvolumes may be used. This parameter is effective only when the usage of the Flexvolumes
208208
// is allowed in the "Volumes" field.
209209
// +optional
210210
AllowedFlexVolumes []AllowedFlexVolume
211-
// AllowedCSIDrivers is a whitelist of inline CSI drivers that must be explicitly set to be embedded within a pod spec.
211+
// AllowedCSIDrivers is an allowlist of inline CSI drivers that must be explicitly set to be embedded within a pod spec.
212212
// An empty value indicates that any CSI driver can be used for inline ephemeral volumes.
213213
// This is an alpha field, and is only honored if the API server enables the CSIInlineVolume feature gate.
214214
// +optional
215215
AllowedCSIDrivers []AllowedCSIDriver
216216
// AllowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none.
217217
// Each entry is either a plain sysctl name or ends in "*" in which case it is considered
218218
// as a prefix of allowed sysctls. Single * means all unsafe sysctls are allowed.
219-
// Kubelet has to whitelist all allowed unsafe sysctls explicitly to avoid rejection.
219+
// Kubelet has to allowlist all unsafe sysctls explicitly to avoid rejection.
220220
//
221221
// Examples:
222222
// e.g. "foo/*" allows "foo/bar", "foo/baz", etc.
@@ -232,7 +232,7 @@ type PodSecurityPolicySpec struct {
232232
// e.g. "foo.*" forbids "foo.bar", "foo.baz", etc.
233233
// +optional
234234
ForbiddenSysctls []string
235-
// AllowedProcMountTypes is a whitelist of allowed ProcMountTypes.
235+
// AllowedProcMountTypes is an allowlist of ProcMountTypes.
236236
// Empty or nil indicates that only the DefaultProcMountType may be used.
237237
// +optional
238238
AllowedProcMountTypes []api.ProcMountType
@@ -449,7 +449,7 @@ const (
449449
// RuntimeClassStrategyOptions define the strategy that will dictate the allowable RuntimeClasses
450450
// for a pod.
451451
type RuntimeClassStrategyOptions struct {
452-
// allowedRuntimeClassNames is a whitelist of RuntimeClass names that may be specified on a pod.
452+
// allowedRuntimeClassNames is an allowlist of RuntimeClass names that may be specified on a pod.
453453
// A value of "*" means that any RuntimeClass name is allowed, and must be the only item in the
454454
// list. An empty list requires the RuntimeClassName field to be unset.
455455
AllowedRuntimeClassNames []string

staging/src/k8s.io/api/extensions/v1beta1/generated.proto

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/extensions/v1beta1/types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ type PodSecurityPolicySpec struct {
985985
// You must not list a capability in both allowedCapabilities and requiredDropCapabilities.
986986
// +optional
987987
AllowedCapabilities []v1.Capability `json:"allowedCapabilities,omitempty" protobuf:"bytes,4,rep,name=allowedCapabilities,casttype=k8s.io/api/core/v1.Capability"`
988-
// volumes is a white list of allowed volume plugins. Empty indicates that
988+
// volumes is an allowlist of volume plugins. Empty indicates that
989989
// no volumes may be used. To allow all volumes you may use '*'.
990990
// +optional
991991
Volumes []FSType `json:"volumes,omitempty" protobuf:"bytes,5,rep,name=volumes,casttype=FSType"`
@@ -1029,23 +1029,23 @@ type PodSecurityPolicySpec struct {
10291029
// privilege escalation. If unspecified, defaults to true.
10301030
// +optional
10311031
AllowPrivilegeEscalation *bool `json:"allowPrivilegeEscalation,omitempty" protobuf:"varint,16,opt,name=allowPrivilegeEscalation"`
1032-
// allowedHostPaths is a white list of allowed host paths. Empty indicates
1032+
// allowedHostPaths is an allowlist of host paths. Empty indicates
10331033
// that all host paths may be used.
10341034
// +optional
10351035
AllowedHostPaths []AllowedHostPath `json:"allowedHostPaths,omitempty" protobuf:"bytes,17,rep,name=allowedHostPaths"`
1036-
// allowedFlexVolumes is a whitelist of allowed Flexvolumes. Empty or nil indicates that all
1036+
// allowedFlexVolumes is an allowlist of Flexvolumes. Empty or nil indicates that all
10371037
// Flexvolumes may be used. This parameter is effective only when the usage of the Flexvolumes
10381038
// is allowed in the "volumes" field.
10391039
// +optional
10401040
AllowedFlexVolumes []AllowedFlexVolume `json:"allowedFlexVolumes,omitempty" protobuf:"bytes,18,rep,name=allowedFlexVolumes"`
1041-
// AllowedCSIDrivers is a whitelist of inline CSI drivers that must be explicitly set to be embedded within a pod spec.
1041+
// AllowedCSIDrivers is an allowlist of inline CSI drivers that must be explicitly set to be embedded within a pod spec.
10421042
// An empty value indicates that any CSI driver can be used for inline ephemeral volumes.
10431043
// +optional
10441044
AllowedCSIDrivers []AllowedCSIDriver `json:"allowedCSIDrivers,omitempty" protobuf:"bytes,23,rep,name=allowedCSIDrivers"`
10451045
// allowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none.
10461046
// Each entry is either a plain sysctl name or ends in "*" in which case it is considered
10471047
// as a prefix of allowed sysctls. Single * means all unsafe sysctls are allowed.
1048-
// Kubelet has to whitelist all allowed unsafe sysctls explicitly to avoid rejection.
1048+
// Kubelet has to allowlist all unsafe sysctls explicitly to avoid rejection.
10491049
//
10501050
// Examples:
10511051
// e.g. "foo/*" allows "foo/bar", "foo/baz", etc.
@@ -1061,7 +1061,7 @@ type PodSecurityPolicySpec struct {
10611061
// e.g. "foo.*" forbids "foo.bar", "foo.baz", etc.
10621062
// +optional
10631063
ForbiddenSysctls []string `json:"forbiddenSysctls,omitempty" protobuf:"bytes,20,rep,name=forbiddenSysctls"`
1064-
// AllowedProcMountTypes is a whitelist of allowed ProcMountTypes.
1064+
// AllowedProcMountTypes is an allowlist of allowed ProcMountTypes.
10651065
// Empty or nil indicates that only the DefaultProcMountType may be used.
10661066
// This requires the ProcMountType feature flag to be enabled.
10671067
// +optional
@@ -1289,7 +1289,7 @@ const (
12891289
// RuntimeClassStrategyOptions define the strategy that will dictate the allowable RuntimeClasses
12901290
// for a pod.
12911291
type RuntimeClassStrategyOptions struct {
1292-
// allowedRuntimeClassNames is a whitelist of RuntimeClass names that may be specified on a pod.
1292+
// allowedRuntimeClassNames is an allowlist of RuntimeClass names that may be specified on a pod.
12931293
// A value of "*" means that any RuntimeClass name is allowed, and must be the only item in the
12941294
// list. An empty list requires the RuntimeClassName field to be unset.
12951295
AllowedRuntimeClassNames []string `json:"allowedRuntimeClassNames" protobuf:"bytes,1,rep,name=allowedRuntimeClassNames"`

0 commit comments

Comments
 (0)