Merge pull request #1342 from kinvolk/surajssd/fix-contour-envoy-regression

contour: Fix the hostPort regression

Author: surajssd

assets/charts/components/contour/templates/03-envoy.yaml

@@ -95,11 +95,9 @@ spec:
               fieldPath: metadata.name
         ports:
         - containerPort: 80
-          hostPort: 80
           name: http
           protocol: TCP
         - containerPort: 443
-          hostPort: 443
           name: https
           protocol: TCP
         readinessProbe:

pkg/assets/generated_assets.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/kinvolk/lokomotive/pkg/components/internal/testutil"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
+	"github.com/kinvolk/lokomotive/pkg/k8sutil"
 )
 
 func TestStorageClassEmptyConfig(t *testing.T) {
@@ -144,16 +145,18 @@ func TestConversion(t *testing.T) { //nolint:funlen
 	testCases := []struct {
 		name                 string
 		inputConfig          string
-		expectedManifestName string
+		expectedManifestName k8sutil.ObjectMetadata
 		expected             string
 		jsonPath             string
 	}{
 		{
-			name:                 "no_tolerations_node",
-			inputConfig:          `component "aws-ebs-csi-driver" {}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/node.yaml",
-			jsonPath:             "{.spec.template.spec.tolerations[0].operator}",
-			expected:             "Exists",
+			name:        "no_tolerations_node",
+			inputConfig: `component "aws-ebs-csi-driver" {}`,
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "DaemonSet", Name: "ebs-csi-node",
+			},
+			jsonPath: "{.spec.template.spec.tolerations[0].operator}",
+			expected: "Exists",
 		},
 		{
 			name: "tolerations_node",
@@ -165,16 +168,20 @@ func TestConversion(t *testing.T) { //nolint:funlen
 								effect   = "NoSchedule"
 							}
 						}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/node.yaml",
-			jsonPath:             "{.spec.template.spec.tolerations[0].value}",
-			expected:             "awesome",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "DaemonSet", Name: "ebs-csi-node",
+			},
+			jsonPath: "{.spec.template.spec.tolerations[0].value}",
+			expected: "awesome",
 		},
 		{
-			name:                 "no_tolerations_csi_controller",
-			inputConfig:          `component "aws-ebs-csi-driver" {}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/controller.yaml",
-			jsonPath:             "{.spec.template.spec.tolerations[0].operator}",
-			expected:             "Exists",
+			name:        "no_tolerations_csi_controller",
+			inputConfig: `component "aws-ebs-csi-driver" {}`,
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "Deployment", Name: "ebs-csi-controller",
+			},
+			jsonPath: "{.spec.template.spec.tolerations[0].operator}",
+			expected: "Exists",
 		},
 		{
 			name: "tolerations_csi_controller",
@@ -186,16 +193,20 @@ func TestConversion(t *testing.T) { //nolint:funlen
 								effect   = "NoSchedule"
 							}
 						}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/controller.yaml",
-			jsonPath:             "{.spec.template.spec.tolerations[0].key}",
-			expected:             "lokomotive.io",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "Deployment", Name: "ebs-csi-controller",
+			},
+			jsonPath: "{.spec.template.spec.tolerations[0].key}",
+			expected: "lokomotive.io",
 		},
 		{
-			name:                 "no_tolerations_snapshot_controller",
-			inputConfig:          `component "aws-ebs-csi-driver" {}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/statefulset.yaml",
-			jsonPath:             "{.spec.template.spec.tolerations[0].operator}",
-			expected:             "Exists",
+			name:        "no_tolerations_snapshot_controller",
+			inputConfig: `component "aws-ebs-csi-driver" {}`,
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "StatefulSet", Name: "ebs-snapshot-controller",
+			},
+			jsonPath: "{.spec.template.spec.tolerations[0].operator}",
+			expected: "Exists",
 		},
 		{
 			name: "tolerations_snapshot_controller",
@@ -207,9 +218,11 @@ func TestConversion(t *testing.T) { //nolint:funlen
 								effect   = "NoSchedule"
 							}
 						}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/statefulset.yaml",
-			jsonPath:             "{.spec.template.spec.tolerations[0].effect}",
-			expected:             "NoSchedule",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "StatefulSet", Name: "ebs-snapshot-controller",
+			},
+			jsonPath: "{.spec.template.spec.tolerations[0].effect}",
+			expected: "NoSchedule",
 		},
 		{
 			name: "affinity_csi_controller",
@@ -220,7 +233,9 @@ func TestConversion(t *testing.T) { //nolint:funlen
 								values   = ["storage"]
 							}
 						}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/controller.yaml",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "Deployment", Name: "ebs-csi-controller",
+			},
 			jsonPath: "{.spec.template.spec.affinity.nodeAffinity." +
 				"requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key}",
 			expected: "lokomotive.io/role",
@@ -234,26 +249,32 @@ func TestConversion(t *testing.T) { //nolint:funlen
 								values   = ["storage"]
 							}
 						}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/statefulset.yaml",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "apps/v1", Kind: "StatefulSet", Name: "ebs-snapshot-controller",
+			},
 			jsonPath: "{.spec.template.spec.affinity.nodeAffinity." +
 				"requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0]}",
 			expected: "storage",
 		},
 		{
-			name:                 "storage_class",
-			inputConfig:          `component "aws-ebs-csi-driver" {}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/storageclass.yaml",
-			jsonPath:             "{.reclaimPolicy}",
-			expected:             "Retain",
+			name:        "storage_class",
+			inputConfig: `component "aws-ebs-csi-driver" {}`,
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "storage.k8s.io/v1", Kind: "StorageClass", Name: "ebs-sc",
+			},
+			jsonPath: "{.reclaimPolicy}",
+			expected: "Retain",
 		},
 		{
 			name: "default_storage_class",
 			inputConfig: `component "aws-ebs-csi-driver" {
 							enable_default_storage_class = true
 						}`,
-			expectedManifestName: "aws-ebs-csi-driver/templates/storageclass.yaml",
-			jsonPath:             `{.metadata.annotations.storageclass\.kubernetes\.io\/is\-default\-class}`,
-			expected:             "true",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "storage.k8s.io/v1", Kind: "StorageClass", Name: "ebs-sc",
+			},
+			jsonPath: `{.metadata.annotations.storageclass\.kubernetes\.io\/is\-default\-class}`,
+			expected: "true",
 		},
 	}
 

