Merge pull request kubernetes#110990 from thockin/svc-typenames-IPFamilyPolicyType

Rename IPFamilyPolicyType => IPFamilyPolicy

Author: k8s-ci-robot

pkg/api/service/testing/make.go

@@ -157,7 +157,7 @@ func SetIPFamilies(families ...api.IPFamily) Tweak {
 }
 
 // SetIPFamilyPolicy sets the service IPFamilyPolicy field.
-func SetIPFamilyPolicy(policy api.IPFamilyPolicyType) Tweak {
+func SetIPFamilyPolicy(policy api.IPFamilyPolicy) Tweak {
 	return func(svc *api.Service) {
 		svc.Spec.IPFamilyPolicy = &policy
 	}

pkg/apis/core/types.go

@@ -3736,27 +3736,27 @@ const (
 	IPv6Protocol IPFamily = "IPv6"
 )
 
-// IPFamilyPolicyType represents the dual-stack-ness requested or required by a Service
-type IPFamilyPolicyType string
+// IPFamilyPolicy represents the dual-stack-ness requested or required by a Service
+type IPFamilyPolicy string
 
 const (
 	// IPFamilyPolicySingleStack indicates that this service is required to have a single IPFamily.
 	// The IPFamily assigned is based on the default IPFamily used by the cluster
 	// or as identified by service.spec.ipFamilies field
-	IPFamilyPolicySingleStack IPFamilyPolicyType = "SingleStack"
+	IPFamilyPolicySingleStack IPFamilyPolicy = "SingleStack"
 	// IPFamilyPolicyPreferDualStack indicates that this service prefers dual-stack when
 	// the cluster is configured for dual-stack. If the cluster is not configured
 	// for dual-stack the service will be assigned a single IPFamily. If the IPFamily is not
 	// set in service.spec.ipFamilies then the service will be assigned the default IPFamily
 	// configured on the cluster
-	IPFamilyPolicyPreferDualStack IPFamilyPolicyType = "PreferDualStack"
+	IPFamilyPolicyPreferDualStack IPFamilyPolicy = "PreferDualStack"
 	// IPFamilyPolicyRequireDualStack indicates that this service requires dual-stack. Using
 	// IPFamilyPolicyRequireDualStack on a single stack cluster will result in validation errors. The
 	// IPFamilies (and their order) assigned  to this service is based on service.spec.ipFamilies. If
 	// service.spec.ipFamilies was not provided then it will be assigned according to how they are
 	// configured on the cluster. If service.spec.ipFamilies has only one entry then the alternative
 	// IPFamily will be added by apiserver
-	IPFamilyPolicyRequireDualStack IPFamilyPolicyType = "RequireDualStack"
+	IPFamilyPolicyRequireDualStack IPFamilyPolicy = "RequireDualStack"
 )
 
 // ServiceSpec describes the attributes that a user creates on a service
@@ -3829,7 +3829,7 @@ type ServiceSpec struct {
 	// to this service can be controlled by service.spec.ipFamilies and service.spec.clusterIPs
 	// respectively.
 	// +optional
-	IPFamilyPolicy *IPFamilyPolicyType
+	IPFamilyPolicy *IPFamilyPolicy
 
 	// ExternalName is the external reference that kubedns or equivalent will
 	// return as a CNAME record for this service. No proxying will be involved.

pkg/apis/core/v1/zz_generated.conversion.go

@@ -1012,7 +1012,7 @@ func isMatchingPreferDualStackClusterIPFields(after After, before Before) bool {
 
 // Helper to avoid nil-checks all over.  Callers of this need to be checking
 // for an exact value.
-func getIPFamilyPolicy(svc *api.Service) api.IPFamilyPolicyType {
+func getIPFamilyPolicy(svc *api.Service) api.IPFamilyPolicy {
 	if svc.Spec.IPFamilyPolicy == nil {
 		return "" // callers need to handle this
 	}

pkg/apis/core/zz_generated.deepcopy.go

@@ -1239,7 +1239,7 @@ func proveHealthCheckNodePortDeallocated(t *testing.T, storage *wrapperRESTForTe
 // functional tests of the registry
 //
 
-func fmtIPFamilyPolicy(pol *api.IPFamilyPolicyType) string {
+func fmtIPFamilyPolicy(pol *api.IPFamilyPolicy) string {
 	if pol == nil {
 		return "<nil>"
 	}
@@ -1453,7 +1453,7 @@ func TestCreateInitIPFields(t *testing.T) {
 		line           string
 		svc            *api.Service
 		expectError    bool
-		expectPolicy   api.IPFamilyPolicyType
+		expectPolicy   api.IPFamilyPolicy
 		expectFamilies []api.IPFamily
 		expectHeadless bool
 	}
@@ -5922,7 +5922,7 @@ func TestCreateInvalidClusterIPInputs(t *testing.T) {
 		name:     "bad_ipFamilyPolicy",
 		families: []api.IPFamily{api.IPv4Protocol},
 		svc: svctest.MakeService("foo",
-			svctest.SetIPFamilyPolicy(api.IPFamilyPolicyType("garbage"))),
+			svctest.SetIPFamilyPolicy(api.IPFamilyPolicy("garbage"))),
 		expect: []string{"Unsupported value"},
 	}, {
 		name:     "requiredual_ipFamilyPolicy_on_singlestack",