Merge pull request #2 from ytsarev/fixes

Makefile fixes and test setup fixes
upbound · Jan 22, 2024 · 6b4b2b3 · 6b4b2b3
2 parents 04f2a81 + 5318917
commit 6b4b2b3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
 e2e: build controlplane.up local.xpkg.deploy.configuration.$(PROJECT_NAME) uptest
 
 render:
-	crossplane beta render examples/network-xr.yaml apis/default/composition.yaml examples/function/function.yaml -r
+	crossplane beta render examples/network-xr.yaml apis/default/composition.yaml examples/functions.yaml -r
 
 yamllint:
 	@$(INFO) running yamllint

diff --git a/examples/function.yaml → examples/functions.yaml b/examples/function.yaml → examples/functions.yaml
diff --git a/test/setup.sh b/test/setup.sh
@@ -7,6 +7,7 @@ echo "Running setup.sh"
 echo "Waiting until all configurations are healthy/installed..."
 "${KUBECTL}" wait configuration.pkg --all --for=condition=Healthy --timeout 5m
 "${KUBECTL}" wait configuration.pkg --all --for=condition=Installed --timeout 5m
+"${KUBECTL}" wait configurationrevisions.pkg --all --for=condition=Healthy --timeout 5m
 
 echo "Creating cloud credential secret..."
 "${KUBECTL}" -n upbound-system create secret generic gcp-creds --from-literal=credentials="${UPTEST_CLOUD_CREDENTIALS}" \