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

Jump to bottom

fix: liqoctl cluster labels and API server addr override collection #2781

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: liqoctl cluster labels and API server addr override collection #2781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 47 additions & 26 deletions pkg/liqoctl/info/localstatus/local_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

liqov1beta1 "github.com/liqotech/liqo/apis/core/v1beta1"
"github.com/liqotech/liqo/pkg/liqoctl/info"
Expand Down Expand Up @@ -63,21 +64,23 @@ func (l *InstallationChecker) Collect(ctx context.Context, options info.Options)
if err != nil {
l.AddCollectionError(fmt.Errorf("unable to get Liqo version and cluster labels: %w", err))
} else {
if err := l.collectLiqoVersion(ctrlDeployment); err != nil {
l.AddCollectionError(fmt.Errorf("unable to get Liqo version: %w", err))
ctrlContainer, err := l.getCtrlManagerContainer(ctrlDeployment)
if err != nil {
l.AddCollectionError(fmt.Errorf("unable to get Liqo instance info: %w", err))
} else {
if err := l.collectLiqoVersion(ctrlDeployment); err != nil {
l.AddCollectionError(fmt.Errorf("unable to get Liqo version: %w", err))
}

if err := l.collectClusterLabels(ctrlContainer); err != nil {
l.AddCollectionError(fmt.Errorf("unable to get cluster labels: %w", err))
}

if err := l.collectLiqoAPIServerAddr(ctx, options.CRClient, ctrlContainer); err != nil {
l.AddCollectionError(fmt.Errorf("unable to get K8s API server: %w", err))
}
}

if err := l.collectClusterLabels(ctrlDeployment); err != nil {
l.AddCollectionError(fmt.Errorf("unable to get cluster labels: %w", err))
}
}

// Get the URL of the K8s API
apiAddr, err := apiserver.GetURL(ctx, options.CRClient, "")
if err != nil {
l.AddCollectionError(fmt.Errorf("unable to get K8s API server: %w", err))
}
l.data.APIServerAddr = apiAddr
}

// Format returns the collected data using a user friendly output.
Expand All @@ -86,10 +89,13 @@ func (l *InstallationChecker) Format(options info.Options) string {
main.AddEntry("Cluster ID", string(l.data.ClusterID))
main.AddEntry("Version", l.data.Version)
main.AddEntry("K8s API server", l.data.APIServerAddr)
labelsSection := main.AddSection("Cluster labels")
for key, val := range l.data.Labels {
labelsSection.AddEntry(key, val)
if len(l.data.Labels) > 0 {
labelsSection := main.AddSection("Cluster labels")
for key, val := range l.data.Labels {
labelsSection.AddEntry(key, val)
}
}

return main.SprintForBox(options.Printer)
}

Expand All @@ -108,20 +114,23 @@ func (l *InstallationChecker) GetTitle() string {
return "Local installation info"
}

func (l *InstallationChecker) collectClusterLabels(ctrlDeployment *appsv1.Deployment) error {
var ctrlContainer corev1.Container

// Get the container of the controller manager
containers := ctrlDeployment.Spec.Template.Spec.Containers
for i := range containers {
if containers[i].Name == ctrlManagerContainerName {
ctrlContainer = containers[i]
}
func (l *InstallationChecker) collectLiqoAPIServerAddr(ctx context.Context, c client.Client, ctrlContainer *corev1.Container) error {
// Get the URL of the K8s API
apiServerAddressOverride, _ := liqoctlutils.ExtractValuesFromArgumentList("--api-server-address-override", ctrlContainer.Args)
apiAddr, err := apiserver.GetURL(ctx, c, apiServerAddressOverride)
if err != nil {
return err
}

l.data.APIServerAddr = apiAddr
return nil
}

func (l *InstallationChecker) collectClusterLabels(ctrlContainer *corev1.Container) error {
clusterLabelsArg, err := liqoctlutils.ExtractValuesFromArgumentList("--cluster-labels", ctrlContainer.Args)
if err != nil {
return err
// If the `--cluster-labels` is not found, do not return any error and keep the field empty
return nil
}

clusterLabels, err := liqoctlutils.ParseArgsMultipleValues(clusterLabelsArg, ",")
Expand All @@ -141,3 +150,15 @@ func (l *InstallationChecker) collectLiqoVersion(ctrlDeployment *appsv1.Deployme
l.data.Version = version
return nil
}

func (l *InstallationChecker) getCtrlManagerContainer(ctrlDeployment *appsv1.Deployment) (*corev1.Container, error) {
// Get the container of the controller manager
containers := ctrlDeployment.Spec.Template.Spec.Containers
for i := range containers {
if containers[i].Name == ctrlManagerContainerName {
return &containers[i], nil
}
}

return nil, fmt.Errorf("invalid controller manager deployment: no container with name %q found", ctrlManagerContainerName)
}