remove dependency from service generator

pkg/kubectl/service.go

@@ -21,10 +21,10 @@ import (
 	"strconv"
 	"strings"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 // The only difference between ServiceGeneratorV1 and V2 is that the service port is named "default" in V1, while it is left unnamed in V2.
@@ -113,7 +113,7 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) {
 
 	isHeadlessService := params["cluster-ip"] == "None"
 
-	ports := []api.ServicePort{}
+	ports := []v1.ServicePort{}
 	servicePortName, found := params["port-name"]
 	if !found {
 		// Leave the port unnamed.
@@ -168,20 +168,20 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) {
 					protocol = exposeProtocol
 				}
 			}
-			ports = append(ports, api.ServicePort{
+			ports = append(ports, v1.ServicePort{
 				Name:     name,
 				Port:     int32(port),
-				Protocol: api.Protocol(protocol),
+				Protocol: v1.Protocol(protocol),
 			})
 		}
 	}
 
-	service := api.Service{
+	service := v1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   name,
 			Labels: labels,
 		},
-		Spec: api.ServiceSpec{
+		Spec: v1.ServiceSpec{
 			Selector: selector,
 			Ports:    ports,
 		},
@@ -213,24 +213,24 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) {
 		service.Spec.ExternalIPs = []string{params["external-ip"]}
 	}
 	if len(params["type"]) != 0 {
-		service.Spec.Type = api.ServiceType(params["type"])
+		service.Spec.Type = v1.ServiceType(params["type"])
 	}
-	if service.Spec.Type == api.ServiceTypeLoadBalancer {
+	if service.Spec.Type == v1.ServiceTypeLoadBalancer {
 		service.Spec.LoadBalancerIP = params["load-balancer-ip"]
 	}
 	if len(params["session-affinity"]) != 0 {
-		switch api.ServiceAffinity(params["session-affinity"]) {
-		case api.ServiceAffinityNone:
-			service.Spec.SessionAffinity = api.ServiceAffinityNone
-		case api.ServiceAffinityClientIP:
-			service.Spec.SessionAffinity = api.ServiceAffinityClientIP
+		switch v1.ServiceAffinity(params["session-affinity"]) {
+		case v1.ServiceAffinityNone:
+			service.Spec.SessionAffinity = v1.ServiceAffinityNone
+		case v1.ServiceAffinityClientIP:
+			service.Spec.SessionAffinity = v1.ServiceAffinityClientIP
 		default:
 			return nil, fmt.Errorf("unknown session affinity: %s", params["session-affinity"])
 		}
 	}
 	if len(params["cluster-ip"]) != 0 {
 		if params["cluster-ip"] == "None" {
-			service.Spec.ClusterIP = api.ClusterIPNone
+			service.Spec.ClusterIP = v1.ClusterIPNone
 		} else {
 			service.Spec.ClusterIP = params["cluster-ip"]
 		}