Skip to content

Commit bb5b4ad

Browse files
author
Kevin Taylor
committed
Beta upgrade for feature date VolumeSubpathEnvExpansion
1 parent 18533fe commit bb5b4ad

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
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/apis/core/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,7 @@ type VolumeMount struct {
16831683
// Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
16841684
// Defaults to "" (volume's root).
16851685
// SubPathExpr and SubPath are mutually exclusive.
1686-
// This field is alpha in 1.14.
1686+
// This field is beta in 1.15.
16871687
// +optional
16881688
SubPathExpr string
16891689
}

pkg/features/kube_features.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ const (
322322
PodReadinessGates utilfeature.Feature = "PodReadinessGates"
323323

324324
// owner: @kevtaylor
325-
// alpha: v1.11
325+
// beta: v1.15
326326
//
327327
// Allow subpath environment variable substitution
328328
// Only applicable if the VolumeSubpath feature is also enabled
@@ -495,7 +495,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
495495
VolumeSubpath: {Default: true, PreRelease: utilfeature.GA},
496496
BalanceAttachedNodeVolumes: {Default: false, PreRelease: utilfeature.Alpha},
497497
PodReadinessGates: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16
498-
VolumeSubpathEnvExpansion: {Default: false, PreRelease: utilfeature.Alpha},
498+
VolumeSubpathEnvExpansion: {Default: true, PreRelease: utilfeature.Beta},
499499
KubeletPluginsWatcher: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16
500500
ResourceQuotaScopeSelectors: {Default: true, PreRelease: utilfeature.Beta},
501501
CSIBlockVolume: {Default: true, PreRelease: utilfeature.Beta},

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
@@ -1775,7 +1775,7 @@ type VolumeMount struct {
17751775
// Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
17761776
// Defaults to "" (volume's root).
17771777
// SubPathExpr and SubPath are mutually exclusive.
1778-
// This field is alpha in 1.14.
1778+
// This field is beta in 1.15.
17791779
// +optional
17801780
SubPathExpr string `json:"subPathExpr,omitempty" protobuf:"bytes,6,opt,name=subPathExpr"`
17811781
}

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.

test/e2e/common/expansion.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
157157
Description: Make sure a container's subpath can be set using an
158158
expansion of environment variables.
159159
*/
160-
It("should allow substituting values in a volume subpath [Feature:VolumeSubpathEnvExpansion][NodeAlphaFeature:VolumeSubpathEnvExpansion]", func() {
160+
It("should allow substituting values in a volume subpath [sig-storage][NodeFeature:VolumeSubpathEnvExpansion]", func() {
161161
podName := "var-expansion-" + string(uuid.NewUUID())
162162
pod := &v1.Pod{
163163
ObjectMeta: metav1.ObjectMeta{
@@ -217,7 +217,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
217217
Description: Make sure a container's subpath can not be set using an
218218
expansion of environment variables when backticks are supplied.
219219
*/
220-
It("should fail substituting values in a volume subpath with backticks [Feature:VolumeSubpathEnvExpansion][NodeAlphaFeature:VolumeSubpathEnvExpansion][Slow]", func() {
220+
It("should fail substituting values in a volume subpath with backticks [sig-storage][NodeFeature:VolumeSubpathEnvExpansion][Slow]", func() {
221221

222222
podName := "var-expansion-" + string(uuid.NewUUID())
223223
pod := &v1.Pod{
@@ -266,7 +266,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
266266
Description: Make sure a container's subpath can not be set using an
267267
expansion of environment variables when absolute path is supplied.
268268
*/
269-
It("should fail substituting values in a volume subpath with absolute path [Feature:VolumeSubpathEnvExpansion][NodeAlphaFeature:VolumeSubpathEnvExpansion][Slow]", func() {
269+
It("should fail substituting values in a volume subpath with absolute path [sig-storage][NodeFeature:VolumeSubpathEnvExpansion][Slow]", func() {
270270

271271
podName := "var-expansion-" + string(uuid.NewUUID())
272272
pod := &v1.Pod{
@@ -314,7 +314,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
314314
Testname: var-expansion-subpath-ready-from-failed-state
315315
Description: Verify that a failing subpath expansion can be modified during the lifecycle of a container.
316316
*/
317-
It("should verify that a failing subpath expansion can be modified during the lifecycle of a container [Feature:VolumeSubpathEnvExpansion][NodeAlphaFeature:VolumeSubpathEnvExpansion][Slow]", func() {
317+
It("should verify that a failing subpath expansion can be modified during the lifecycle of a container [sig-storage][NodeFeature:VolumeSubpathEnvExpansion][Slow]", func() {
318318

319319
podName := "var-expansion-" + string(uuid.NewUUID())
320320
containerName := "dapi-container"
@@ -405,7 +405,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
405405
3. successful expansion of the subpathexpr isn't required for volume cleanup
406406
407407
*/
408-
It("should succeed in writing subpaths in container [Feature:VolumeSubpathEnvExpansion][NodeAlphaFeature:VolumeSubpathEnvExpansion][Slow]", func() {
408+
It("should succeed in writing subpaths in container [sig-storage][NodeFeature:VolumeSubpathEnvExpansion][Slow]", func() {
409409

410410
podName := "var-expansion-" + string(uuid.NewUUID())
411411
containerName := "dapi-container"
@@ -514,7 +514,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
514514
515515
*/
516516

517-
It("should not change the subpath mount on a container restart if the environment variable changes [Feature:VolumeSubpathEnvExpansion][NodeAlphaFeature:VolumeSubpathEnvExpansion][Slow]", func() {
517+
It("should not change the subpath mount on a container restart if the environment variable changes [sig-storage][NodeFeature:VolumeSubpathEnvExpansion][Slow]", func() {
518518

519519
suffix := string(uuid.NewUUID())
520520
podName := fmt.Sprintf("var-expansion-%s", suffix)

0 commit comments

Comments
 (0)