Skip to content

K
k3s
Commit 1725e2f5 authored by Slava Semushin's avatar Slava Semushin
Browse files
Options

Deprecate PSP-related types in extensions/v1beta1 in favor of policy/v1beta1.

parent 90c09c75
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 0 deletions
staging/src/k8s.io/api/extensions/v1beta1/types.go
View file @ 1725e2f5
...@@ -864,6 +864,7 @@ type ReplicaSetCondition struct { ...@@ -864,6 +864,7 @@ type ReplicaSetCondition struct {
// PodSecurityPolicy governs the ability to make requests that affect the Security Context // PodSecurityPolicy governs the ability to make requests that affect the Security Context
// that will be applied to a pod and container. // that will be applied to a pod and container.
// Deprecated: use PodSecurityPolicy from policy API Group instead.
type PodSecurityPolicy struct { type PodSecurityPolicy struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
...@@ -877,6 +878,7 @@ type PodSecurityPolicy struct { ...@@ -877,6 +878,7 @@ type PodSecurityPolicy struct {
} }
// PodSecurityPolicySpec defines the policy enforced. // PodSecurityPolicySpec defines the policy enforced.
// Deprecated: use PodSecurityPolicySpec from policy API Group instead.
type PodSecurityPolicySpec struct { type PodSecurityPolicySpec struct {
// privileged determines if a pod can request to be run as privileged. // privileged determines if a pod can request to be run as privileged.
// +optional // +optional
...@@ -948,6 +950,7 @@ type PodSecurityPolicySpec struct { ...@@ -948,6 +950,7 @@ type PodSecurityPolicySpec struct {
// AllowedHostPath defines the host volume conditions that will be enabled by a policy // AllowedHostPath defines the host volume conditions that will be enabled by a policy
// for pods to use. It requires the path prefix to be defined. // for pods to use. It requires the path prefix to be defined.
// Deprecated: use AllowedHostPath from policy API Group instead.
type AllowedHostPath struct { type AllowedHostPath struct {
// pathPrefix is the path prefix that the host volume must match. // pathPrefix is the path prefix that the host volume must match.
// It does not support `*`. // It does not support `*`.
...@@ -960,6 +963,7 @@ type AllowedHostPath struct { ...@@ -960,6 +963,7 @@ type AllowedHostPath struct {
} }
// FSType gives strong typing to different file systems that are used by volumes. // FSType gives strong typing to different file systems that are used by volumes.
// Deprecated: use FSType from policy API Group instead.
type FSType string type FSType string
var ( var (
...@@ -988,6 +992,7 @@ var ( ...@@ -988,6 +992,7 @@ var (
) )
// AllowedFlexVolume represents a single Flexvolume that is allowed to be used. // AllowedFlexVolume represents a single Flexvolume that is allowed to be used.
// Deprecated: use AllowedFlexVolume from policy API Group instead.
type AllowedFlexVolume struct { type AllowedFlexVolume struct {
// driver is the name of the Flexvolume driver. // driver is the name of the Flexvolume driver.
Driver string `json:"driver" protobuf:"bytes,1,opt,name=driver"` Driver string `json:"driver" protobuf:"bytes,1,opt,name=driver"`
...@@ -995,6 +1000,7 @@ type AllowedFlexVolume struct { ...@@ -995,6 +1000,7 @@ type AllowedFlexVolume struct {
// HostPortRange defines a range of host ports that will be enabled by a policy // HostPortRange defines a range of host ports that will be enabled by a policy
// for pods to use. It requires both the start and end to be defined. // for pods to use. It requires both the start and end to be defined.
// Deprecated: use HostPortRange from policy API Group instead.
type HostPortRange struct { type HostPortRange struct {
// min is the start of the range, inclusive. // min is the start of the range, inclusive.
Min int32 `json:"min" protobuf:"varint,1,opt,name=min"` Min int32 `json:"min" protobuf:"varint,1,opt,name=min"`
...@@ -1003,6 +1009,7 @@ type HostPortRange struct { ...@@ -1003,6 +1009,7 @@ type HostPortRange struct {
} }
// SELinuxStrategyOptions defines the strategy type and any options used to create the strategy. // SELinuxStrategyOptions defines the strategy type and any options used to create the strategy.
// Deprecated: use SELinuxStrategyOptions from policy API Group instead.
type SELinuxStrategyOptions struct { type SELinuxStrategyOptions struct {
// rule is the strategy that will dictate the allowable labels that may be set. // rule is the strategy that will dictate the allowable labels that may be set.
Rule SELinuxStrategy `json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=SELinuxStrategy"` Rule SELinuxStrategy `json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=SELinuxStrategy"`
...@@ -1014,16 +1021,20 @@ type SELinuxStrategyOptions struct { ...@@ -1014,16 +1021,20 @@ type SELinuxStrategyOptions struct {
// SELinuxStrategy denotes strategy types for generating SELinux options for a // SELinuxStrategy denotes strategy types for generating SELinux options for a
// Security Context. // Security Context.
// Deprecated: use SELinuxStrategy from policy API Group instead.
type SELinuxStrategy string type SELinuxStrategy string
const ( const (
// SELinuxStrategyMustRunAs means that container must have SELinux labels of X applied. // SELinuxStrategyMustRunAs means that container must have SELinux labels of X applied.
// Deprecated: use SELinuxStrategyMustRunAs from policy API Group instead.
SELinuxStrategyMustRunAs SELinuxStrategy = "MustRunAs" SELinuxStrategyMustRunAs SELinuxStrategy = "MustRunAs"
// SELinuxStrategyRunAsAny means that container may make requests for any SELinux context labels. // SELinuxStrategyRunAsAny means that container may make requests for any SELinux context labels.
// Deprecated: use SELinuxStrategyRunAsAny from policy API Group instead.
SELinuxStrategyRunAsAny SELinuxStrategy = "RunAsAny" SELinuxStrategyRunAsAny SELinuxStrategy = "RunAsAny"
) )
// RunAsUserStrategyOptions defines the strategy type and any options used to create the strategy. // RunAsUserStrategyOptions defines the strategy type and any options used to create the strategy.
// Deprecated: use RunAsUserStrategyOptions from policy API Group instead.
type RunAsUserStrategyOptions struct { type RunAsUserStrategyOptions struct {
// rule is the strategy that will dictate the allowable RunAsUser values that may be set. // rule is the strategy that will dictate the allowable RunAsUser values that may be set.
Rule RunAsUserStrategy `json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=RunAsUserStrategy"` Rule RunAsUserStrategy `json:"rule" protobuf:"bytes,1,opt,name=rule,casttype=RunAsUserStrategy"`
...@@ -1034,6 +1045,7 @@ type RunAsUserStrategyOptions struct { ...@@ -1034,6 +1045,7 @@ type RunAsUserStrategyOptions struct {
} }
// IDRange provides a min/max of an allowed range of IDs. // IDRange provides a min/max of an allowed range of IDs.
// Deprecated: use IDRange from policy API Group instead.
type IDRange struct { type IDRange struct {
// min is the start of the range, inclusive. // min is the start of the range, inclusive.
Min int64 `json:"min" protobuf:"varint,1,opt,name=min"` Min int64 `json:"min" protobuf:"varint,1,opt,name=min"`
...@@ -1043,18 +1055,23 @@ type IDRange struct { ...@@ -1043,18 +1055,23 @@ type IDRange struct {
// RunAsUserStrategy denotes strategy types for generating RunAsUser values for a // RunAsUserStrategy denotes strategy types for generating RunAsUser values for a
// Security Context. // Security Context.
// Deprecated: use RunAsUserStrategy from policy API Group instead.
type RunAsUserStrategy string type RunAsUserStrategy string
const ( const (
// RunAsUserStrategyMustRunAs means that container must run as a particular uid. // RunAsUserStrategyMustRunAs means that container must run as a particular uid.
// Deprecated: use RunAsUserStrategyMustRunAs from policy API Group instead.
RunAsUserStrategyMustRunAs RunAsUserStrategy = "MustRunAs" RunAsUserStrategyMustRunAs RunAsUserStrategy = "MustRunAs"
// RunAsUserStrategyMustRunAsNonRoot means that container must run as a non-root uid. // RunAsUserStrategyMustRunAsNonRoot means that container must run as a non-root uid.
// Deprecated: use RunAsUserStrategyMustRunAsNonRoot from policy API Group instead.
RunAsUserStrategyMustRunAsNonRoot RunAsUserStrategy = "MustRunAsNonRoot" RunAsUserStrategyMustRunAsNonRoot RunAsUserStrategy = "MustRunAsNonRoot"
// RunAsUserStrategyRunAsAny means that container may make requests for any uid. // RunAsUserStrategyRunAsAny means that container may make requests for any uid.
// Deprecated: use RunAsUserStrategyRunAsAny from policy API Group instead.
RunAsUserStrategyRunAsAny RunAsUserStrategy = "RunAsAny" RunAsUserStrategyRunAsAny RunAsUserStrategy = "RunAsAny"
) )
// FSGroupStrategyOptions defines the strategy type and options used to create the strategy. // FSGroupStrategyOptions defines the strategy type and options used to create the strategy.
// Deprecated: use FSGroupStrategyOptions from policy API Group instead.
type FSGroupStrategyOptions struct { type FSGroupStrategyOptions struct {
// rule is the strategy that will dictate what FSGroup is used in the SecurityContext. // rule is the strategy that will dictate what FSGroup is used in the SecurityContext.
// +optional // +optional
...@@ -1067,16 +1084,20 @@ type FSGroupStrategyOptions struct { ...@@ -1067,16 +1084,20 @@ type FSGroupStrategyOptions struct {
// FSGroupStrategyType denotes strategy types for generating FSGroup values for a // FSGroupStrategyType denotes strategy types for generating FSGroup values for a
// SecurityContext // SecurityContext
// Deprecated: use FSGroupStrategyType from policy API Group instead.
type FSGroupStrategyType string type FSGroupStrategyType string
const ( const (
// FSGroupStrategyMustRunAs meant that container must have FSGroup of X applied. // FSGroupStrategyMustRunAs meant that container must have FSGroup of X applied.
// Deprecated: use FSGroupStrategyMustRunAs from policy API Group instead.
FSGroupStrategyMustRunAs FSGroupStrategyType = "MustRunAs" FSGroupStrategyMustRunAs FSGroupStrategyType = "MustRunAs"
// FSGroupStrategyRunAsAny means that container may make requests for any FSGroup labels. // FSGroupStrategyRunAsAny means that container may make requests for any FSGroup labels.
// Deprecated: use FSGroupStrategyRunAsAny from policy API Group instead.
FSGroupStrategyRunAsAny FSGroupStrategyType = "RunAsAny" FSGroupStrategyRunAsAny FSGroupStrategyType = "RunAsAny"
) )
// SupplementalGroupsStrategyOptions defines the strategy type and options used to create the strategy. // SupplementalGroupsStrategyOptions defines the strategy type and options used to create the strategy.
// Deprecated: use SupplementalGroupsStrategyOptions from policy API Group instead.
type SupplementalGroupsStrategyOptions struct { type SupplementalGroupsStrategyOptions struct {
// rule is the strategy that will dictate what supplemental groups is used in the SecurityContext. // rule is the strategy that will dictate what supplemental groups is used in the SecurityContext.
// +optional // +optional
...@@ -1089,18 +1110,22 @@ type SupplementalGroupsStrategyOptions struct { ...@@ -1089,18 +1110,22 @@ type SupplementalGroupsStrategyOptions struct {
// SupplementalGroupsStrategyType denotes strategy types for determining valid supplemental // SupplementalGroupsStrategyType denotes strategy types for determining valid supplemental
// groups for a SecurityContext. // groups for a SecurityContext.
// Deprecated: use SupplementalGroupsStrategyType from policy API Group instead.
type SupplementalGroupsStrategyType string type SupplementalGroupsStrategyType string
const ( const (
// SupplementalGroupsStrategyMustRunAs means that container must run as a particular gid. // SupplementalGroupsStrategyMustRunAs means that container must run as a particular gid.
// Deprecated: use SupplementalGroupsStrategyMustRunAs from policy API Group instead.
SupplementalGroupsStrategyMustRunAs SupplementalGroupsStrategyType = "MustRunAs" SupplementalGroupsStrategyMustRunAs SupplementalGroupsStrategyType = "MustRunAs"
// SupplementalGroupsStrategyRunAsAny means that container may make requests for any gid. // SupplementalGroupsStrategyRunAsAny means that container may make requests for any gid.
// Deprecated: use SupplementalGroupsStrategyRunAsAny from policy API Group instead.
SupplementalGroupsStrategyRunAsAny SupplementalGroupsStrategyType = "RunAsAny" SupplementalGroupsStrategyRunAsAny SupplementalGroupsStrategyType = "RunAsAny"
) )
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// PodSecurityPolicyList is a list of PodSecurityPolicy objects. // PodSecurityPolicyList is a list of PodSecurityPolicy objects.
// Deprecated: use PodSecurityPolicyList from policy API Group instead.
type PodSecurityPolicyList struct { type PodSecurityPolicyList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment