github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89584 from kevtaylor/kep/VolumeSubpathExpansion-Remove-FeatureGate

Browse Source 
Remove VolumeSubpathEnvExpansion Feature Gate
This commit is contained in:
Kubernetes Prow Robot
2020-03-31 20:03:27 -07:00
committed by GitHub
parent dda530cfb7 9fd48b4039
commit 357d3c9f93
5 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/pod/util.go
View File

@@ -396,8 +396,8 @@ func dropDisabledFields(
podSpec.EphemeralContainers = nil
}
if (!utilfeature.DefaultFeatureGate.Enabled(features.VolumeSubpath) || !utilfeature.DefaultFeatureGate.Enabled(features.VolumeSubpathEnvExpansion)) && !subpathExprInUse(oldPodSpec) {
// drop subpath env expansion from the pod if either of the subpath features is disabled and the old spec did not specify subpath env expansion
if !utilfeature.DefaultFeatureGate.Enabled(features.VolumeSubpath) && !subpathExprInUse(oldPodSpec) {
// drop subpath env expansion from the pod if subpath feature is disabled and the old spec did not specify subpath env expansion
VisitContainers(podSpec, AllContainers, func(c *api.Container, containerType ContainerType) bool {
for i := range c.VolumeMounts {
c.VolumeMounts[i].SubPathExpr = ""