Extend e2e tests

Author: katyanna

cmd/e2e/basic_test.go

@@ -28,6 +28,7 @@ var (
 
 type TestStacksetSpecFactory struct {
 	stacksetName                  string
+	configMap                     bool
 	hpaBehavior                   bool
 	ingress                       bool
 	routegroup                    bool
@@ -48,6 +49,7 @@ type TestStacksetSpecFactory struct {
 func NewTestStacksetSpecFactory(stacksetName string) *TestStacksetSpecFactory {
 	return &TestStacksetSpecFactory{
 		stacksetName:           stacksetName,
+		configMap:              false,
 		ingress:                false,
 		externalIngress:        false,
 		limit:                  4,
@@ -59,6 +61,11 @@ func NewTestStacksetSpecFactory(stacksetName string) *TestStacksetSpecFactory {
 	}
 }
 
+func (f *TestStacksetSpecFactory) ConfigMap() *TestStacksetSpecFactory {
+	f.configMap = true
+	return f
+}
+
 func (f *TestStacksetSpecFactory) Behavior(stabilizationWindowSeconds int32) *TestStacksetSpecFactory {
 	f.hpaBehavior = true
 	f.hpaStabilizationWindowSeconds = stabilizationWindowSeconds
@@ -347,11 +354,13 @@ func verifyStack(t *testing.T, stacksetName, currentVersion string, stacksetSpec
 		require.EqualValues(t, stackRGHosts, stackRG.Spec.Hosts)
 	}
 
-	// Verify the ConfigMaps
+	// Verify ConfigMaps
 	if stacksetSpec.StackTemplate.Spec.ConfigurationResources != nil {
 		configMap, err := waitForConfigMap(t, stack.Name)
 		require.NoError(t, err)
 		require.EqualValues(t, stackResourceLabels, configMap.Labels)
+		require.Contains(t, configMap.Name, stack.Name)
+		require.NotEmpty(t, configMap.Data)
 	}
 }
 
@@ -496,12 +505,25 @@ func verifyStacksetRouteGroup(t *testing.T, stacksetName string, stacksetSpec zv
 	require.NoError(t, err)
 }
 
-func testStacksetCreate(t *testing.T, testName string, hpa, ingress, routegroup, externalIngress bool, updateStrategy bool, subResourceAnnotations map[string]string) {
+func testStacksetCreate(
+	t *testing.T,
+	testName string,
+	configmap bool,
+	hpa,
+	ingress,
+	routegroup,
+	externalIngress bool,
+	updateStrategy bool,
+	subResourceAnnotations map[string]string,
+) {
 	t.Parallel()
 
 	stacksetName := fmt.Sprintf("stackset-create-%s", testName)
 	stackVersion := "v1"
 	stacksetSpecFactory := NewTestStacksetSpecFactory(stacksetName)
+	if configmap {
+		stacksetSpecFactory.ConfigMap()
+	}
 	if hpa {
 		stacksetSpecFactory.Autoscaler(1, 3, []zv1.AutoscalerMetrics{makeCPUAutoscalerMetrics(50)})
 	}
@@ -696,27 +718,31 @@ func testStacksetUpdate(
 }
 
 func TestStacksetCreateBasic(t *testing.T) {
-	testStacksetCreate(t, "basic", false, false, false, false, false, testAnnotationsCreate)
+	testStacksetCreate(t, "basic", false, false, false, false, false, false, testAnnotationsCreate)
+}
+
+func TestStacksetCreateConfigMap(t *testing.T) {
+	testStacksetCreate(t, "configmap", true, false, false, false, false, false, testAnnotationsCreate)
 }
 
 func TestStacksetCreateHPA(t *testing.T) {
-	testStacksetCreate(t, "hpa", true, false, false, false, false, testAnnotationsCreate)
+	testStacksetCreate(t, "hpa", false, true, false, false, false, false, testAnnotationsCreate)
 }
 
 func TestStacksetCreateIngress(t *testing.T) {
-	testStacksetCreate(t, "ingress", false, true, false, false, false, testAnnotationsCreate)
+	testStacksetCreate(t, "ingress", false, false, true, false, false, false, testAnnotationsCreate)
 }
 
 func TestStacksetCreateRouteGroup(t *testing.T) {
-	testStacksetCreate(t, "routegroup", false, false, true, false, false, testAnnotationsCreate)
+	testStacksetCreate(t, "routegroup", false, false, false, true, false, false, testAnnotationsCreate)
 }
 
 func TestStacksetCreateExternalIngress(t *testing.T) {
-	testStacksetCreate(t, "externalingress", false, false, false, true, false, testAnnotationsCreate)
+	testStacksetCreate(t, "externalingress", false, false, false, false, true, false, testAnnotationsCreate)
 }
 
 func TestStacksetCreateUpdateStrategy(t *testing.T) {
-	testStacksetCreate(t, "updatestrategy", false, false, false, false, true, testAnnotationsCreate)
+	testStacksetCreate(t, "updatestrategy", false, false, false, false, false, true, testAnnotationsCreate)
 }
 
 func TestStacksetUpdateBasic(t *testing.T) {