github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

fix rebase

Browse Source 
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
This commit is contained in:
Patrik Cyvoct 2020-10-28 19:29:40 +01:00
parent 0153b96ab8
commit 7460f9e00b
No known key found for this signature in database
GPG Key ID: 4334D82B950FB63A
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/core/v1/defaults.go
View File

@ -161,6 +161,10 @@ func SetDefaults_Service(obj *v1.Service) {
// NOTE: strategy handles cases where ClusterIPs is used (but not ClusterIP). // NOTE: strategy handles cases where ClusterIPs is used (but not ClusterIP).
} }
} }
// any other defaulting depends on cluster configuration.
// further IPFamilies, IPFamilyPolicy defaulting is in ClusterIP alloc/reserve logic
// note: conversion logic handles cases where ClusterIPs is used (but not ClusterIP).
} }
if utilfeature.DefaultFeatureGate.Enabled(features.LoadBalancerIPMode) && if utilfeature.DefaultFeatureGate.Enabled(features.LoadBalancerIPMode) &&

1
pkg/apis/core/validation/validation.go
View File

@ -6011,7 +6011,6 @@ func ValidateLoadBalancerStatus(status *core.LoadBalancerStatus, fldPath *field.
allErrs = append(allErrs, field.Invalid(idxPath.Child("hostname"), ingress.Hostname, "must be a DNS name, not an IP address")) allErrs = append(allErrs, field.Invalid(idxPath.Child("hostname"), ingress.Hostname, "must be a DNS name, not an IP address"))
} }
} }
} }
return allErrs return allErrs
} }