Add PR preview and profile layering checks

.github/workflows/deploy.yaml

@@ -86,7 +86,7 @@ jobs:
       runs-on: ubuntu-latest
       os-name: linux
       timeout-minutes: 90
-      focus-or-skip: "-ginkgo.skip='@gce|@eks|@application'"
+      focus-or-skip: "-ginkgo.skip='@gce|@eks'"
       kubectl-version: "v1.22.0"
       git-provider: gitlab
       git-provider_hostname: gitlab.com

.github/workflows/nightly.yaml

@@ -54,7 +54,7 @@ jobs:
       runs-on: macOS-latest
       os-name: darwin
       timeout-minutes: 90
-      focus-or-skip: "-ginkgo.skip='@gce|@eks|@capd|@application|@upgrade'"
+      focus-or-skip: "-ginkgo.skip='@gce|@eks|@capd|@upgrade'"
       kubectl-version: "v1.22.0"
       git-provider: gitlab
       git-provider_hostname: gitlab.git.dev.wkp.weave.works

docs/acceptance_testing.md

@@ -1,5 +1,5 @@
 
-# Running acceptance locally
+# Running acceptance tests locally
 
 This is a guide to quickly setup the environment to run and debug acceptance locally running on a kind cluster. The test host can be either macOS or linux e.g. Ubuntu machine.
 
@@ -25,7 +25,7 @@ Run the following script to override downloading of cert-manager.yaml during cap
 
     cat > $HOME/.cluster-api/clusterctl.yaml <<- EOM
     cert-manager:
-    	url: "https://github.com/cert-manager/cert-manager/releases/latest/cert-manager.yaml"
+      url: "https://github.com/cert-manager/cert-manager/releases/latest/cert-manager.yaml"
     EOM
 
 ## Environment Setup
@@ -47,23 +47,13 @@ Configure git with the following global settings. It will elevates the manual in
 Add git providers i.e. (GitHub, gitlab and gitlab-on-prm) key fingerprints to the known_hosts file.  
 
 ```
-cat > ~/.ssh/known_hosts <<- EOM
-# github.com:22 SSH-2.0-babeld-a73e1397
-github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-# github.com:22 SSH-2.0-babeld-a73e1397
-github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-# github.com:22 SSH-2.0-babeld-a73e1397
-github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-# gitlab.com:22 SSH-2.0-OpenSSH_7.9p1 Debian-10+deb10u2
-gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
-# gitlab.com:22 SSH-2.0-OpenSSH_7.9p1 Debian-10+deb10u2
-gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=
-# gitlab.com:22 SSH-2.0-OpenSSH_7.9p1 Debian-10+deb10u2
-gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
-gitlab.git.dev.wkp.weave.works ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBeP3Ucl8fV9dQK3cuN8A8z1t5ah9Xwq/oVGG/MOyiE4DyCP/m+XIBJ07dW7rl5cCpGivmzURslQuSQWLM7oSMVddzKMeMA+A2Xqf+c5jEpCDx08TarBInInqjgO3Yt9NmptQ0JsQgNYLugclQVcuk832/2Ge7M9kw8Dp9SeYsIG/8oBl8DeSXp7AR21zsnH0uKRil7a8I6Nmo8wC3s8iAj1KP/dYTn0S7M+8ZYM0ubrUyKULqAWMAH2KXG4fs2Z3yaK4yWugCre8KTSF2YJYsnNkfNy2NHyb/nGgIDLP3Or0ER5mRPqUgu1vgvXIk0nVKmYfGnWvByg5e2sn4QjE/
-gitlab.git.dev.wkp.weave.works ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB7Mqp5balgSUzdzgveNGarJatOw6elpMtKzawdtY+ugxWFNLskxoEydYqZFHDaS8D/bH1XvZYUemRZBd7vntbk=
-gitlab.git.dev.wkp.weave.works ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPUuEL+yd8UwVnrP2PLSNslqfOt7o6WGDdEcD2f8SwRB
-EOM
+# Clean up potentially old keys
+ssh-keygen -R github.com
+ssh-keygen -R gitlab.com
+ssh-keygen -R gitlab.git.dev.wkp.weave.works
+
+# Append fresh new keys
+ssh-keyscan gitlab.git.dev.wkp.weave.works github.com gitlab.com >> ~/.ssh/known_hosts
 ```
 
 <font size="5">**Environment variables**</font>
