From ebdeb3aa58acca9b3167b4480cbd0f9ae7bb49bd Mon Sep 17 00:00:00 2001 From: jpgouin Date: Tue, 28 Jan 2025 14:27:50 +0000 Subject: [PATCH] fix merge --- pkg/controller/kubeconfig/kubeconfig.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/kubeconfig/kubeconfig.go b/pkg/controller/kubeconfig/kubeconfig.go index 46360d45..e6d3fd12 100644 --- a/pkg/controller/kubeconfig/kubeconfig.go +++ b/pkg/controller/kubeconfig/kubeconfig.go @@ -54,7 +54,7 @@ func (k *KubeConfig) Extract(ctx context.Context, client client.Client, cluster if err != nil { return nil, err } - + url, err := getURLFromService(ctx, client, cluster, hostServerIP) if err != nil { return nil, err @@ -106,9 +106,9 @@ func getURLFromService(ctx context.Context, client client.Client, cluster *v1alp nodePort := k3kService.Spec.Ports[0].NodePort url = fmt.Sprintf("https://%s:%d", hostServerIP, nodePort) } - if cluster.Spec.Expose.Ingress.Enabled { + if cluster.Spec.Expose.Ingress.Enabled { var k3kIngress networkingv1.Ingress - ingressKey = types.NamespacedName{ + ingressKey := types.NamespacedName{ Name: server.IngressName(cluster.Name), Namespace: cluster.Namespace, }