Merge pull request #35094 from chenchun/annotations

pkg/printers/internalversion/describe_test.go

@@ -1265,3 +1265,37 @@ func TestDescribeEvents(t *testing.T) {
 		}
 	}
 }
+
+func TestPrintLabelsMultiline(t *testing.T) {
+	var maxLenAnnotationStr string = "MaxLenAnnotation=Multicast addressing can be used in the link layer (Layer 2 in the OSI model), such as Ethernet multicast, and at the internet layer (Layer 3 for OSI) for Internet Protocol Version 4 "
+	testCases := []struct {
+		annotations map[string]string
+		expectPrint string
+	}{
+		{
+			annotations: map[string]string{"col1": "asd", "COL2": "zxc"},
+			expectPrint: "Annotations:\tCOL2=zxc\n\tcol1=asd\n",
+		},
+		{
+			annotations: map[string]string{"MaxLenAnnotation": maxLenAnnotationStr[17:]},
+			expectPrint: "Annotations:\t" + maxLenAnnotationStr + "\n",
+		},
+		{
+			annotations: map[string]string{"MaxLenAnnotation": maxLenAnnotationStr[17:] + "1"},
+			expectPrint: "Annotations:\t" + maxLenAnnotationStr + "...\n",
+		},
+		{
+			annotations: map[string]string{},
+			expectPrint: "Annotations:\t<none>\n",
+		},
+	}
+	for i, testCase := range testCases {
+		out := new(bytes.Buffer)
+		writer := &PrefixWriter{out}
+		printAnnotationsMultiline(writer, "Annotations", testCase.annotations)
+		output := out.String()
+		if output != testCase.expectPrint {
+			t.Errorf("Test case %d: expected to find %q in output: %q", i, testCase.expectPrint, output)
+		}
+	}
+}

test/e2e/kubectl.go

@@ -718,6 +718,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 					{"Node:"},
 					{"Labels:", "app=redis"},
 					{"role=master"},
+					{"Annotations:"},
 					{"Status:", "Running"},
 					{"IP:"},
 					{"Controllers:", "ReplicationController/redis-master"},
@@ -737,6 +738,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 				{"Selector:", "app=redis,role=master"},
 				{"Labels:", "app=redis"},
 				{"role=master"},
+				{"Annotations:"},
 				{"Replicas:", "1 current", "1 desired"},
 				{"Pods Status:", "1 Running", "0 Waiting", "0 Succeeded", "0 Failed"},
 				// {"Events:"} would ordinarily go in the list
@@ -754,6 +756,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 				{"Namespace:", ns},
 				{"Labels:", "app=redis"},
 				{"role=master"},
+				{"Annotations:"},
 				{"Selector:", "app=redis", "role=master"},
 				{"Type:", "ClusterIP"},
 				{"IP:"},
@@ -771,6 +774,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 			requiredStrings = [][]string{
 				{"Name:", node.Name},
 				{"Labels:"},
+				{"Annotations:"},
 				{"CreationTimestamp:"},
 				{"Conditions:"},
 				{"Type", "Status", "LastHeartbeatTime", "LastTransitionTime", "Reason", "Message"},
@@ -790,6 +794,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 			requiredStrings = [][]string{
 				{"Name:", ns},
 				{"Labels:"},
+				{"Annotations:"},
 				{"Status:", "Active"}}
 			checkOutput(output, requiredStrings)