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

Improve the code to print the secrets using printTable #464

Merged
merged 13 commits into from
Dec 24, 2024
Merged

Improve the code to print the secrets using printTable #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9fb9c76
Improve the code to print the secrets using the cli-runtime line and …
cmoulliard Dec 19, 2024
666bfc7
Pass the writer using stdout to the functions
cmoulliard Dec 19, 2024
cc43fcc
Fix wrong writer used: io.Discard => buffer
cmoulliard Dec 19, 2024
08cbf2d
Fix the issue with the test case: secrets_test.go. Set a new paramete…
cmoulliard Dec 19, 2024
913f60a
Improve the description of the flag: outputFormat to mention the 3 fo…
cmoulliard Dec 19, 2024
288284e
Set the default outputFormat as: table
cmoulliard Dec 20, 2024
771fd89
Moving the print functions to a new package: printer
cmoulliard Dec 20, 2024
813c0cd
Rename generateSecret to populateSecret
cmoulliard Dec 20, 2024
580042f
Moving the function PrintOutput to the printer package. WIP
cmoulliard Dec 20, 2024
13b4ad9
Created entity package to manage the internal types: Secret, Cluster,…
cmoulliard Dec 20, 2024
358c83b
Replace the emtpty format value with the default: table
cmoulliard Dec 20, 2024
3a2c119
Move the code to their corresponding go file
cmoulliard Dec 20, 2024
4127914
Remove the need to use the type to access the function
cmoulliard Dec 20, 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
106 changes: 16 additions & 90 deletions pkg/cmd/get/clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
package get

