From 7460f9e00b7926f41080a94f5b618e25a5b1cba5 Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Wed, 28 Oct 2020 19:29:40 +0100 Subject: [PATCH] fix rebase Signed-off-by: Patrik Cyvoct --- pkg/apis/core/v1/defaults.go | 4 ++++ pkg/apis/core/validation/validation.go | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go index f5d083a1f8a..5c5a95c61c3 100644 --- a/pkg/apis/core/v1/defaults.go +++ b/pkg/apis/core/v1/defaults.go @@ -161,6 +161,10 @@ func SetDefaults_Service(obj *v1.Service) { // 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) && diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index d1f5a674a3a..154f18609c4 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -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")) } } - } return allErrs }