@@ -78,7 +68,7 @@ export ACCEPTANCE_TESTS_DATABASE_TYPE=sqlite
 export EXP_CLUSTER_RESOURCE_SET=true
 export UI_NODEPORT=30080
 export NATS_NODEPORT=31490
-export MANAGEMENT_CLUSTER_CNAME: weave.gitops.enterprise.com
+export MANAGEMENT_CLUSTER_CNAME=weave.gitops.enterprise.com
 export CLUSTER_REPOSITORY=gitops-testing
 ```
 
@@ -116,7 +106,7 @@ export GITHUB_ORG=<gitlab group name>
 export GITHUB_TOKEN=<gitlab account token>
 export GITHUB_USER=<gitlab account user name>
 export GITHUB_PASSWORD=<gitlab account password>
-export export GITLAB_CLIENT_ID=<gitlab oath app id>
+export GITLAB_CLIENT_ID=<gitlab oath app id>
 export GITLAB_CLIENT_SECRET=<gitlab oath app secret>
 export GITOPS_GIT_HOST_TYPES="gitlab.git.dev.wkp.weave.works=gitlab"
 export GITLAB_HOSTNAME=“gitlab.git.dev.wkp.weave.works"
@@ -145,7 +135,7 @@ You must configure the gitlab oath application with redirect url as below. It is
 
 - ***Automatic installation:*** Test frame work automatically installs the  core and enterprise controllers and setup the management cluster along with required repository, resources, secrets and entitlements etc. Any subsequent test runs will skip the management cluster setup and starts the test execution straight away. You need to recreate the kind cluster in case you want to install new enterprise version/release for testing.
 
-- ***Manual installation:*** You can manually install and setup core and enterprise controllers without running acceptance test. You must create the config repository i.e. `CLUSTER_REPOSITORY` prior to running the following command. The core controllers can not be installed if `CLUSTER_REPOSITORY` doesn't exists. Manuall creation of cluster repository is only required for manual installation. 
+- ***Manual installation:*** You can manually install and setup core and enterprise controllers without running acceptance test. You must create the config repository i.e. `CLUSTER_REPOSITORY` prior to running the following command. The core controllers can not be installed if `CLUSTER_REPOSITORY` doesn't exists. Manual creation of cluster repository is only required for manual installation. 
 
 	You may be be prompted for administrator password while running the below script. It is needed to add a `MANAGEMENT_CLUSTER_CNAME` entry to `/etc/hosts` file e.g. `192.168.0.5 weave.gitops.enterprise.com` (where `192.168.0.5` is test host's ip address).
 
@@ -159,7 +149,15 @@ You must configure the gitlab oath application with redirect url as below. It is
 	If you make any changes to UI or backend, you need to rebuild the cluster. The easiest and fastest way is to push to origin (your remote branch). It will build the image corresponding to your local branch commit hash and push it to *S3*.
 	You can also manually build and push the release to *S3*.
 
+## Troubleshooting
+
+Please refer to the Cluster API troubleshooting guide for issues related to `capd`. You may encounter following issues:
+- Failed clusterctl init - ‘failed to get cert-manager object'
+
+	`https://cluster-api.sigs.k8s.io/user/troubleshooting.html#failed-clusterctl-init---failed-to-get-cert-manager-object`
+- Cluster API with Docker Desktop - “too many open files”
 
+	`https://cluster-api.sigs.k8s.io/user/troubleshooting.html#cluster-api-with-docker-desktop---too-many-open-files`
 
 ## Command Line run
 

test/acceptance/test/cli_add_delete.go

