Skip to content

(feat) show addon command filters #427

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

Merged
gianlucam76 merged 1 commit into from
Apr 25, 2026
Merged

(feat) show addon command filters #427

Show file tree
Hide file tree
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
56 changes: 33 additions & 23 deletions internal/commands/show/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ var (
)

func displayAddOns(ctx context.Context, passedNamespace, passedCluster, passedProfile string,
logger logr.Logger) error {
helmOnly, resourcesOnly bool, logger logr.Logger) error {

table := tablewriter.NewWriter(os.Stdout)
table.Header("CLUSTER", "RESOURCE TYPE", "NAMESPACE", "NAME", "VERSION", "TIME", "DEPLOYMENT TYPE", "PROFILES")

if err := displayAddOnsInNamespaces(ctx, passedNamespace, passedCluster,
passedProfile, table, logger); err != nil {
passedProfile, helmOnly, resourcesOnly, table, logger); err != nil {
return err
}

return table.Render()
}

func displayAddOnsInNamespaces(ctx context.Context, passedNamespace, passedCluster, passedProfile string,
table *tablewriter.Table, logger logr.Logger) error {
helmOnly, resourcesOnly bool, table *tablewriter.Table, logger logr.Logger) error {

instance := utils.GetAccessInstance()

Expand All @@ -88,7 +88,7 @@ func displayAddOnsInNamespaces(ctx context.Context, passedNamespace, passedClust
if doConsiderNamespace(ns, passedNamespace) {
logger.V(logs.LogDebug).Info(fmt.Sprintf("Considering namespace: %s", ns.Name))
err = displayAddOnsInNamespace(ctx, ns.Name, passedCluster, passedProfile,
table, logger)
helmOnly, resourcesOnly, table, logger)
if err != nil {
return err
}
Expand All @@ -99,7 +99,7 @@ func displayAddOnsInNamespaces(ctx context.Context, passedNamespace, passedClust
}

func displayAddOnsInNamespace(ctx context.Context, namespace, passedCluster, passedProfile string,
table *tablewriter.Table, logger logr.Logger) error {
helmOnly, resourcesOnly bool, table *tablewriter.Table, logger logr.Logger) error {

instance := utils.GetAccessInstance()

Expand All @@ -114,7 +114,7 @@ func displayAddOnsInNamespace(ctx context.Context, namespace, passedCluster, pas
cc := &clusterConfigurations.Items[i]
if doConsiderClusterConfiguration(cc, passedCluster) {
logger.V(logs.LogDebug).Info(fmt.Sprintf("Considering ClusterConfiguration: %s", cc.Name))
if err := displayAddOnsForCluster(cc, passedProfile, table, logger); err != nil {
if err := displayAddOnsForCluster(cc, passedProfile, helmOnly, resourcesOnly, table, logger); err != nil {
return err
}
}
Expand All @@ -124,50 +124,57 @@ func displayAddOnsInNamespace(ctx context.Context, namespace, passedCluster, pas
}

func displayAddOnsForCluster(clusterConfiguration *configv1beta1.ClusterConfiguration, passedProfile string,
table *tablewriter.Table, logger logr.Logger) error {
helmOnly, resourcesOnly bool, table *tablewriter.Table, logger logr.Logger) error {

instance := utils.GetAccessInstance()
helmCharts := instance.GetHelmReleases(clusterConfiguration, logger)

logger = logger.WithValues("clusterConfiguration", clusterConfiguration.Name)
logger.V(logs.LogDebug).Info("Get ClusterConfiguration")

clusterName := instance.GetClusterNameFromClusterConfiguration(clusterConfiguration)

clusterInfo := fmt.Sprintf("%s/%s", clusterConfiguration.Namespace, clusterName)
for chart := range helmCharts {
if doConsiderProfile(helmCharts[chart], passedProfile) {
if err := table.Append(genAddOnsRow(clusterInfo, "helm chart", chart.Namespace, chart.ReleaseName, chart.ChartVersion,
chart.LastAppliedTime.String(), helmCharts[chart], configv1beta1.DeploymentTypeRemote)); err != nil {
return err

if !resourcesOnly {
helmCharts := instance.GetHelmReleases(clusterConfiguration, logger)
for chart := range helmCharts {
if doConsiderProfile(helmCharts[chart], passedProfile) {
if err := table.Append(genAddOnsRow(clusterInfo, "helm chart", chart.Namespace, chart.ReleaseName, chart.ChartVersion,
chart.LastAppliedTime.String(), helmCharts[chart], configv1beta1.DeploymentTypeRemote)); err != nil {
return err
}
}
}
}

resources := instance.GetResources(clusterConfiguration, logger)
for resource := range resources {
if doConsiderProfile(resources[resource], passedProfile) {
if err := table.Append(genAddOnsRow(clusterInfo, fmt.Sprintf("%s:%s", resource.Group, resource.Kind),
resource.Namespace, resource.Name, "N/A",
resource.LastAppliedTime.String(), resources[resource], resource.DeploymentType)); err != nil {
return err
if !helmOnly {
resources := instance.GetResources(clusterConfiguration, logger)
for resource := range resources {
if doConsiderProfile(resources[resource], passedProfile) {
if err := table.Append(genAddOnsRow(clusterInfo, fmt.Sprintf("%s:%s", resource.Group, resource.Kind),
resource.Namespace, resource.Name, "N/A",
resource.LastAppliedTime.String(), resources[resource], resource.DeploymentType)); err != nil {
return err
}
}
}
}

return nil
}

// AddOns displays information about Kubernetes AddOns deployed in clusters
func AddOns(ctx context.Context, args []string, logger logr.Logger) error {
doc := `Usage:
sveltosctl show addons [options] [--namespace=<name>] [--cluster=<name>] [--profile=<name>] [--verbose]
sveltosctl show addons [options] [--namespace=<name>] [--cluster=<name>] [--profile=<name>] [--helm-charts] [--resources] [--verbose]

--namespace=<name> Show Kubernetes addons deployed in clusters in this namespace.
If not specified all namespaces are considered.
--cluster=<name> Show Kubernetes addons deployed in cluster with name.
If not specified all cluster names are considered.
--profile=<kind/name> Show Kubernetes addons deployed because of this clusterprofile/profile.
If not specified all clusterprofiles/profiles are considered.
--helm-charts Show helm charts only.
--resources Show resources only.

Options:
-h --help Show this screen.
Expand Down Expand Up @@ -213,5 +220,8 @@ Description:
profile = passedProfile.(string)
}

return displayAddOns(ctx, namespace, cluster, profile, logger)
helmOnly := parsedArgs["--helm-charts"].(bool)
resourcesOnly := parsedArgs["--resources"].(bool)

return displayAddOns(ctx, namespace, cluster, profile, helmOnly, resourcesOnly, logger)
}
55 changes: 53 additions & 2 deletions internal/commands/show/addons_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var _ = Describe("AddOnss", func() {
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(initObjects...).Build()

utils.InitalizeManagementClusterAcces(scheme, nil, nil, c)
err = show.DisplayAddOns(context.TODO(), "", "", "",
err = show.DisplayAddOns(context.TODO(), "", "", "", false, false,
textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))))
Expect(err).To(BeNil())

Expand All @@ -110,6 +110,57 @@ var _ = Describe("AddOnss", func() {
os.Stdout = old
})

It("show addons with --helm-charts displays only helm charts and not resources", func() {
clusterProfileName := randomString()
charts := []configv1beta1.Chart{
*generateChart(), *generateChart(),
}
resources := []configv1beta1.DeployedResource{
*generateResource(), *generateResource(),
}
clusterConfiguration = addDeployedHelmCharts(clusterConfiguration, clusterProfileName, charts)
clusterConfiguration = addDeployedResources(clusterConfiguration, clusterProfileName, resources)

old := os.Stdout
r, w, _ := os.Pipe()
os.Stdout = w

initObjects := []client.Object{ns, clusterConfiguration}

scheme, err := utils.GetScheme()
Expect(err).To(BeNil())
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(initObjects...).Build()

utils.InitalizeManagementClusterAcces(scheme, nil, nil, c)
err = show.DisplayAddOns(context.TODO(), "", "", "", true, false,
textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))))
Expect(err).To(BeNil())

clusterInfo := fmt.Sprintf("%s/%s", clusterConfiguration.Namespace, clusterConfiguration.Name)

w.Close()
var buf bytes.Buffer
_, err = io.Copy(&buf, r)
Expect(err).To(BeNil())

lines := strings.Split(buf.String(), "\n")
verifyCharts(lines, clusterInfo, clusterProfileName, charts)

// resources must not appear in the output
for i := range resources {
for _, line := range lines {
if strings.Contains(line, clusterInfo) &&
strings.Contains(line, resources[i].Namespace) &&
strings.Contains(line, resources[i].Name) {
Fail(fmt.Sprintf("resource %s/%s should not appear when --helm-charts is set",
resources[i].Namespace, resources[i].Name))
}
}
}

os.Stdout = old
})

It("show addonss display deployed resources", func() {
clusterProfileName1 := randomString()
resource1 := []configv1beta1.DeployedResource{
Expand All @@ -134,7 +185,7 @@ var _ = Describe("AddOnss", func() {
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(initObjects...).Build()

utils.InitalizeManagementClusterAcces(scheme, nil, nil, c)
err = show.DisplayAddOns(context.TODO(), "", "", "",
err = show.DisplayAddOns(context.TODO(), "", "", "", false, false,
textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))))
Expect(err).To(BeNil())

Expand Down