Merge pull request kubernetes#82004 from pohly/ephemeral-beta

ephemeral inline CSI volumes as beta

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -329,6 +329,7 @@ const (
 
 	// owner: @vladimirvivien
 	// alpha: v1.14
+	// beta: v1.16
 	//
 	// Enables CSI Inline volumes support for pods
 	CSIInlineVolume featuregate.Feature = "CSIInlineVolume"
@@ -549,7 +550,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 	VolumeSubpathEnvExpansion:           {Default: true, PreRelease: featuregate.Beta},
 	ResourceQuotaScopeSelectors:         {Default: true, PreRelease: featuregate.Beta},
 	CSIBlockVolume:                      {Default: true, PreRelease: featuregate.Beta},
-	CSIInlineVolume:                     {Default: false, PreRelease: featuregate.Alpha},
+	CSIInlineVolume:                     {Default: true, PreRelease: featuregate.Beta},
 	RuntimeClass:                        {Default: true, PreRelease: featuregate.Beta},
 	NodeLease:                           {Default: true, PreRelease: featuregate.Beta},
 	SCTPSupport:                         {Default: false, PreRelease: featuregate.Alpha},

pkg/features/kube_features.go

@@ -154,8 +154,8 @@ func MounterSetUpTests(t *testing.T, podInfoEnabled bool) {
 			klog.Infof("Starting test %s", test.name)
 			// Modes must be set if (and only if) CSIInlineVolume is enabled.
 			var modes []storagev1beta1.VolumeLifecycleMode
+			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, test.csiInlineVolume)()
 			if test.csiInlineVolume {
-				defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, true)()
 				modes = append(modes, storagev1beta1.VolumeLifecyclePersistent)
 			}
 			fakeClient := fakeclient.NewSimpleClientset(

pkg/volume/csi/csi_mounter_test.go

@@ -231,6 +231,7 @@ func TestPluginGetVolumeNameWithInline(t *testing.T) {
 
 func TestPluginCanSupport(t *testing.T) {
 	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)()
+	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, false)()
 
 	tests := []struct {
 		name       string

pkg/volume/csi/csi_plugin_test.go

@@ -930,7 +930,6 @@ type PodSecurityPolicySpec struct {
 	AllowedFlexVolumes []AllowedFlexVolume `json:"allowedFlexVolumes,omitempty" protobuf:"bytes,18,rep,name=allowedFlexVolumes"`
 	// AllowedCSIDrivers is a whitelist 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.
 	// +optional
 	AllowedCSIDrivers []AllowedCSIDriver `json:"allowedCSIDrivers,omitempty" protobuf:"bytes,23,rep,name=allowedCSIDrivers"`
 	// allowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none.

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

@@ -322,8 +322,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
 				expectEphemeral:        false,
 			},
 			{
-				// TODO(pohly): remove the feature tag when moving to beta
-				name:                   "contain ephemeral=true when using inline volume [Feature:CSIInlineVolume]",
+				name:                   "contain ephemeral=true when using inline volume",
 				podInfoOnMount:         &podInfoTrue,
 				deployClusterRegistrar: true,
 				expectPodInfo:          true,

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

@@ -45,7 +45,7 @@ var _ TestSuite = &ephemeralTestSuite{}
 func InitEphemeralTestSuite() TestSuite {
 	return &ephemeralTestSuite{
 		tsInfo: TestSuiteInfo{
-			name: "ephemeral [Feature:CSIInlineVolume]",
+			name: "ephemeral",
 			testPatterns: []testpatterns.TestPattern{
 				{
 					Name:    "inline ephemeral CSI volume",