Merge pull request #33274 from nebril/headless-lb

Automatic merge from submit-queue Disallow headless Services with LB type **What this PR does / why we need it**: It adds new validation rule for Services, to ensure that creating LoadBalancer type service with cluster IP set to "None" fails. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #33036 **Release note**: ```release-note Creating LoadBalancer Service with "None" ClusterIP is no longer possible ```

Merge pull request #33274 from nebril/headless-lb
6a46bf1b · Kubernetes Submit Queue · GitHub · cfb833e8 · 9e1c886a · 6a46bf1b
Commit 6a46bf1b authored Sep 29, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 0 deletions

validation.go pkg/api/validation/validation.go +3 -0

validation_test.go pkg/api/validation/validation_test.go +16 -0

No files found.
--- a/pkg/api/validation/validation.go
+++ b/pkg/api/validation/validation.go
@@ -2406,6 +2406,9 @@ func ValidateService(service *api.Service) field.ErrorList {
 				allErrs = append(allErrs, field.Invalid(portPath, port.Port, "may not expose port 10250 externally since it is used by kubelet"))
 			}
 		}
+		if service.Spec.ClusterIP == "None" {
+			allErrs = append(allErrs, field.Invalid(specPath.Child("clusterIP"), service.Spec.ClusterIP, "may not be set to 'None' for LoadBalancer services"))
+		}
 	case api.ServiceTypeExternalName:
 		if service.Spec.ClusterIP != "" {
 			allErrs = append(allErrs, field.Invalid(specPath.Child("clusterIP"), service.Spec.ClusterIP, "must be empty for ExternalName services"))

--- a/pkg/api/validation/validation_test.go
+++ b/pkg/api/validation/validation_test.go
@@ -5173,6 +5173,14 @@ func TestValidateService(t *testing.T) {
 			},
 			numErrs: 1,
 		},
+		{
+			name: "LoadBalancer type cannot have None ClusterIP",
+			tweakSvc: func(s *api.Service) {
+				s.Spec.ClusterIP = "None"
+				s.Spec.Type = api.ServiceTypeLoadBalancer
+			},
+			numErrs: 1,
+		},
 	}

 	for _, tc := range testCases {
@@ -6432,6 +6440,14 @@ func TestValidateServiceUpdate(t *testing.T) {
 			},
 			numErrs: 1,
 		},
+		{
+			name: "LoadBalancer type cannot have None ClusterIP",
+			tweakSvc: func(oldSvc, newSvc *api.Service) {
+				newSvc.Spec.ClusterIP = "None"
+				newSvc.Spec.Type = api.ServiceTypeLoadBalancer
+			},
+			numErrs: 1,
+		},
 	}

 	for _, tc := range testCases {