Address PR feedback

Signed-off-by: solidDoWant <fred.heinecke@yahoo.com>

Author: solidDoWant

pkg/internal/testing/controlplane/apiserver.go

@@ -374,9 +374,9 @@ func (s *APIServer) populateAPIServerCerts() error {
 		return err
 	}
 
-	servingAddresses := []string{"localhost", s.SecureServing.ListenAddr.Address}
-	if s.InsecureServing != nil {
-		servingAddresses = append(servingAddresses, s.InsecureServing.Address)
+	servingAddresses := []string{"localhost"}
+	if s.SecureServing.ListenAddr.Address != "" {
+		servingAddresses = append(servingAddresses, s.SecureServing.ListenAddr.Address)
 	}
 
 	servingCerts, err := ca.NewServingCert(servingAddresses...)

pkg/internal/testing/controlplane/apiserver_test.go

@@ -218,17 +218,8 @@ var _ = Describe("APIServer", func() {
 			return cert
 		}
 
-		Context("when SecureServing host & port are set", func() {
-			BeforeEach(func() {
-				server.SecureServing = SecureServing{
-					ListenAddr: process.ListenAddr{
-						Address: "1.2.3.4",
-						Port:    "5678",
-					},
-				}
-			})
-
-			It("should have the host in the certificate altnames", func() {
+		Context("when SecureServing are not set", func() {
+			It("should have localhost/127.0.0.1 in the certificate altnames", func() {
 				cert := getCertificate()
 
 				Expect(cert.Subject.CommonName).To(Equal("localhost"))
@@ -241,39 +232,14 @@ var _ = Describe("APIServer", func() {
 			})
 		})
 
-		Context("when InsecureServing host & port are set", func() {
-			BeforeEach(func() {
-				server.InsecureServing = &process.ListenAddr{
-					Address: "1.2.3.4",
-					Port:    "5678",
-				}
-			})
-
-			It("should have the host in the certificate altnames", func() {
-				cert := getCertificate()
-
-				Expect(cert.Subject.CommonName).To(Equal("localhost"))
-				Expect(cert.DNSNames).To(ConsistOf("localhost"))
-				expectedIPAddresses := []net.IP{
-					net.ParseIP("127.0.0.1").To4(),
-					net.ParseIP(server.InsecureServing.Address).To4(),
-				}
-				Expect(cert.IPAddresses).To(ContainElements(expectedIPAddresses))
-			})
-		})
-
-		Context("when SecureServing and InsecureServing host & port are set", func() {
+		Context("when SecureServing host & port are set", func() {
 			BeforeEach(func() {
 				server.SecureServing = SecureServing{
 					ListenAddr: process.ListenAddr{
 						Address: "1.2.3.4",
 						Port:    "5678",
 					},
 				}
-				server.InsecureServing = &process.ListenAddr{
-					Address: "5.6.7.8",
-					Port:    "1234",
-				}
 			})
 
 			It("should have the host in the certificate altnames", func() {
@@ -284,7 +250,6 @@ var _ = Describe("APIServer", func() {
 				expectedIPAddresses := []net.IP{
 					net.ParseIP("127.0.0.1").To4(),
 					net.ParseIP(server.SecureServing.ListenAddr.Address).To4(),
-					net.ParseIP(server.InsecureServing.Address).To4(),
 				}
 				Expect(cert.IPAddresses).To(ContainElements(expectedIPAddresses))
 			})