Use internal API Server URL for internal load balancer

Author: damemi

pkg/operator/certrotationcontroller/externalloadbalancer.go

@@ -18,7 +18,6 @@ func (c *CertRotationController) syncExternalLoadBalancerHostnames() error {
 	hostname := infrastructureConfig.Status.APIServerURL
 	hostname = strings.Replace(hostname, "https://", "", 1)
 	hostname = hostname[0:strings.LastIndex(hostname, ":")]
-	hostname = strings.Replace(hostname, "api-int.", "api.", 1)
 
 	klog.V(2).Infof("syncing external loadbalancer hostnames: %v", hostname)
 	c.externalLoadBalancer.setHostnames([]string{hostname})

pkg/operator/certrotationcontroller/internalloadbalancer.go

@@ -15,7 +15,7 @@ func (c *CertRotationController) syncInternalLoadBalancerHostnames() error {
 	if err != nil {
 		return err
 	}
-	hostname := infrastructureConfig.Status.APIServerURL
+	hostname := infrastructureConfig.Status.APIServerInternalURL
 	hostname = strings.Replace(hostname, "https://", "", 1)
 	hostname = hostname[0:strings.LastIndex(hostname, ":")]
 

test/e2e/user_certs_test.go

@@ -305,7 +305,7 @@ func getExternalAPIServiceHostName(client *configclient.ConfigV1Client) (string,
 	if err != nil {
 		return "", err
 	}
-	return strings.Replace(strings.Split(apiServerURL.Host, ":")[0], "api-int.", "api.", 1), nil
+	return strings.Split(apiServerURL.Host, ":")[0], nil
 }
 
 func getInternalAPIServiceHostNameOrFail(t *testing.T, client *configclient.ConfigV1Client) string {
@@ -320,7 +320,7 @@ func getInternalAPIServiceHostName(client *configclient.ConfigV1Client) (string,
 	if err != nil {
 		return "", err
 	}
-	apiServerURL, err := url.Parse(infrastructure.Status.APIServerURL)
+	apiServerURL, err := url.Parse(infrastructure.Status.APIServerInternalURL)
 	if err != nil {
 		return "", err
 	}