From 8a26689d3132eb0ea668ba29d4001fbb71227a35 Mon Sep 17 00:00:00 2001 From: Jiacheng Xu Date: Mon, 27 Jul 2020 21:33:28 +0800 Subject: [PATCH] Change default webhook port to 9443 --- pkg/builder/builder_suite_test.go | 2 +- pkg/manager/manager_test.go | 4 ++-- pkg/webhook/server.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go index 3787cc6835..053e15359c 100644 --- a/pkg/builder/builder_suite_test.go +++ b/pkg/builder/builder_suite_test.go @@ -73,7 +73,7 @@ var _ = AfterSuite(func() { metrics.DefaultBindAddress = ":8080" // Change the webhook.DefaultPort back to the original default. - webhook.DefaultPort = 443 + webhook.DefaultPort = 9443 }) func addCRDToEnvironment(env *envtest.Environment, gvks ...schema.GroupVersionKind) { diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go index af995502e6..eb2f591f19 100644 --- a/pkg/manager/manager_test.go +++ b/pkg/manager/manager_test.go @@ -133,14 +133,14 @@ var _ = Describe("manger.Manager", func() { It("should lazily initialize a webhook server if needed", func(done Done) { By("creating a manager with options") - m, err := New(cfg, Options{Port: 9443, Host: "foo.com"}) + m, err := New(cfg, Options{Port: 9440, Host: "foo.com"}) Expect(err).NotTo(HaveOccurred()) Expect(m).NotTo(BeNil()) By("checking options are passed to the webhook server") svr := m.GetWebhookServer() Expect(svr).NotTo(BeNil()) - Expect(svr.Port).To(Equal(9443)) + Expect(svr.Port).To(Equal(9440)) Expect(svr.Host).To(Equal("foo.com")) close(done) diff --git a/pkg/webhook/server.go b/pkg/webhook/server.go index e771a936cb..ba21fe2b0a 100644 --- a/pkg/webhook/server.go +++ b/pkg/webhook/server.go @@ -37,7 +37,7 @@ import ( ) // DefaultPort is the default port that the webhook server serves. -var DefaultPort = 443 +var DefaultPort = 9443 // Server is an admission webhook server that can serve traffic and // generates related k8s resources for deploying. @@ -47,7 +47,7 @@ type Server struct { Host string // Port is the port number that the server will serve. - // It will be defaulted to 443 if unspecified. + // It will be defaulted to 9443 if unspecified. Port int // CertDir is the directory that contains the server key and certificate. The