Support unnamed ports for annotation defaults

Currently, a default port is only set if it has an associated name.
This uses the first Pod's ContainerPort directly even if it doesn't
have an associated name.

All of the documentation already supports this design.

connect-inject/handler.go

@@ -279,7 +279,11 @@ func (h *Handler) defaultAnnotations(pod *corev1.Pod) error {
 	if _, ok := pod.ObjectMeta.Annotations[annotationPort]; !ok {
 		if cs := pod.Spec.Containers; len(cs) > 0 {
 			if ps := cs[0].Ports; len(ps) > 0 {
-				pod.ObjectMeta.Annotations[annotationPort] = ps[0].Name
+				if ps[0].Name != "" {
+					pod.ObjectMeta.Annotations[annotationPort] = ps[0].Name
+				} else {
+					pod.ObjectMeta.Annotations[annotationPort] = strconv.Itoa(int(ps[0].ContainerPort))
+				}
 			}
 		}
 	}

connect-inject/handler_test.go

@@ -335,6 +335,33 @@ func TestHandlerDefaultAnnotations(t *testing.T) {
 			},
 			"",
 		},
+
+		{
+			"basic pod, with unnamed ports",
+			&corev1.Pod{
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{
+						corev1.Container{
+							Name: "web",
+							Ports: []corev1.ContainerPort{
+								corev1.ContainerPort{
+									ContainerPort: 8080,
+								},
+							},
+						},
+
+						corev1.Container{
+							Name: "web-side",
+						},
+					},
+				},
+			},
+			map[string]string{
+				annotationService: "web",
+				annotationPort:    "8080",
+			},
+			"",
+		},
 	}
 
 	for _, tt := range cases {
@@ -360,6 +387,93 @@ func TestHandlerDefaultAnnotations(t *testing.T) {
 	}
 }
 
+// Test portValue function
+func TestHandlerPortValue(t *testing.T) {
+	cases := []struct {
+		Name     string
+		Pod      *corev1.Pod
+		Value    string
+		Expected int32
+		Err      string
+	}{
+		{
+			"empty",
+			&corev1.Pod{},
+			"",
+			0,
+			"strconv.ParseInt: parsing \"\": invalid syntax",
+		},
+
+		{
+			"basic pod, with ports",
+			&corev1.Pod{
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{
+						corev1.Container{
+							Name: "web",
+							Ports: []corev1.ContainerPort{
+								corev1.ContainerPort{
+									Name:          "http",
+									ContainerPort: 8080,
+								},
+							},
+						},
+
+						corev1.Container{
+							Name: "web-side",
+						},
+					},
+				},
+			},
+			"http",
+			int32(8080),
+			"",
+		},
+
+		{
+			"basic pod, with unnamed ports",
+			&corev1.Pod{
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{
+						corev1.Container{
+							Name: "web",
+							Ports: []corev1.ContainerPort{
+								corev1.ContainerPort{
+									ContainerPort: 8080,
+								},
+							},
+						},
+
+						corev1.Container{
+							Name: "web-side",
+						},
+					},
+				},
+			},
+			"8080",
+			int32(8080),
+			"",
+		},
+	}
+
+	for _, tt := range cases {
+		t.Run(tt.Name, func(t *testing.T) {
+			require := require.New(t)
+
+			port, err := portValue(tt.Pod, tt.Value)
+			if (tt.Err != "") != (err != nil) {
+				t.Fatalf("actual: %v, expected err: %v", err, tt.Err)
+			}
+			if tt.Err != "" {
+				require.Contains(err.Error(), tt.Err)
+				return
+			}
+
+			require.Equal(port, tt.Expected)
+		})
+	}
+}
+
 // encodeRaw is a helper to encode some data into a RawExtension.
 func encodeRaw(t *testing.T, input interface{}) runtime.RawExtension {
 	data, err := json.Marshal(input)