Make label validation optional for recipe functional tests

test/functional/corerp/cli/cli_test.go

@@ -476,7 +476,7 @@ func Test_CLI_Delete(t *testing.T) {
 					validation.NewK8sPodForResource(appName, "containerb-app-with-resources"),
 				},
 			},
-		})
+		}, false)
 
 		err = cli.ApplicationDelete(ctx, appName)
 		require.NoErrorf(t, err, "failed to delete %s", appName)
@@ -510,7 +510,7 @@ func Test_CLI_Delete(t *testing.T) {
 					validation.NewK8sPodForResource(appName, "containerb-app-with-resources"),
 				},
 			},
-		})
+		}, false)
 
 		//ignore response for tests
 		_, err = options.ManagementClient.DeleteResource(ctx, "Applications.Core/containers", "containerb-app-with-resources")

test/functional/corerp/corerptest.go

@@ -67,6 +67,7 @@ type TestStep struct {
 	SkipKubernetesOutputResourceValidation bool
 	SkipObjectValidation                   bool
 	SkipResourceDeletion                   bool
+	SkipLabelValidation                    bool
 }
 
 type CoreRPTest struct {
@@ -280,7 +281,7 @@ func (ct CoreRPTest) Test(t *testing.T) {
 			} else {
 				if step.K8sObjects != nil {
 					t.Logf("validating creation of objects for %s", step.Executor.GetDescription())
-					validation.ValidateObjectsRunning(ctx, t, ct.Options.K8sClient, ct.Options.DynamicClient, *step.K8sObjects)
+					validation.ValidateObjectsRunning(ctx, t, ct.Options.K8sClient, ct.Options.DynamicClient, *step.K8sObjects, step.SkipLabelValidation)
 					t.Logf("finished validating creation of objects for %s", step.Executor.GetDescription())
 				}
 			}

test/functional/corerp/resources/mongodb_test.go

@@ -116,7 +116,7 @@ func Test_MongoDBUserSecrets(t *testing.T) {
 // the creation of a mongoDB from recipe
 // container using the mongoDB link to connect to the mongoDB resource
 func Test_MongoDB_Recipe(t *testing.T) {
-	t.Skipf("Enable this test once test flakiness is fixed. - https://github.com/project-radius/radius/issues/5053")
+	// template using recipe testdata/recipes/test-recipes/mongodb-recipe-kubernetes.bicep
 	template := "testdata/corerp-resources-mongodb-recipe.bicep"
 	name := "corerp-resources-mongodb-recipe"
 	appNamespace := "corerp-resources-mongodb-recipe-app"
@@ -140,30 +140,17 @@ func Test_MongoDB_Recipe(t *testing.T) {
 						Type: validation.ContainersResource,
 						App:  name,
 					},
-					{
-						Name: "mongo-recipe-db",
-						Type: validation.MongoDatabasesResource,
-						App:  name,
-						OutputResources: []validation.OutputResourceResponse{
-							{
-								Provider: resourcemodel.ProviderAzure,
-								LocalID:  rpv1.LocalIDAzureCosmosAccount,
-							},
-							{
-								Provider: resourcemodel.ProviderAzure,
-								LocalID:  rpv1.LocalIDAzureCosmosDBMongo,
-							},
-						},
-					},
 				},
 			},
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
 						validation.NewK8sPodForResource(name, "mongodb-recipe-app-ctnr"),
+						validation.NewK8sPodForResource(name, "mongo-recipe-resource"),
 					},
 				},
 			},
+			SkipLabelValidation: true,
 		},
 	})
 

test/functional/corerp/resources/testdata/corerp-resources-mongodb-recipe.bicep

