fix: resolve externalname

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

internal/provider/adc/config.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
+	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
@@ -120,8 +121,24 @@ func (d *adcClient) getConfigsForGatewayProxy(tctx *provider.TranslateContext, g
 				config.ServerAddrs = append(config.ServerAddrs, "http://"+net.JoinHostPort(node.Host, strconv.Itoa(node.Port)))
 			}
 		} else {
-			config.ServerAddrs = []string{
-				fmt.Sprintf("http://%s.%s:%d", provider.ControlPlane.Service.Name, gatewayProxy.Namespace, provider.ControlPlane.Service.Port),
+			key := k8stypes.NamespacedName{
+				Namespace: gatewayProxy.Namespace,
+				Name:      provider.ControlPlane.Service.Name,
+			}
+			service, ok := tctx.Services[key]
+			if !ok {
+				return nil, fmt.Errorf("service %s not found", key)
+			}
+			refPort := provider.ControlPlane.Service.Port
+			// if the service is external name, we should use the external name as the server address
+			if service.Spec.Type == corev1.ServiceTypeExternalName {
+				config.ServerAddrs = []string{
+					fmt.Sprintf("http://%s:%d", service.Spec.ExternalName, refPort),
+				}
+			} else {
+				config.ServerAddrs = []string{
+					fmt.Sprintf("http://%s.%s:%d", key.Name, key.Namespace, refPort),
+				}
 			}
 		}
 

test/e2e/crds/v2/status.go

@@ -171,7 +171,6 @@ spec:
 				Check:   scaffold.WithExpectedStatus(200),
 			})
 
-			time.Sleep(60 * time.Second)
 			By("get yaml from service")
 			serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
 			Expect(err).NotTo(HaveOccurred(), "getting service yaml")
@@ -180,16 +179,10 @@ spec:
 			err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
 			oldSpec := k8sservice.Spec
-			// if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPISIX {
-			// 	k8sservice.Spec.Selector = map[string]string{
-			// 		"app.kubernetes.io/name": "nonexistent",
-			// 	}
-			// } else {
 			k8sservice.Spec = corev1.ServiceSpec{
 				Type:         corev1.ServiceTypeExternalName,
 				ExternalName: "invalid.host",
 			}
-			// }
 			newServiceYaml, err := yaml.Marshal(k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "marshalling service")
 			err = s.CreateResourceFromString(string(newServiceYaml))

test/e2e/framework/manifests/ingress.yaml

@@ -334,7 +334,7 @@ data:
     log_level: "debug"
     controller_name: {{ .ControllerName | default "apisix.apache.org/apisix-ingress-controller" }}
     leader_election_id: "apisix-ingress-controller-leader"
-    exec_adc_timeout: 30s
+    exec_adc_timeout: 5s
     provider:
       type: {{ .ProviderType | default "apisix-standalone" }}
       sync_period: {{ .ProviderSyncPeriod | default "0s" }}

test/e2e/gatewayapi/status.go

@@ -127,7 +127,6 @@ spec:
 				Check:  scaffold.WithExpectedStatus(200),
 			})
 
-			time.Sleep(60 * time.Second)
 			By("get yaml from service")
 			serviceYaml, err := s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
 			Expect(err).NotTo(HaveOccurred(), "getting service yaml")
@@ -136,16 +135,10 @@ spec:
 			err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
 			oldSpec := k8sservice.Spec
-			// if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPISIX {
-			// 	k8sservice.Spec.Selector = map[string]string{
-			// 		"app.kubernetes.io/name": "nonexistent",
-			// 	}
-			// } else {
 			k8sservice.Spec = corev1.ServiceSpec{
 				Type:         corev1.ServiceTypeExternalName,
 				ExternalName: "invalid.host",
 			}
-			// }
 			newServiceYaml, err := yaml.Marshal(k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "marshalling service")
 			err = s.CreateResourceFromString(string(newServiceYaml))