only start conversion if not shell server (#120)

hobbyfarm · Oct 4, 2022 · a55cee9 · a55cee9
1 parent 0ded1e4
commit a55cee9
Showing 1 changed file with 50 additions and 43 deletions.
diff --git a/main.go b/main.go
@@ -110,22 +110,25 @@ func main() {
 
 	namespace := util.GetReleaseNamespace()
 
-	ca, err := os.ReadFile(webhookTLSCA)
-	if err != nil {
-		glog.Fatalf("error reading ca certificate: %s", err.Error())
-	}
+	var ca string
+	if !shellServer {
+		ca, err := os.ReadFile(webhookTLSCA)
+		if err != nil {
+			glog.Fatalf("error reading ca certificate: %s", err.Error())
+		}
 
-	crds := crd.GenerateCRDs(string(ca), v1.ServiceReference{
-		Namespace: namespace,
-		Name:      "hobbyfarm-webhook",
-	})
+		crds := crd.GenerateCRDs(string(ca), v1.ServiceReference{
+			Namespace: namespace,
+			Name:      "hobbyfarm-webhook",
+		})
 
-	glog.Info("installing/updating CRDs")
-	err = crder.InstallUpdateCRDs(cfg, crds...)
-	if err != nil {
-		glog.Fatalf("failed installing/updating crds: %s", err.Error())
+		glog.Info("installing/updating CRDs")
+		err = crder.InstallUpdateCRDs(cfg, crds...)
+		if err != nil {
+			glog.Fatalf("failed installing/updating crds: %s", err.Error())
+		}
+		glog.Info("finished installing/updating CRDs")
 	}
-	glog.Info("finished installing/updating CRDs")
 
 	// self manage default rbac roles
 	if installRBACRoles {
@@ -297,51 +300,55 @@ func main() {
 		glog.V(6).Infof("Informers have synchronized")
 	*/
 
-	conversionRouter := mux.NewRouter()
-	conversion.New(conversionRouter, apiExtensionsClient, string(ca))
+	var wg sync.WaitGroup
 
-	http.Handle("/", r)
+	// shell server does not serve webhook endpoint, so don't start it
+	if !shellServer {
+		conversionRouter := mux.NewRouter()
+		conversion.New(conversionRouter, apiExtensionsClient, string(ca))
 
-	var wg sync.WaitGroup
+		webhookPort := os.Getenv("WEBHOOK_PORT")
+		if webhookPort == "" {
+			webhookPort = "444"
+		}
+		glog.Info("webhook listening on " + webhookPort)
+
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+
+			cert, err := tls2.ReadKeyPair(webhookTLSCert, webhookTLSKey)
+			if err != nil {
+				glog.Fatalf("error generating x509keypair from conversion cert and key: %s", err)
+			}
+
+			server := http.Server{
+				TLSConfig: &tls.Config{
+					Certificates: []tls.Certificate{*cert},
+				},
+				Addr:    ":" + webhookPort,
+				Handler: handlers.CORS(corsHeaders, corsOrigins, corsMethods)(conversionRouter),
+			}
 
-	wg.Add(2)
+			glog.Fatal(server.ListenAndServeTLS("", ""))
+		}()
+	}
+
+	wg.Add(1)
+
+	http.Handle("/", r)
 
 	apiPort := os.Getenv("PORT")
 	if apiPort == "" {
 		apiPort = "80"
 	}
 	glog.Info("apiserver listening on " + apiPort)
 
-	webhookPort := os.Getenv("WEBHOOK_PORT")
-	if webhookPort == "" {
-		webhookPort = "444"
-	}
-	glog.Info("webhook listening on " + webhookPort)
-
 	go func() {
 		defer wg.Done()
 		glog.Fatal(http.ListenAndServe(":"+apiPort, handlers.CORS(corsHeaders, corsOrigins, corsMethods)(r)))
 	}()
 
-	go func() {
-		defer wg.Done()
-
-		cert, err := tls2.ReadKeyPair(webhookTLSCert, webhookTLSKey)
-		if err != nil {
-			glog.Fatalf("error generating x509keypair from conversion cert and key: %s", err)
-		}
-
-		server := http.Server{
-			TLSConfig: &tls.Config{
-				Certificates: []tls.Certificate{*cert},
-			},
-			Addr:    ":" + webhookPort,
-			Handler: handlers.CORS(corsHeaders, corsOrigins, corsMethods)(conversionRouter),
-		}
-
-		glog.Fatal(server.ListenAndServeTLS("", ""))
-	}()
-
 	if !disableControllers {
 		lock, err := getLock("controller-manager", cfg)
 		if err != nil {