Merge pull request #13756 from kargakis/make-external-svcs-exposable

expose: Avoid selector resolution if a selector is not needed
2026-01-05 15:37:24 +00:00 · 2015-09-14 16:01:55 -07:00
parent cbf5939d1c a49230e736
commit 0898ce852d
3 changed files with 204 additions and 65 deletions
--- a/pkg/kubectl/cmd/expose_test.go
+++ b/pkg/kubectl/cmd/expose_test.go
@@ -30,19 +30,18 @@ import (

 func TestRunExposeService(t *testing.T) {
 	tests := []struct {
-		name        string
-		args        []string
-		ns          string
-		calls       map[string]string
-		input       runtime.Object
-		flags       map[string]string
-		output      runtime.Object
-		expected    string
-		status      int
-		podSelector string
+		name     string
+		args     []string
+		ns       string
+		calls    map[string]string
+		input    runtime.Object
+		flags    map[string]string
+		output   runtime.Object
+		expected string
+		status   int
 	}{
 		{
-			name: "expose-service-from-service-no-selector",
+			name: "expose-service-from-service-no-selector-defined",
 			args: []string{"service", "baz"},
 			ns:   "test",
 			calls: map[string]string{
@@ -51,28 +50,26 @@ func TestRunExposeService(t *testing.T) {
 			},
 			input: &api.Service{
 				ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
 				Spec: api.ServiceSpec{
 					Selector: map[string]string{"app": "go"},
 				},
 			},
-			podSelector: "app=go",
-			flags:       map[string]string{"protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test"},
+			flags: map[string]string{"protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test"},
 			output: &api.Service{
-				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test", ResourceVersion: "12", Labels: map[string]string{"svc": "test"}},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
+				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
 				Spec: api.ServiceSpec{
 					Ports: []api.ServicePort{
 						{
-							Name:     "default",
-							Protocol: api.Protocol("UDP"),
-							Port:     14,
+							Protocol:   api.ProtocolUDP,
+							Port:       14,
+							TargetPort: util.NewIntOrStringFromInt(14),
 						},
 					},
 					Selector: map[string]string{"app": "go"},
 				},
 			},
-			status: 200,
+			expected: "service \"foo\" exposed",
+			status:   200,
 		},
 		{
 			name: "expose-service-from-service",
@@ -84,27 +81,26 @@ func TestRunExposeService(t *testing.T) {
 			},
 			input: &api.Service{
 				ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
 				Spec: api.ServiceSpec{
 					Selector: map[string]string{"app": "go"},
 				},
 			},
 			flags: map[string]string{"selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test"},
 			output: &api.Service{
-				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test", ResourceVersion: "12", Labels: map[string]string{"svc": "test"}},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
+				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
 				Spec: api.ServiceSpec{
 					Ports: []api.ServicePort{
 						{
-							Name:     "default",
-							Protocol: api.Protocol("UDP"),
-							Port:     14,
+							Protocol:   api.ProtocolUDP,
+							Port:       14,
+							TargetPort: util.NewIntOrStringFromInt(14),
 						},
 					},
 					Selector: map[string]string{"func": "stream"},
 				},
 			},
-			status: 200,
+			expected: "service \"foo\" exposed",
+			status:   200,
 		},
 		{
 			name: "no-name-passed-from-the-cli",
@@ -116,7 +112,6 @@ func TestRunExposeService(t *testing.T) {
 			},
 			input: &api.Service{
 				ObjectMeta: api.ObjectMeta{Name: "mayor", Namespace: "default", ResourceVersion: "12"},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
 				Spec: api.ServiceSpec{
 					Selector: map[string]string{"run": "this"},
 				},
@@ -124,20 +119,20 @@ func TestRunExposeService(t *testing.T) {
 			// No --name flag specified below. Service will use the rc's name passed via the 'default-name' parameter
 			flags: map[string]string{"selector": "run=this", "port": "80", "labels": "runas=amayor"},
 			output: &api.Service{
-				ObjectMeta: api.ObjectMeta{Name: "mayor", Namespace: "default", ResourceVersion: "12", Labels: map[string]string{"runas": "amayor"}},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
+				ObjectMeta: api.ObjectMeta{Name: "mayor", Namespace: "", Labels: map[string]string{"runas": "amayor"}},
 				Spec: api.ServiceSpec{
 					Ports: []api.ServicePort{
 						{
-							Name:     "default",
-							Protocol: api.Protocol("TCP"),
-							Port:     80,
+							Protocol:   api.ProtocolTCP,
+							Port:       80,
+							TargetPort: util.NewIntOrStringFromInt(80),
 						},
 					},
 					Selector: map[string]string{"run": "this"},
 				},
 			},
-			status: 200,
+			expected: "service \"mayor\" exposed",
+			status:   200,
 		},
 		{
 			name: "expose-external-service",
@@ -149,20 +144,17 @@ func TestRunExposeService(t *testing.T) {
 			},
 			input: &api.Service{
 				ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
 				Spec: api.ServiceSpec{
 					Selector: map[string]string{"app": "go"},
 				},
 			},
 			flags: map[string]string{"selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "create-external-load-balancer": "true"},
 			output: &api.Service{
-				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test", ResourceVersion: "12", Labels: map[string]string{"svc": "test"}},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
+				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
 				Spec: api.ServiceSpec{
 					Ports: []api.ServicePort{
 						{
-							Name:       "default",
-							Protocol:   api.Protocol("UDP"),
+							Protocol:   api.ProtocolUDP,
 							Port:       14,
 							TargetPort: util.NewIntOrStringFromInt(14),
 						},
@@ -171,7 +163,8 @@ func TestRunExposeService(t *testing.T) {
 					Type:     api.ServiceTypeLoadBalancer,
 				},
 			},
-			status: 200,
+			expected: "service \"foo\" exposed",
+			status:   200,
 		},
 		{
 			name: "expose-external-affinity-service",
@@ -183,20 +176,17 @@ func TestRunExposeService(t *testing.T) {
 			},
 			input: &api.Service{
 				ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
 				Spec: api.ServiceSpec{
 					Selector: map[string]string{"app": "go"},
 				},
 			},
 			flags: map[string]string{"selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "create-external-load-balancer": "true", "session-affinity": "ClientIP"},
 			output: &api.Service{
-				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test", ResourceVersion: "12", Labels: map[string]string{"svc": "test"}},
-				TypeMeta:   api.TypeMeta{Kind: "Service", APIVersion: "v1"},
+				ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "", Labels: map[string]string{"svc": "test"}},
 				Spec: api.ServiceSpec{
 					Ports: []api.ServicePort{
 						{
-							Name:       "default",
-							Protocol:   api.Protocol("UDP"),
+							Protocol:   api.ProtocolUDP,
 							Port:       14,
 							TargetPort: util.NewIntOrStringFromInt(14),
 						},
@@ -206,7 +196,39 @@ func TestRunExposeService(t *testing.T) {
 					SessionAffinity: api.ServiceAffinityClientIP,
 				},
 			},
-			status: 200,
+			expected: "service \"foo\" exposed",
+			status:   200,
+		},
+		{
+			name: "expose-external-service",
+			args: []string{"service", "baz"},
+			ns:   "test",
+			calls: map[string]string{
+				"GET":  "/namespaces/test/services/baz",
+				"POST": "/namespaces/test/services",
+			},
+			input: &api.Service{
+				ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
+				Spec: api.ServiceSpec{
+					Ports: []api.ServicePort{},
+				},
+			},
+			// Even if we specify --selector, since service/test doesn't need one it will ignore it
+			flags: map[string]string{"selector": "svc=fromexternal", "port": "90", "labels": "svc=fromexternal", "name": "frombaz", "generator": "service/test"},
+			output: &api.Service{
+				ObjectMeta: api.ObjectMeta{Name: "frombaz", Namespace: "", Labels: map[string]string{"svc": "fromexternal"}},
+				Spec: api.ServiceSpec{
+					Ports: []api.ServicePort{
+						{
+							Protocol:   api.ProtocolTCP,
+							Port:       90,
+							TargetPort: util.NewIntOrStringFromInt(90),
+						},
+					},
+				},
+			},
+			expected: "service \"frombaz\" exposed",
+			status:   200,
 		},
 	}

@@ -228,8 +250,6 @@ func TestRunExposeService(t *testing.T) {
 			}),
 		}
 		tf.Namespace = test.ns
-		f.PodSelectorForObject = func(obj runtime.Object) (string, error) { return test.podSelector, nil }
-
 		buf := bytes.NewBuffer([]byte{})

 		cmd := NewCmdExposeService(f, buf)
@@ -238,11 +258,10 @@ func TestRunExposeService(t *testing.T) {
 			cmd.Flags().Set(flag, value)
 		}
 		cmd.Run(cmd, test.args)
-		if len(test.expected) > 0 {
-			out := buf.String()
-			if !strings.Contains(out, test.expected) {
-				t.Errorf("%s: unexpected output: %s", test.name, out)
-			}
+
+		out, expectedOut := buf.String(), test.expected
+		if !strings.Contains(out, expectedOut) {
+			t.Errorf("%s: Unexpected output! Expected\n%s\ngot\n%s", test.name, expectedOut, out)
 		}
 	}
 }