Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use kurl-proxy-kotsadm nodeport in embedded-cluster installations #4365

Merged
merged 3 commits into from
Jan 17, 2024
Merged

use kurl-proxy-kotsadm nodeport in embedded-cluster installations #4365

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b56fc1c
use kurl-proxy-kotsadm nodeport in embedded-cluster installations
laverya Jan 16, 2024
b358fe1
fix error message
laverya Jan 16, 2024
a6b19cb
find nodePort in either the 'kurl-proxy-kotsadm' or 'admin-console' s…
laverya Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions pkg/embeddedcluster/node_join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/replicatedhq/kots/pkg/embeddedcluster/types"
"github.com/replicatedhq/kots/pkg/k8sutil"
"github.com/replicatedhq/kots/pkg/util"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
)
Expand Down Expand Up @@ -185,19 +186,38 @@ func GenerateK0sJoinCommand(ctx context.Context, client kubernetes.Interface, ro
return strings.Join(cmd, " "), nil
}

// gets the port of the 'admin-console' service
// gets the port of the 'admin-console' or 'kurl-proxy-kotsadm' service
func getAdminConsolePort(ctx context.Context, client kubernetes.Interface) (int32, error) {
svc, err := client.CoreV1().Services(util.PodNamespace).Get(ctx, "admin-console", metav1.GetOptions{})
kurlProxyPort, err := getAdminConsolePortImpl(ctx, client, "kurl-proxy-kotsadm")
if err != nil {
return -1, fmt.Errorf("failed to get admin-console service: %w", err)
if errors.IsNotFound(err) {
adminConsolePort, err := getAdminConsolePortImpl(ctx, client, "admin-console")
if err != nil {
return -1, fmt.Errorf("failed to get admin-console port: %w", err)
}
return adminConsolePort, nil
}
return -1, fmt.Errorf("failed to get kurl-proxy-kotsadm port: %w", err)
}
return kurlProxyPort, nil
}

func getAdminConsolePortImpl(ctx context.Context, client kubernetes.Interface, svcName string) (int32, error) {
svc, err := client.CoreV1().Services(util.PodNamespace).Get(ctx, svcName, metav1.GetOptions{})
if err != nil {
return -1, fmt.Errorf("failed to get %s service: %w", svcName, err)
}

if len(svc.Spec.Ports) == 1 {
return svc.Spec.Ports[0].NodePort, nil
}

for _, port := range svc.Spec.Ports {
if port.Name == "http" {
return port.NodePort, nil
}
}
return -1, fmt.Errorf("did not find port 'http' in service 'admin-console'")
return -1, fmt.Errorf("did not find port 'http' in service '%s'", svcName)
}

// getControllerNodeIP gets the IP of a healthy controller node
Expand Down
Loading