From 99b5b133949d647d1533716ee0317099ccb1739a Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 1 Jul 2020 09:19:18 +0200 Subject: [PATCH] CSI ephemeral volumes: documentation and owner update The promotion to beta missed some code locations. The owner also changed since the feature was initially designed and implemented. The "is handled by an external CSI driver" to "by certain external CSI drivers" change is supposed to avoid the misconception that this volume type will work with arbitrary CSI drivers. --- pkg/apis/core/types.go | 2 +- pkg/apis/policy/types.go | 2 +- pkg/features/kube_features.go | 2 +- staging/src/k8s.io/api/core/v1/types.go | 2 +- staging/src/k8s.io/api/policy/v1beta1/types.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index ce97932cc79..1a8ffbcc4fe 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -154,7 +154,7 @@ type VolumeSource struct { // StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod // +optional StorageOS *StorageOSVolumeSource - // CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature). + // CSI (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature). // +optional CSI *CSIVolumeSource } diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index 50805b80802..5dcee4cdac5 100644 --- a/pkg/apis/policy/types.go +++ b/pkg/apis/policy/types.go @@ -210,7 +210,7 @@ type PodSecurityPolicySpec struct { AllowedFlexVolumes []AllowedFlexVolume // AllowedCSIDrivers is an allowlist of inline CSI drivers that must be explicitly set to be embedded within a pod spec. // An empty value indicates that any CSI driver can be used for inline ephemeral volumes. - // This is an alpha field, and is only honored if the API server enables the CSIInlineVolume feature gate. + // This is a beta field, and is only honored if the API server enables the CSIInlineVolume feature gate. // +optional AllowedCSIDrivers []AllowedCSIDriver // AllowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none. diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index b43393288f5..be583b8281d 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -286,7 +286,7 @@ const ( // Enables CSI to use raw block storage volumes CSIBlockVolume featuregate.Feature = "CSIBlockVolume" - // owner: @vladimirvivien + // owner: @pohly // alpha: v1.14 // beta: v1.16 // diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 5a892ce494b..d233d3567d0 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -153,7 +153,7 @@ type VolumeSource struct { // StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. // +optional StorageOS *StorageOSVolumeSource `json:"storageos,omitempty" protobuf:"bytes,27,opt,name=storageos"` - // CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature). + // CSI (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature). // +optional CSI *CSIVolumeSource `json:"csi,omitempty" protobuf:"bytes,28,opt,name=csi"` } diff --git a/staging/src/k8s.io/api/policy/v1beta1/types.go b/staging/src/k8s.io/api/policy/v1beta1/types.go index f4a95f45719..d9a05817581 100644 --- a/staging/src/k8s.io/api/policy/v1beta1/types.go +++ b/staging/src/k8s.io/api/policy/v1beta1/types.go @@ -226,7 +226,7 @@ type PodSecurityPolicySpec struct { AllowedFlexVolumes []AllowedFlexVolume `json:"allowedFlexVolumes,omitempty" protobuf:"bytes,18,rep,name=allowedFlexVolumes"` // AllowedCSIDrivers is an allowlist of inline CSI drivers that must be explicitly set to be embedded within a pod spec. // An empty value indicates that any CSI driver can be used for inline ephemeral volumes. - // This is an alpha field, and is only honored if the API server enables the CSIInlineVolume feature gate. + // This is a beta field, and is only honored if the API server enables the CSIInlineVolume feature gate. // +optional AllowedCSIDrivers []AllowedCSIDriver `json:"allowedCSIDrivers,omitempty" protobuf:"bytes,23,rep,name=allowedCSIDrivers"` // allowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none.