Operator pod readiness probe to wait for webhook (#280)

The controller-runtime added a health check that will return only when the
webhook is up. However, it isn't enabled by default. Instead we just use the
normal 'ping' checking, which returns as soon as the pod is running. This
commit is to change the readiness probe to use the one in controller-runtime
that waits for the webhook.

As part of this, I removed the manual webhook check that we use for the e2e
tests.

Makefile

@@ -404,10 +404,8 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 deploy-operator: manifests kustomize ## Using helm or olm, deploy the operator in the K8s cluster
 ifeq ($(DEPLOY_WITH), helm)
 	helm install --wait -n $(NAMESPACE) $(HELM_RELEASE_NAME) $(OPERATOR_CHART) --set image.repo=null --set image.name=${OPERATOR_IMG} --set logging.dev=${DEV_MODE} --set image.pullPolicy=$(HELM_IMAGE_PULL_POLICY) --set imagePullSecrets[0].name=priv-reg-cred $(HELM_OVERRIDES)
-	scripts/wait-for-webhook.sh -n $(NAMESPACE) -t 60
 else ifeq ($(DEPLOY_WITH), olm)
 	scripts/deploy-olm.sh -n $(NAMESPACE) $(OLM_TEST_CATALOG_SOURCE)
-	scripts/wait-for-webhook.sh -n $(NAMESPACE) -t 60
 else ifeq ($(DEPLOY_WITH), random)
 ifeq ($(shell (( $$RANDOM % 2 )); echo $$?),0)
 	DEPLOY_WITH=helm $(MAKE) deploy-operator

changes/unreleased/Fixed-20221026-141919.yaml

@@ -0,0 +1,5 @@
+kind: Fixed
+body: Operator pod readiness probe to wait for webhook
+time: 2022-10-26T14:19:19.398290964-03:00
+custom:
+  Issue: "280"

cmd/operator/main.go

@@ -313,6 +313,16 @@ func setupWebhook(ctx context.Context, mgr manager.Manager, restCfg *rest.Config
 	return nil
 }
 
+// getReadinessProbeCallack returns the check to use for the readiness probe
+func getReadinessProbeCallback(mgr ctrl.Manager) healthz.Checker {
+	// If the webhook is enabled, we use a checker that tests if the webhook is
+	// able to accept requests.
+	if getIsWebhookEnabled() {
+		return mgr.GetWebhookServer().StartedChecker()
+	}
+	return healthz.Ping
+}
+
 func main() {
 	flagArgs := &FlagConfig{}
 	flagArgs.setFlagArgs()
@@ -369,7 +379,7 @@ func main() {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", getReadinessProbeCallback(mgr)); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}