Make port configurable in webhook, default is set to 443 (#2215)

Signed-off-by: Nir Shtein <[email protected]>
argoproj · Sep 27, 2022 · 81b501e · 81b501e
1 parent 07e6960
commit 81b501e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/manifests/extensions/validating-webhook/events-webhook-deployment.yaml b/manifests/extensions/validating-webhook/events-webhook-deployment.yaml
@@ -23,4 +23,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: PORT
+          value: "443"              
       serviceAccountName: argo-events-webhook-sa
diff --git a/manifests/install-validating-webhook.yaml b/manifests/install-validating-webhook.yaml
@@ -114,6 +114,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: PORT
+          value: "443"
         image: quay.io/argoproj/argo-events:latest
         imagePullPolicy: Always
         name: webhook

diff --git a/webhook/cmd/start.go b/webhook/cmd/start.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"crypto/tls"
 	"os"
+	"strconv"
 
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -19,10 +20,12 @@ import (
 	eventsourceclient "github.com/argoproj/argo-events/pkg/client/eventsource/clientset/versioned"
 	sensorclient "github.com/argoproj/argo-events/pkg/client/sensor/clientset/versioned"
 	"github.com/argoproj/argo-events/webhook"
+	envpkg "github.com/argoproj/pkg/env"
 )
 
 const (
 	namespaceEnvVar = "NAMESPACE"
+	portEnvVar      = "PORT"
 )
 
 func Start() {
@@ -39,15 +42,21 @@ func Start() {
 
 	namespace, defined := os.LookupEnv(namespaceEnvVar)
 	if !defined {
-		logger.Fatalf("required environment variable '%s' not defined", namespaceEnvVar)
+		logger.Fatalf("required environment variable %q not defined", namespaceEnvVar)
+	}
+
+	portStr := envpkg.LookupEnvStringOr(portEnvVar, "443")
+	port, err := strconv.Atoi(portStr)
+	if err != nil {
+		logger.Fatalf("port should be a number, environment variable %q not valid", portStr)
 	}
 
 	options := webhook.Options{
 		ServiceName:     "events-webhook",
 		DeploymentName:  "events-webhook",
 		ClusterRoleName: "argo-events-webhook",
 		Namespace:       namespace,
-		Port:            443,
+		Port:            port,
 		SecretName:      "events-webhook-certs",
 		WebhookName:     "webhook.argo-events.argoproj.io",
 		ClientAuth:      tls.VerifyClientCertIfGiven,