From cc45ca6122fd4b8e5dc4ff9a42b1a54ef66cbbb8 Mon Sep 17 00:00:00 2001
From: Kieron Browne <kbrowne@vmware.com>
Date: Fri, 25 Mar 2022 13:11:41 +0000
Subject: [PATCH] Use the webhook server started checker for /readyz

And wait for the deployment to be ready in deploy-on-kind script

Issue: https://github.com/cloudfoundry/cf-k8s-controllers/issues/861
---
 controllers/main.go       | 2 +-
 scripts/deploy-on-kind.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/controllers/main.go b/controllers/main.go
index 2b2aef2a5..17b75bc40 100644
--- a/controllers/main.go
+++ b/controllers/main.go
@@ -283,7 +283,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", mgr.GetWebhookServer().StartedChecker()); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
diff --git a/scripts/deploy-on-kind.sh b/scripts/deploy-on-kind.sh
index 8099a7397..e18ede304 100755
--- a/scripts/deploy-on-kind.sh
+++ b/scripts/deploy-on-kind.sh
@@ -279,8 +279,10 @@ function deploy_cf_k8s_controllers() {
   }
   popd >/dev/null
 
+  kubectl rollout status deployment/cf-k8s-controllers-controller-manager -w -n cf-k8s-controllers-system
+
   if [[ -n "${default_domain}" ]]; then
-    retry kubectl apply -f "${CONTROLLER_DIR}/config/samples/cfdomain.yaml"
+    kubectl apply -f "${CONTROLLER_DIR}/config/samples/cfdomain.yaml"
   fi
 }