@@ -23,7 +23,7 @@ resource env 'Applications.Core/environments@2022-03-15-privatepreview' = {
     recipes: {
       'Applications.Link/mongoDatabases':{
         mongodb: {
-          templatePath: 'radiusdev.azurecr.io/recipes/functionaltest/basic/mongodatabases/azure:1.0' 
+          templatePath: 'radiusdev.azurecr.io/recipes/functionaltest/valuebacked/mongodatabases/kubernetes:1.0'
         }
       }
     }

test/functional/corerp/resources/testdata/recipes/test-recipes/mongodb-recipe-kubernetes.bicep

@@ -0,0 +1,99 @@
+import kubernetes as kubernetes {
+  kubeConfig: ''
+  namespace: context.runtime.kubernetes.namespace
+}
+
+param context object
+
+@description('Admin username for the Mongo database. Default is "admin"')
+param username string = 'admin'
+
+@description('Admin password for the Mongo database')
+@secure()
+param password string = newGuid()
+
+resource mongo 'apps/Deployment@v1' = {
+  metadata: {
+    name: 'mongo-recipe-resource'
+  }
+  spec: {
+    selector: {
+      matchLabels: {
+        app: 'mongo'
+        resource: context.resource.name
+      }
+    }
+    template: {
+      metadata: {
+        labels: {
+          app: 'mongo'
+          resource: context.resource.name
+        }
+      }
+      spec: {
+        containers: [
+          {
+            name: 'mongo'
+            image: 'mongo:4.2'
+            ports: [
+              {
+                containerPort: 27017
+              }
+            ]
+            env: [
+              {
+                name: 'MONGO_INITDB_ROOT_USERNAME'
+                value: username
+              }
+              {
+                name: 'MONGO_INITDB_ROOT_PASSWORD'
+                value: password
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
+
+resource svc 'core/Service@v1' = {
+  metadata: {
+    name: 'mongo-recipe-svc'
+    labels: {
+      name: 'mongo-recipe-svc'
+    }
+  }
+  spec: {
+    type: 'ClusterIP'
+    selector: {
+      app: 'mongo'
+      resource: context.resource.name
+    }
+    ports: [
+      {
+        port: 27017
+      }
+    ]
+  }
+}
+
+output result object = {
+  // This workaround is needed because the deployment engine omits Kubernetes resources from its output.
+  //
+  // Once this gap is addressed, users won't need to do this.
+  resources: [
+    '/planes/kubernetes/local/namespaces/${svc.metadata.namespace}/providers/core/Service/${svc.metadata.name}'
+    '/planes/kubernetes/local/namespaces/${mongo.metadata.namespace}/providers/apps/Deployment/${mongo.metadata.name}'
+  ]
+  values: {
+    host: '${svc.metadata.name}.${svc.metadata.namespace}.svc.cluster.local'
+    port: 27017
+
+  }
+  secrets: {
+    connectionString: 'mongodb://${username}:${password}@${svc.metadata.name}.${svc.metadata.namespace}.svc.cluster.local:27017'
+    username: username
+    password: password
+  }
+}

test/validation/k8s.go

@@ -267,7 +267,7 @@ func streamLogFile(ctx context.Context, podClient v1.PodInterface, pod corev1.Po
 }
 
 // ValidateObjectsRunning validates the namespaces and objects specified in each namespace are running
-func ValidateObjectsRunning(ctx context.Context, t *testing.T, k8s *kubernetes.Clientset, dynamic dynamic.Interface, expected K8sObjectSet) {
+func ValidateObjectsRunning(ctx context.Context, t *testing.T, k8s *kubernetes.Clientset, dynamic dynamic.Interface, expected K8sObjectSet, skipLabelValidation bool) {
 	restMapper := restmapper.NewDeferredDiscoveryRESTMapper(memory.NewMemCacheClient(k8s.DiscoveryClient))
 	for namespace, expectedObjects := range expected.Namespaces {
 		log.Printf("validating objects in namespace %v", namespace)
@@ -298,8 +298,9 @@ func ValidateObjectsRunning(ctx context.Context, t *testing.T, k8s *kubernetes.C
 						deployedResources, err = dynamic.Resource(mapping.Resource).List(ctx, metav1.ListOptions{})
 					}
 					assert.NoErrorf(t, err, "could not list deployed resources of type %s in namespace %s", resourceGVR.GroupResource(), namespace)
-
-					validated = validated && matchesActualLabels(expectedInNamespace, deployedResources.Items)
+					if !skipLabelValidation {
+						validated = validated && matchesActualLabels(expectedInNamespace, deployedResources.Items)
+					}
 				}
 			case <-ctx.Done():
 				assert.Fail(t, "timed out after waiting for services to be created")