@@ -394,27 +394,24 @@ func DescribeCliAddDelete(gitopsTestRunner GitopsTestRunner) {
 					prCommit := "CAPD capi template"
 					prDescription := "This PR creates a new CAPD Kubernetes cluster"
 
-					cmd := fmt.Sprintf(`%s add cluster --from-template cluster-template-development-observability-0 --set CLUSTER_NAME=%s --set NAMESPACE=%s --set KUBERNETES_VERSION=%s --set CONTROL_PLANE_MACHINE_COUNT=1 --set WORKER_MACHINE_COUNT=1 --branch "%s" --title "%s" --url %s --commit-message "%s" --description "%s" --endpoint %s`,
-						gitops_bin_path, clusterName, namespace, k8version, prBranch, prTitle, git_repository_url, prCommit, prDescription, capi_endpoint_url)
+					cmd := fmt.Sprintf(`%s add cluster --from-template cluster-template-development-observability-0 --set CLUSTER_NAME=%s --set NAMESPACE=%s --set KUBERNETES_VERSION=%s --set CONTROL_PLANE_MACHINE_COUNT=1 --set WORKER_MACHINE_COUNT=1 `, gitops_bin_path, clusterName, namespace, k8version) +
+						fmt.Sprintf(`--profile 'name=podinfo,version=6.0.1' --branch "%s" --title "%s" --url %s --commit-message "%s" --description "%s" --endpoint %s`, prBranch, prTitle, git_repository_url, prCommit, prDescription, capi_endpoint_url)
 					By(fmt.Sprintf("And I run '%s'", cmd), func() {
 						stdOut, stdErr = runCommandAndReturnStringOutput(cmd)
 					})
 
 					By("Then I should see pull request created to management cluster", func() {
-						re := regexp.MustCompile(`Created pull request:\s*(?P<url>https:.*\/\d+)`)
-						match := re.FindSubmatch([]byte(stdOut))
-						Eventually(match).ShouldNot(BeNil(), "Failed to Create pull request")
+						Expect(stdOut).Should(MatchRegexp(`name=podinfo[\s\w\d./:-]*version=6.0.1`))
+						Expect(stdOut).Should(MatchRegexp(`Created pull request:\s*(?P<url>https:.*\/\d+)`))
 					})
 
 					By(fmt.Sprintf("Then I run 'gitops get clusters --endpoint %s'", capi_endpoint_url), func() {
 						stdOut, stdErr = runCommandAndReturnStringOutput(fmt.Sprintf(`%s get clusters --endpoint %s`, gitops_bin_path, capi_endpoint_url))
 					})
 
 					By("And I should see cluster status as 'Creation PR'", func() {
-						Eventually(string(stdOut)).Should(MatchRegexp(`NAME\s+STATUS`))
-
-						re := regexp.MustCompile(fmt.Sprintf(`%s\s+Creation PR`, clusterName))
-						Eventually((re.Find([]byte(stdOut)))).ShouldNot(BeNil())
+						Expect(stdOut).Should(MatchRegexp(`NAME\s+STATUS`))
+						Expect(stdOut).Should(MatchRegexp(fmt.Sprintf(`%s\s+Creation PR`, clusterName)))
 					})
 
 					By("Then I should merge the pull request to start cluster provisioning", func() {
@@ -469,7 +466,7 @@ func DescribeCliAddDelete(gitopsTestRunner GitopsTestRunner) {
 				})
 
 				By(fmt.Sprintf("And I verify %s capd cluster is healthy and profiles are installed)", clusterName), func() {
-					verifyCapiClusterHealth(kubeconfigPath, clusterName)
+					verifyCapiClusterHealth(kubeconfigPath, GITOPS_DEFAULT_NAMESPACE)
 				})
 
 				clusterName2 := capdClusterNames[1]

test/acceptance/test/pages/create_cluster.go

@@ -33,6 +33,7 @@ type TemplateSection struct {
 type Profile struct {
 	Name    *agouti.Selection
 	Version *agouti.Selection
+	Layer   *agouti.Selection
 	Values  *agouti.Selection
 }
 
@@ -44,8 +45,9 @@ type ValuesYaml struct {
 }
 
 type Preview struct {
-	PreviewLabel *agouti.Selection
-	PreviewText  *agouti.Selection
+	Title *agouti.Selection
+	Text  *agouti.Selection
+	Close *agouti.Selection
 }
 
 type GitOps struct {
@@ -111,6 +113,7 @@ func GetProfile(webDriver *agouti.Page, profileName string) Profile {
 	return Profile{
 		Name:    p.Find(`.profile-name`),
 		Version: p.Find(`.profile-version`),
+		Layer:   p.Find(`.profile-layer > span + span`),
 		Values:  p.Find(`button`),
 	}
 }
@@ -155,9 +158,11 @@ func GetOption(webDriver *agouti.Page, value string) *agouti.Selection {
 }
 
 func GetPreview(webDriver *agouti.Page) Preview {
+	Eventually(webDriver.Find(`.MuiDialog-paper[role=dialog]`)).Should(BeVisible())
 	return Preview{
-		PreviewLabel: webDriver.FindByName("Preview"),
-		PreviewText:  webDriver.FindByXPath(`//div[@name="Preview"]/following-sibling::textarea[1]`),
+		Title: webDriver.Find(`.MuiDialog-paper[role=dialog]  h5`),
+		Text:  webDriver.Find(`.MuiDialog-paper[role=dialog]  textarea:first-child`),
+		Close: webDriver.Find(`.MuiDialog-paper[role=dialog]  button`),
 	}
 }
 

test/acceptance/test/ui_applications.go

@@ -160,7 +160,7 @@ func DescribeApplications(gitopsTestRunner GitopsTestRunner) {
 				_ = gitopsTestRunner.KubectlDelete([]string{}, kustomizationFile)
 			})
 
-			It("@application Verify application's status and history can be monitored.", func() {
+			It("@application @git Verify application's status and history can be monitored.", func() {
 				repoAbsolutePath := configRepoAbsolutePath(gitProviderEnv)
 
 				By("When I create a private repository for cluster configs", func() {

test/acceptance/test/ui_templates.go

@@ -414,7 +414,19 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				setParameterValues(createPage, paramSection)
 
-				//check PR Preview
+				By("Then I should preview the PR", func() {
+					Expect(createPage.PreviewPR.Click()).To(Succeed())
+					preview := pages.GetPreview(webDriver)
+
+					Eventually(preview.Title).Should(MatchText("PR Preview"))
+
+					Eventually(preview.Text).Should(MatchText(fmt.Sprintf(`kind: Cluster[\s\w\d./:-]*name: %[1]v\s+namespace: default\s+spec:[\s\w\d./:-]*controlPlaneRef:[\s\w\d./:-]*name: %[1]v-control-plane\s+infrastructureRef:[\s\w\d./:-]*kind: AWSManagedCluster\s+name: %[1]v`, clusterName)))
+					Eventually(preview.Text).Should((MatchText(fmt.Sprintf(`kind: AWSManagedCluster\s+metadata:\s+annotations:[\s\w\d/:.-]+name: %[1]v`, clusterName))))
+					Eventually(preview.Text).Should((MatchText(fmt.Sprintf(`kind: AWSManagedControlPlane\s+metadata:\s+annotations:[\s\w\d/:.-]+name: %[1]v-control-plane\s+namespace: default\s+spec:\s+region: %[2]v\s+sshKeyName: %[3]v\s+version: %[4]v`, clusterName, region, sshKey, k8Version))))
+					Eventually(preview.Text).Should((MatchText(fmt.Sprintf(`kind: AWSFargateProfile\s+metadata:\s+annotations:[\s\w\d/:.-]+name: %[1]v-fargate-0`, clusterName))))
+
+					Eventually(preview.Close.Click).Should(Succeed())
+				})
 			})
 		})
 
@@ -479,7 +491,11 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				setParameterValues(createPage, paramSection)
 
-				//check PR Preview
+				By("Then I should preview the PR", func() {
+					Expect(createPage.PreviewPR.Click()).To(Succeed())
+					preview := pages.GetPreview(webDriver)
+					Eventually(preview.Close.Click).Should(Succeed())
+				})
 
 				//Pull request values
 				prBranch := "feature-capd"
@@ -512,7 +528,7 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 				clustersPage := pages.GetClustersPage(webDriver)
 				By("Then I should see cluster appears in the cluster dashboard with the expected status", func() {
 					clusterInfo := pages.FindClusterInList(clustersPage, clusterName)
-					Eventually(clusterInfo.Status).Should(HaveText("Creation PR"))
+					Eventually(clusterInfo.Status, ASSERTION_30SECONDS_TIME_OUT).Should(HaveText("Creation PR"))
 					anchor := clusterInfo.Status.Find("a")
 					Eventually(anchor).Should(BeFound())
 					prUrl, _ = anchor.Attribute("href")
@@ -537,10 +553,6 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 			It("@integration @git Verify pull request can not be created by using exiting repository branch", func() {
 				repoAbsolutePath := configRepoAbsolutePath(gitProviderEnv)
 
-				if gitProviderEnv.Type == GitProviderGitLab {
-					Skip("Temporary skipping because the Gitops section resets afer oauth redirecrtion")
-				}
-
 				By("When I create a private repository for cluster configs", func() {
 					initAndCreateEmptyRepo(gitProviderEnv, true)
 				})
@@ -599,8 +611,6 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				setParameterValues(createPage, paramSection)
 
-				//check PR Preview
-
 				//Pull request values
 				prTitle := "My first pull request"
 				prCommit := "First capd capi template"
@@ -786,7 +796,15 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				setParameterValues(createPage, paramSection)
 
-				//check PR Preview
+				By("Then I should see PR preview containing identity reference added in the template", func() {
+					Expect(createPage.PreviewPR.Click()).To(Succeed())
+					preview := pages.GetPreview(webDriver)
+
+					Eventually(preview.Title).Should(MatchText("PR Preview"))
+
+					Eventually(preview.Text).Should(MatchText(fmt.Sprintf(`kind: AWSCluster\s+metadata:\s+annotations:[\s\w\d/:.-]+name: %s[\s\w\d-.:/]+identityRef:[\s\w\d-.:/]+kind: AWSClusterRoleIdentity\s+name: test-role-identity`, awsClusterName)))
+					Eventually(preview.Close.Click).Should(Succeed())
+				})
 
 			})
 		})
@@ -890,7 +908,15 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				setParameterValues(createPage, paramSection)
 
-				//check PR Preview
+				By("Then I should see PR preview without identity reference added to the template", func() {
+					Expect(createPage.PreviewPR.Click()).To(Succeed())
+					preview := pages.GetPreview(webDriver)
+
+					Eventually(preview.Title).Should(MatchText("PR Preview"))
+
+					Eventually(preview.Text).ShouldNot(MatchText(`kind: AWSCluster[\s\w\d-.:/]+identityRef:`), "Identity reference should not be found in preview pull request AzureCluster object")
+					Eventually(preview.Close.Click).Should(Succeed())
+				})
 
 			})
 		})
@@ -966,7 +992,7 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 				// Parameter values
 				clusterName := capdClusterName
 				namespace := "default"
-				k8Version := "1.23.0"
+				k8Version := "1.23.3"
 				controlPlaneMachineCount := "1"
 				workerMachineCount := "1"
 
@@ -1005,7 +1031,6 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				setParameterValues(createPage, paramSection)
 				pages.ScrollWindow(webDriver, 0, 4000)
-				//check PR Preview
 
 				By("And select the podinfo profile to install", func() {
 					Eventually(createPage.ProfileSelect.Click).Should(Succeed())
@@ -1019,6 +1044,8 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 					Eventually(profile.Version.Click).Should(Succeed())
 					Eventually(pages.GetOption(webDriver, "6.0.1").Click).Should(Succeed())
 
+					Eventually(profile.Layer.Text).Should(MatchRegexp("layer-1"))
+
 					Eventually(profile.Values.Click).Should(Succeed())
 					valuesYaml := pages.GetValuesYaml(webDriver)
 
@@ -1029,6 +1056,8 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 
 				By("And verify default observability profile values.yaml", func() {
 					profile := pages.GetProfile(webDriver, "observability")
+					Eventually(profile.Layer.Text).Should(MatchRegexp("layer-0"))
+
 					Eventually(profile.Values.Click).Should(Succeed())
 					valuesYaml := pages.GetValuesYaml(webDriver)
 
@@ -1037,7 +1066,16 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 					Eventually(valuesYaml.Cancel.Click).Should(Succeed())
 				})
 
-				// check PR Preview
+				By("Then I should preview the PR", func() {
+					Expect(createPage.PreviewPR.Click()).To(Succeed())
+					preview := pages.GetPreview(webDriver)
+
+					Eventually(preview.Title).Should(MatchText("PR Preview"))
+
+					Eventually(preview.Text).Should(MatchText(`kind: Cluster[\s\w\d./:-]*metadata:[\s\w\d./:-]*labels:[\s\w\d./:-]*cni: calico[\s\w\d./:-]*weave.works/capi: bootstrap`))
+
+					Eventually(preview.Close.Click).Should(Succeed())
+				})
 
 				// Pull request values
 				prBranch := "ui-end-end-branch"
@@ -1063,7 +1101,7 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 				clustersPage := pages.GetClustersPage(webDriver)
 				By("Then I should see cluster appears in the cluster dashboard with 'Creation PR' status", func() {
 					clusterInfo := pages.FindClusterInList(clustersPage, clusterName)
-					Eventually(clusterInfo.Status).Should(HaveText("Creation PR"))
+					Eventually(clusterInfo.Status, ASSERTION_30SECONDS_TIME_OUT).Should(HaveText("Creation PR"))
 				})
 
 				By("Then I should merge the pull request to start cluster provisioning", func() {
@@ -1107,7 +1145,7 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 				})
 
 				By(fmt.Sprintf("And I verify %s capd cluster is healthy and profiles are installed)", clusterName), func() {
-					verifyCapiClusterHealth(downloadedKubeconfigPath, clusterName)
+					verifyCapiClusterHealth(downloadedKubeconfigPath, GITOPS_DEFAULT_NAMESPACE)
 				})
 
 				By("Then I should select the cluster to create the delete pull request", func() {