pkg/components/aws-ebs-csi-driver/component_test.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/kinvolk/lokomotive/pkg/components/internal/testutil"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
+	"github.com/kinvolk/lokomotive/pkg/k8sutil"
 )
 
 //nolint:funlen
@@ -96,7 +97,7 @@ func TestConversion(t *testing.T) {
 	testCases := []struct {
 		name                 string
 		inputConfig          string
-		expectedManifestName string
+		expectedManifestName k8sutil.ObjectMetadata
 		expected             string
 		jsonPath             string
 	}{
@@ -108,9 +109,11 @@ func TestConversion(t *testing.T) {
 					metrics_scrape_interval = "10s"
 				}
 			}`,
-			expectedManifestName: "contour/templates/service-monitor.yaml",
-			jsonPath:             "{.spec.endpoints[0].interval}",
-			expected:             "10s",
+			expectedManifestName: k8sutil.ObjectMetadata{
+				Version: "monitoring.coreos.com/v1", Kind: "ServiceMonitor", Name: "envoy",
+			},
+			jsonPath: "{.spec.endpoints[0].interval}",
+			expected: "10s",
 		},
 	}
 
@@ -127,3 +130,18 @@ func TestConversion(t *testing.T) {
 		})
 	}
 }
+
+func TestEnvoyHostPort(t *testing.T) {
+	t.Parallel()
+
+	componentCfg := `component "contour" {}`
+	expectedManifestName := k8sutil.ObjectMetadata{Version: "apps/v1", Kind: "DaemonSet", Name: "envoy"}
+	jsonPath := "{.spec.template.spec.containers[1].ports[0].hostPort}"
+	errExpected := "hostPort is not found"
+
+	component := NewConfig()
+	m := testutil.RenderManifests(t, component, Name, componentCfg)
+	gotConfig := testutil.ConfigFromMap(t, m, expectedManifestName)
+
+	testutil.JSONPathExists(t, gotConfig, jsonPath, errExpected)
+}

pkg/components/contour/component_test.go

@@ -21,17 +21,33 @@ import (
 
 	"github.com/kinvolk/lokomotive/pkg/components"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
+	"github.com/kinvolk/lokomotive/pkg/k8sutil"
 )
 
-// ConfigFromMap takes a map and a key and returns the value associated with the key. If the key
-// does not exist in that map, the function fails.
-func ConfigFromMap(t *testing.T, m map[string]string, k string) string {
-	ret, ok := m[k]
-	if !ok {
-		t.Fatalf("Config not found with filename: %q", k)
+// ConfigFromMap takes a map and a key. The function returns the YAML object associated with the
+// key. If the key does not exist in that map, the function fails.
+func ConfigFromMap(t *testing.T, m map[string]string, key k8sutil.ObjectMetadata) string {
+	for _, v := range m {
+		splittedYAML, err := k8sutil.SplitYAMLDocuments(v)
+		if err != nil {
+			t.Fatalf("Splitting YAML doc separated by '---': %v", err)
+		}
+
+		for _, val := range splittedYAML {
+			obj, err := k8sutil.YAMLToObjectMetadata(val)
+			if err != nil {
+				t.Fatalf("Converting YAML to ObjectMetadata: %v", err)
+			}
+
+			if obj == key {
+				return val
+			}
+		}
 	}
 
-	return ret
+	t.Fatalf("Given object not found: %+v", key)
+
+	return ""
 }
 
 // RenderManifests converts a component into YAML manifests.