import (
"bytes"
"context"
"fmt"
"github.com/cnoe-io/idpbuilder/api/v1alpha1"
"github.com/cnoe-io/idpbuilder/pkg/cmd/helpers"
"github.com/cnoe-io/idpbuilder/pkg/entity"
"github.com/cnoe-io/idpbuilder/pkg/k8s"
"github.com/cnoe-io/idpbuilder/pkg/kind"
"github.com/cnoe-io/idpbuilder/pkg/printer"
"github.com/cnoe-io/idpbuilder/pkg/util"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/clientcmd/api"
"os"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/kind/pkg/cluster"
"slices"
Expand All @@ -28,34 +29,6 @@ type ClusterManager struct {
clients map[string]client.Client // map of cluster name to client
}

type Cluster struct {
Name string
URLKubeApi string
KubePort int32
TlsCheck bool
ExternalPort int32
Nodes []Node
}

type Node struct {
Name string
InternalIP string
ExternalIP string
Capacity Capacity
Allocated Allocated
}

type Capacity struct {
Memory float64
Pods int64
Cpu int64
}

type Allocated struct {
Cpu string
Memory string
}

var ClustersCmd = &cobra.Command{
Use: "clusters",
Short: "Get idp clusters",
Expand All @@ -74,13 +47,15 @@ func list(cmd *cobra.Command, args []string) error {
if err != nil {
return err
} else {
// Convert the list of the clusters to Table of clusters
printTable(printers.PrintOptions{}, generateClusterTable(clusters))
return nil
clusterPrinter := printer.ClusterPrinter{
Clusters: clusters,
OutWriter: os.Stdout,
}
return clusterPrinter.PrintOutput(outputFormat)
}
}

func populateClusterList() ([]Cluster, error) {
func populateClusterList() ([]entity.Cluster, error) {
logger := helpers.CmdLogger

detectOpt, err := util.DetectKindNodeProvider()
Expand All @@ -106,7 +81,7 @@ func populateClusterList() ([]Cluster, error) {
}

// Create an empty array of clusters to collect the information
clusterList := []Cluster{}
clusterList := []entity.Cluster{}

// List the idp builder clusters according to the provider: podman or docker
provider := cluster.NewProvider(cluster.ProviderWithLogger(kind.KindLoggerFromLogr(&logger)), detectOpt)
Expand All @@ -122,7 +97,7 @@ func populateClusterList() ([]Cluster, error) {
}

for _, cluster := range clusters {
aCluster := Cluster{Name: cluster}
aCluster := entity.Cluster{Name: cluster}

// Search about the idp cluster within the kubeconfig file and show information
c, found := findClusterByName(config, "kind-"+cluster)
Expand Down Expand Up @@ -164,7 +139,7 @@ func populateClusterList() ([]Cluster, error) {
for _, node := range nodeList.Items {
nodeName := node.Name

aNode := Node{}
aNode := entity.Node{}
aNode.Name = nodeName

for _, addr := range node.Status.Addresses {
Expand All @@ -183,7 +158,7 @@ func populateClusterList() ([]Cluster, error) {
cpu := resources[corev1.ResourceCPU]
pods := resources[corev1.ResourcePods]

aNode.Capacity = Capacity{
aNode.Capacity = entity.Capacity{
Memory: float64(memory.Value()) / (1024 * 1024 * 1024),
Cpu: cpu.Value(),
Pods: pods.Value(),
Expand All @@ -206,60 +181,11 @@ func populateClusterList() ([]Cluster, error) {
return clusterList, nil
}

func generateClusterTable(clusterTable []Cluster) metav1.Table {
table := &metav1.Table{}
table.ColumnDefinitions = []metav1.TableColumnDefinition{
{Name: "Name", Type: "string"},
{Name: "External-Port", Type: "string"},
{Name: "Kube-Api", Type: "string"},
{Name: "TLS", Type: "string"},
{Name: "Kube-Port", Type: "string"},
{Name: "Nodes", Type: "string"},
}
for _, cluster := range clusterTable {
row := metav1.TableRow{
Cells: []interface{}{
cluster.Name,
cluster.ExternalPort,
cluster.URLKubeApi,
cluster.TlsCheck,
cluster.KubePort,
generateNodeData(cluster.Nodes),
},
}
table.Rows = append(table.Rows, row)
}
return *table
}

func printTable(opts printers.PrintOptions, table metav1.Table) {
logger := helpers.CmdLogger
out := bytes.NewBuffer([]byte{})
printer := printers.NewTablePrinter(opts)
err := printer.PrintObj(&table, out)
if err != nil {
logger.Error(err, "failed to print the table.")
return
}
fmt.Println(out.String())
}

func generateNodeData(nodes []Node) string {
var result string
for i, aNode := range nodes {
result += aNode.Name
if i < len(nodes)-1 {
result += ","
}
}
return result
}

func printAllocatedResources(ctx context.Context, k8sClient client.Client, nodeName string) (Allocated, error) {
func printAllocatedResources(ctx context.Context, k8sClient client.Client, nodeName string) (entity.Allocated, error) {
// List all pods on the specified node
var podList corev1.PodList
if err := k8sClient.List(ctx, &podList, client.MatchingFields{"spec.nodeName": nodeName}); err != nil {
return Allocated{}, fmt.Errorf("failed to list pods on node %s.", nodeName)
return entity.Allocated{}, fmt.Errorf("failed to list pods on node %s.", nodeName)
}

// Initialize counters for CPU and memory requests
Expand All @@ -278,7 +204,7 @@ func printAllocatedResources(ctx context.Context, k8sClient client.Client, nodeN
}
}

allocated := Allocated{
allocated := entity.Allocated{
Memory: totalMemory.String(),
Cpu: totalCPU.String(),
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/get/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func init() {
GetCmd.AddCommand(ClustersCmd)
GetCmd.AddCommand(SecretsCmd)
GetCmd.PersistentFlags().StringSliceVarP(&packages, "packages", "p", []string{}, "names of packages.")
GetCmd.PersistentFlags().StringVarP(&outputFormat, "output", "o", "", "Output format. json or yaml.")
GetCmd.PersistentFlags().StringVarP(&outputFormat, "output", "o", "table", "Output format: table (default if not specified), json or yaml.")
GetCmd.PersistentFlags().StringVarP(&helpers.KubeConfigPath, "kubeconfig", "", "", "kube config file Path.")
}

Expand Down
Loading
Loading