API warn non-ExternalName services w/ externalName

openshift · Jul 26, 2023 · 182a4f8 · 182a4f8
1 parent 7bd0a85
commit 182a4f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/api/service/warnings.go b/pkg/api/service/warnings.go
@@ -56,6 +56,9 @@ func GetWarningsForService(service, oldService *api.Service) []string {
 	if service.Spec.Type == api.ServiceTypeExternalName && len(service.Spec.ExternalIPs) > 0 {
 		warnings = append(warnings, fmt.Sprintf("spec.externalIPs is ignored when spec.type is %q", api.ServiceTypeExternalName))
 	}
+	if service.Spec.Type != api.ServiceTypeExternalName && service.Spec.ExternalName != "" {
+		warnings = append(warnings, fmt.Sprintf("spec.externalName is ignored when spec.type is not %q", api.ServiceTypeExternalName))
+	}
 
 	return warnings
 }

diff --git a/pkg/api/service/warnings_test.go b/pkg/api/service/warnings_test.go
@@ -50,15 +50,22 @@ func TestGetWarningsForService(t *testing.T) {
 			s.Spec.ExternalIPs = []string{"1.2.3.4"}
 		},
 		numWarnings: 1,
+	}, {
+		name: "externalName set when type is not ExternalName",
+		tweakSvc: func(s *api.Service) {
+			s.Spec.Type = api.ServiceTypeClusterIP
+			s.Spec.ExternalName = "example.com"
+		},
+		numWarnings: 1,
 	}}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			svc := &api.Service{}
 			tc.tweakSvc(svc)
 			warnings := GetWarningsForService(svc, svc)
-			if len(warnings) != tc.numWarnings {
-				t.Errorf("Unexpected warning list: %v", warnings)
+			if want, got := tc.numWarnings, len(warnings); got != want {
+				t.Errorf("Unexpected warning list: expected %d, got %d\n%q", want, got, warnings)
 			}
 		})
 	}