github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove feature gate to GA the setHostnameAsFQDN feature

Browse Source
This commit is contained in:
Javier Diaz-Montes 2021-04-20 17:06:39 -04:00
parent 6ede5ca95f
commit baa88b26cd
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,11 +584,6 @@ func dropDisabledFields(
podSpec.PreemptionPolicy = nil
}
if !utilfeature.DefaultFeatureGate.Enabled(features.SetHostnameAsFQDN) && !setHostnameAsFQDNInUse(oldPodSpec) {
// Set SetHostnameAsFQDN to nil only if feature is disabled and it is not used
podSpec.SetHostnameAsFQDN = nil
}
dropDisabledPodAffinityTermFields(podSpec, oldPodSpec)
}
@ -883,14 +878,6 @@ func multiplePodIPsInUse(podStatus *api.PodStatus) bool {
return false
}
// setHostnameAsFQDNInUse returns true if any pod's spec defines setHostnameAsFQDN field.
func setHostnameAsFQDNInUse(podSpec *api.PodSpec) bool {
if podSpec == nil || podSpec.SetHostnameAsFQDN == nil {
return false
}
return *podSpec.SetHostnameAsFQDN
}
// SeccompAnnotationForField takes a pod seccomp profile field and returns the
// converted annotation value
func SeccompAnnotationForField(field *api.SeccompProfile) string {

3
pkg/features/kube_features.go
View File

@ -581,6 +581,7 @@ const (
// owner: @javidiaz
// alpha: v1.19
// beta: v1.20
// GA: v1.22
//
// Allow setting the Fully Qualified Domain Name (FQDN) in the hostname of a Pod. If a Pod does not
// have FQDN, this feature has no effect.
@ -844,7 +845,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ExternalPolicyForExternalIP: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.22
AnyVolumeDataSource: {Default: false, PreRelease: featuregate.Alpha},
DefaultPodTopologySpread: {Default: true, PreRelease: featuregate.Beta},
SetHostnameAsFQDN: {Default: true, PreRelease: featuregate.Beta},
SetHostnameAsFQDN: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, //remove in 1.24
WinOverlay: {Default: true, PreRelease: featuregate.Beta},
WinDSR: {Default: false, PreRelease: featuregate.Alpha},
DisableAcceleratorUsageMetrics: {Default: true, PreRelease: featuregate.Beta},