use frontproxy externalHostname in rootshard for frontproxy test

This is required because the external hostname inside a rootshard in an installation with a
frontproxy should be the external hostname of the frontproxy

On-behalf-of: SAP <[email protected]>
Signed-off-by: Simon Bein <[email protected]>

Author: SimonTheLeg

test/e2e/frontproxies/frontproxies_test.go

@@ -46,11 +46,13 @@ func TestCreateFrontProxy(t *testing.T) {
 
 	utils.CreateSelfDestructingNamespace(t, ctx, client, namespace)
 
+	externalHostname := "front-proxy-front-proxy.svc.cluster.local"
+
 	// deploy rootshard
-	rootShard := utils.DeployRootShard(ctx, t, client, namespace)
+	rootShard := utils.DeployRootShard(ctx, t, client, namespace, externalHostname)
 
 	// deploy front-proxy
-	frontProxy := utils.DeployFrontProxy(ctx, t, client, namespace, rootShard.Name)
+	frontProxy := utils.DeployFrontProxy(ctx, t, client, namespace, rootShard.Name, externalHostname)
 
 	// create front-proxy kubeconfig
 	configSecretName := "kubeconfig-front-proxy-e2e"

test/e2e/rootshards/rootshards_test.go

@@ -42,7 +42,7 @@ func TestCreateRootShard(t *testing.T) {
 	namespace := "create-rootshard"
 
 	utils.CreateSelfDestructingNamespace(t, ctx, client, namespace)
-	rootShard := utils.DeployRootShard(ctx, t, client, namespace)
+	rootShard := utils.DeployRootShard(ctx, t, client, namespace, "example.localhost")
 
 	configSecretName := "kubeconfig"
 

test/e2e/shards/shards_test.go

@@ -47,7 +47,7 @@ func TestCreateShard(t *testing.T) {
 	utils.CreateSelfDestructingNamespace(t, ctx, client, namespace)
 
 	// deploy a root shard incl. etcd
-	rootShard := utils.DeployRootShard(ctx, t, client, namespace)
+	rootShard := utils.DeployRootShard(ctx, t, client, namespace, "example.localhost")
 
 	// deploy a 2nd shard incl. etcd
 	shardName := "aadvark"

test/utils/deploy.go

@@ -106,7 +106,7 @@ func DeployShard(ctx context.Context, t *testing.T, client ctrlruntimeclient.Cli
 	return shard
 }
 
-func DeployRootShard(ctx context.Context, t *testing.T, client ctrlruntimeclient.Client, namespace string, patches ...func(*operatorv1alpha1.RootShard)) operatorv1alpha1.RootShard {
+func DeployRootShard(ctx context.Context, t *testing.T, client ctrlruntimeclient.Client, namespace string, externalHostname string, patches ...func(*operatorv1alpha1.RootShard)) operatorv1alpha1.RootShard {
 	t.Helper()
 
 	etcd := DeployEtcd(t, "etcd-r00t", namespace)
@@ -117,7 +117,7 @@ func DeployRootShard(ctx context.Context, t *testing.T, client ctrlruntimeclient
 
 	rootShard.Spec = operatorv1alpha1.RootShardSpec{
 		External: operatorv1alpha1.ExternalConfig{
-			Hostname: "example.localhost",
+			Hostname: externalHostname,
 			Port:     6443,
 		},
 		Cache: operatorv1alpha1.CacheConfig{
@@ -156,7 +156,7 @@ func DeployRootShard(ctx context.Context, t *testing.T, client ctrlruntimeclient
 	return rootShard
 }
 
-func DeployFrontProxy(ctx context.Context, t *testing.T, client ctrlruntimeclient.Client, namespace string, rootShardName string, patches ...func(*operatorv1alpha1.FrontProxy)) operatorv1alpha1.FrontProxy {
+func DeployFrontProxy(ctx context.Context, t *testing.T, client ctrlruntimeclient.Client, namespace string, rootShardName string, externalHostname string, patches ...func(*operatorv1alpha1.FrontProxy)) operatorv1alpha1.FrontProxy {
 	t.Helper()
 
 	frontProxy := operatorv1alpha1.FrontProxy{}
@@ -169,7 +169,7 @@ func DeployFrontProxy(ctx context.Context, t *testing.T, client ctrlruntimeclien
 				Name: rootShardName,
 			},
 		},
-		ExternalHostname: fmt.Sprintf("%s.%s.svc.cluster.local", frontProxy.Name, frontProxy.Namespace),
+		ExternalHostname: externalHostname,
 		Auth: &operatorv1alpha1.AuthSpec{
 			// we need to remove the default system:masters group in order to do our testing
 			DropGroups: []string{""},

test/utils/utils.go

@@ -182,11 +182,6 @@ func ConnectWithKubeconfig(
 	parts := strings.Split(hostname, ".")
 	serviceName := parts[0]
 
-	// for frontproxies add required suffix
-	if config.Spec.Target.FrontProxyRef != nil {
-		serviceName += "-front-proxy"
-	}
-
 	portNum, err := strconv.ParseInt(portString, 10, 32)
 	if err != nil {
 		t.Fatalf("Failed to parse kubeconfig's port %q: %v", portString, err)