Skip to content

Commit 482a900

Browse files
committed
storage: make CSIInlineVolume a beta feature
The feature is complete and supported by an increasing number of CSI drivers, but before it can be really used, it should be moved out of alpha into beta.
1 parent 599a9fa commit 482a900

File tree

7 files changed

+6
-8
lines changed

7 files changed

+6
-8
lines changed

api/openapi-spec/swagger.json

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

pkg/features/kube_features.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ const (
316316

317317
// owner: @vladimirvivien
318318
// alpha: v1.14
319+
// beta: v1.16
319320
//
320321
// Enables CSI Inline volumes support for pods
321322
CSIInlineVolume featuregate.Feature = "CSIInlineVolume"
@@ -529,7 +530,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
529530
VolumeSubpathEnvExpansion: {Default: true, PreRelease: featuregate.Beta},
530531
ResourceQuotaScopeSelectors: {Default: true, PreRelease: featuregate.Beta},
531532
CSIBlockVolume: {Default: true, PreRelease: featuregate.Beta},
532-
CSIInlineVolume: {Default: false, PreRelease: featuregate.Alpha},
533+
CSIInlineVolume: {Default: true, PreRelease: featuregate.Beta},
533534
RuntimeClass: {Default: true, PreRelease: featuregate.Beta},
534535
NodeLease: {Default: true, PreRelease: featuregate.Beta},
535536
SCTPSupport: {Default: false, PreRelease: featuregate.Alpha},

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

Lines changed: 0 additions & 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/extensions/v1beta1/types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,6 @@ type PodSecurityPolicySpec struct {
930930
AllowedFlexVolumes []AllowedFlexVolume `json:"allowedFlexVolumes,omitempty" protobuf:"bytes,18,rep,name=allowedFlexVolumes"`
931931
// AllowedCSIDrivers is a whitelist of inline CSI drivers that must be explicitly set to be embedded within a pod spec.
932932
// An empty value indicates that any CSI driver can be used for inline ephemeral volumes.
933-
// This is an alpha field, and is only honored if the API server enables the CSIInlineVolume feature gate.
934933
// +optional
935934
AllowedCSIDrivers []AllowedCSIDriver `json:"allowedCSIDrivers,omitempty" protobuf:"bytes,23,rep,name=allowedCSIDrivers"`
936935
// allowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none.

staging/src/k8s.io/api/extensions/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.

test/e2e/storage/csi_mock_volume.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
322322
expectEphemeral: false,
323323
},
324324
{
325-
// TODO(pohly): remove the feature tag when moving to beta
326-
name: "contain ephemeral=true when using inline volume [Feature:CSIInlineVolume]",
325+
name: "contain ephemeral=true when using inline volume",
327326
podInfoOnMount: &podInfoTrue,
328327
deployClusterRegistrar: true,
329328
expectPodInfo: true,

test/e2e/storage/testsuites/ephemeral.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var _ TestSuite = &ephemeralTestSuite{}
4242
func InitEphemeralTestSuite() TestSuite {
4343
return &ephemeralTestSuite{
4444
tsInfo: TestSuiteInfo{
45-
name: "ephemeral [Feature:CSIInlineVolume]",
45+
name: "ephemeral",
4646
testPatterns: []testpatterns.TestPattern{
4747
{
4848
Name: "inline ephemeral CSI volume",

0 commit comments

Comments
 (0)