github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101294 from twosigma/gasethostnamefqdn

Browse Source 
Promote setHostnameAsFQDN feature to GA
This commit is contained in:
Kubernetes Prow Robot
2021-06-09 09:07:48 -07:00
committed by GitHub
parent a3abd06ad5 baa88b26cd
commit 3d6e0694bb
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,11 +619,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)
}
@@ -918,14 +913,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 {