Skip to content

Commit a138be8

Browse files
authored
Merge pull request kubernetes#92686 from pohly/csi-ephemeral-volumes-beta
CSI ephemeral volumes: documentation and owner update
2 parents adf2cd4 + ac959b0 commit a138be8

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

api/openapi-spec/swagger.json

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

pkg/apis/core/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ type VolumeSource struct {
154154
// StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod
155155
// +optional
156156
StorageOS *StorageOSVolumeSource
157-
// CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature).
157+
// CSI (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature).
158158
// +optional
159159
CSI *CSIVolumeSource
160160
}

pkg/apis/policy/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ type PodSecurityPolicySpec struct {
210210
AllowedFlexVolumes []AllowedFlexVolume
211211
// 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.
213-
// This is an alpha field, and is only honored if the API server enables the CSIInlineVolume feature gate.
213+
// This is a beta 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.

pkg/features/kube_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ const (
286286
// Enables CSI to use raw block storage volumes
287287
CSIBlockVolume featuregate.Feature = "CSIBlockVolume"
288288

289-
// owner: @vladimirvivien
289+
// owner: @pohly
290290
// alpha: v1.14
291291
// beta: v1.16
292292
//

staging/src/k8s.io/api/core/v1/generated.proto

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/core/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ type VolumeSource struct {
153153
// StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
154154
// +optional
155155
StorageOS *StorageOSVolumeSource `json:"storageos,omitempty" protobuf:"bytes,27,opt,name=storageos"`
156-
// CSI (Container Storage Interface) represents storage that is handled by an external CSI driver (Alpha feature).
156+
// CSI (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature).
157157
// +optional
158158
CSI *CSIVolumeSource `json:"csi,omitempty" protobuf:"bytes,28,opt,name=csi"`
159159
}

staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ type PodSecurityPolicySpec struct {
226226
AllowedFlexVolumes []AllowedFlexVolume `json:"allowedFlexVolumes,omitempty" protobuf:"bytes,18,rep,name=allowedFlexVolumes"`
227227
// AllowedCSIDrivers is an allowlist of inline CSI drivers that must be explicitly set to be embedded within a pod spec.
228228
// An empty value indicates that any CSI driver can be used for inline ephemeral volumes.
229-
// This is an alpha field, and is only honored if the API server enables the CSIInlineVolume feature gate.
229+
// This is a beta field, and is only honored if the API server enables the CSIInlineVolume feature gate.
230230
// +optional
231231
AllowedCSIDrivers []AllowedCSIDriver `json:"allowedCSIDrivers,omitempty" protobuf:"bytes,23,rep,name=allowedCSIDrivers"`
232232
// allowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none.

staging/src/k8s.io/api/policy/v1beta1/types_swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)