From baa88b26cdc5b379021fd83b6ed87acd3385cfcd Mon Sep 17 00:00:00 2001 From: Javier Diaz-Montes Date: Tue, 20 Apr 2021 17:06:39 -0400 Subject: [PATCH] Remove feature gate to GA the setHostnameAsFQDN feature --- pkg/api/pod/util.go | 13 ------------- pkg/features/kube_features.go | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkg/api/pod/util.go b/pkg/api/pod/util.go index dd6922ee376..00c13178fd9 100644 --- a/pkg/api/pod/util.go +++ b/pkg/api/pod/util.go @@ -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 { diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 2751253a462..7223baf870d 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -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},