Make local webhook port configurable

Will be helpful when running multiple operators locally

Author: karelyatin

Makefile

@@ -509,6 +509,7 @@ SKIP_CERT ?=false
 run-with-webhook: export METRICS_PORT?=8080
 run-with-webhook: export HEALTH_PORT?=8081
 run-with-webhook: export PPROF_PORT?=8082
+run-with-webhook: export WEBHOOK_PORT?=9443
 run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
 	/bin/bash hack/run_with_local_webhook.sh
 

hack/run_with_local_webhook.sh

@@ -15,8 +15,8 @@ TMPDIR=${TMPDIR:-"/tmp/k8s-webhook-server/serving-certs"}
 SKIP_CERT=${SKIP_CERT:-false}
 CRC_IP=${CRC_IP:-$(/sbin/ip -o -4 addr list crc | awk '{print $4}' | cut -d/ -f1)}
 
-#Open 9443
-sudo firewall-cmd --zone=libvirt --add-port=9443/tcp || :
+#Open ${WEBHOOK_PORT}
+sudo firewall-cmd --zone=libvirt --add-port=${WEBHOOK_PORT}/tcp || :
 sudo firewall-cmd --runtime-to-permanent || :
 
 # Generate the certs and the ca bundle
@@ -48,7 +48,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/validate-core-openstack-org-v1beta1-openstackcontrolplane
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/validate-core-openstack-org-v1beta1-openstackcontrolplane
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: vopenstackcontrolplane.kb.io
@@ -76,7 +76,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/validate-client-openstack-org-v1beta1-openstackclient
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/validate-client-openstack-org-v1beta1-openstackclient
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: vopenstackclient.kb.io
@@ -104,7 +104,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/validate-core-openstack-org-v1beta1-openstackversion
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/validate-core-openstack-org-v1beta1-openstackversion
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: vopenstackversion.kb.io
@@ -132,7 +132,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/mutate-core-openstack-org-v1beta1-openstackcontrolplane
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/mutate-core-openstack-org-v1beta1-openstackcontrolplane
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: mopenstackcontrolplane.kb.io
@@ -160,7 +160,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/mutate-client-openstack-org-v1beta1-openstackclient
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/mutate-client-openstack-org-v1beta1-openstackclient
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: mopenstackclient.kb.io
@@ -188,7 +188,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/mutate-core-openstack-org-v1beta1-openstackversion
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/mutate-core-openstack-org-v1beta1-openstackversion
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: mopenstackversion.kb.io
@@ -216,7 +216,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/validate-dataplane-openstack-org-v1beta1-openstackdataplanenodeset
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/validate-dataplane-openstack-org-v1beta1-openstackdataplanenodeset
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: vopenstackdataplanenodeset.kb.io
@@ -244,7 +244,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/mutate-dataplane-openstack-org-v1beta1-openstackdataplanenodeset
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/mutate-dataplane-openstack-org-v1beta1-openstackdataplanenodeset
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: mopenstackdataplanenodeset.kb.io
@@ -272,7 +272,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/validate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/validate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: vopenstackdataplanedeployment.kb.io
@@ -300,7 +300,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/mutate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/mutate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: mopenstackdataplanedeployment.kb.io
@@ -328,7 +328,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/validate-dataplane-openstack-org-v1beta1-openstackdataplaneservice
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/validate-dataplane-openstack-org-v1beta1-openstackdataplaneservice
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: vopenstackdataplaneservice.kb.io
@@ -356,7 +356,7 @@ webhooks:
   - v1
   clientConfig:
     caBundle: ${CA_BUNDLE}
-    url: https://${CRC_IP}:9443/mutate-dataplane-openstack-org-v1beta1-openstackdataplaneservice
+    url: https://${CRC_IP}:${WEBHOOK_PORT}/mutate-dataplane-openstack-org-v1beta1-openstackdataplaneservice
   failurePolicy: Fail
   matchPolicy: Equivalent
   name: mopenstackdataplaneservice.kb.io
@@ -402,4 +402,4 @@ if [ -n "${CSV_NAME}" ]; then
 fi
 
 source hack/export_related_images.sh && \
-go run ./main.go -metrics-bind-address ":${METRICS_PORT}" -health-probe-bind-address ":${HEALTH_PORT}" -pprof-bind-address ":${PPROF_PORT}"
+go run ./main.go -metrics-bind-address ":${METRICS_PORT}" -health-probe-bind-address ":${HEALTH_PORT}" -pprof-bind-address ":${PPROF_PORT}" -webhook-bind-address "${WEBHOOK_PORT}"

main.go

@@ -150,6 +150,7 @@ func main() {
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.StringVar(&pprofAddr, "pprof-bind-address", "", "The address the pprof endpoint binds to. Set to empty to disable pprof")
+	flag.IntVar(&webhookPort, "webhook-bind-address", 9443, "The port the webhook server binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
@@ -184,7 +185,7 @@ func main() {
 		LeaderElectionID:       "40ba705e.openstack.org",
 		WebhookServer: webhook.NewServer(
 			webhook.Options{
-				Port:    9443,
+				Port:    webhookPort,
 				TLSOpts: []func(config *tls.Config){disableHTTP2},
 			}),
 		// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily