feat: add cluster management commands#413
Draft
davrad wants to merge 8 commits into
Draft
Conversation
tuunit
requested changes
Jun 15, 2026
| func NewClusterCommand() *cli.Command { | ||
| return &cli.Command{ | ||
| Name: "cluster", | ||
| Usage: "Manage clusters for Kubara", |
Contributor
There was a problem hiding this comment.
Suggested change
| Usage: "Manage clusters for Kubara", | |
| Usage: "Manage your kubara cluster configurations", |
Comment on lines
+40
to
+49
| func findHubCluster(clusters []config.Cluster) config.Cluster { | ||
| for _, cluster := range clusters { | ||
| if cluster.Type == "hub" { | ||
| return cluster | ||
| } | ||
| } | ||
| // base case, only necessary for compiler, | ||
| // should not execute in a default environment | ||
| return config.Cluster{} | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| func findHubCluster(clusters []config.Cluster) config.Cluster { | |
| for _, cluster := range clusters { | |
| if cluster.Type == "hub" { | |
| return cluster | |
| } | |
| } | |
| // base case, only necessary for compiler, | |
| // should not execute in a default environment | |
| return config.Cluster{} | |
| } | |
| func findHubCluster(clusters []config.Cluster) *config.Cluster { | |
| for _, cluster := range clusters { | |
| if cluster.Type == "hub" { | |
| return &cluster | |
| } | |
| } | |
| return nil | |
| } |
| currentConfig := configStore.GetConfig() | ||
|
|
||
| clusters := currentConfig.Clusters | ||
| hubCluster := findHubCluster(clusters) |
Contributor
There was a problem hiding this comment.
Suggested change
| hubCluster := findHubCluster(clusters) | |
| hubCluster := findHubCluster(clusters) | |
| if hubCluster == nil { | |
| return fmt.Errorf("no hub cluster can be found in config") | |
| } |
Contributor
Author
There was a problem hiding this comment.
removed code snippet
| clusters := currentConfig.Clusters | ||
| hubCluster := findHubCluster(clusters) | ||
|
|
||
| //create new cluster and append it |
Contributor
There was a problem hiding this comment.
Suggested change
| //create new cluster and append it | |
| // create new cluster using hub cluster as its dereferenced template |
Contributor
Author
There was a problem hiding this comment.
removed code snippet
| //create new cluster and append it | ||
| newCluster := hubCluster | ||
| newCluster.Name = spokeName | ||
| newCluster.Type = "spoke" |
Contributor
There was a problem hiding this comment.
Please introduce an enum for the cluster type in src/internal/config/types.go and use that
Comment on lines
+29
to
+30
| spokeServices := maps.Clone(newCluster.Services) | ||
| newCluster.Services = disableServicesFor(spokeServices, []string{"homer-dashboard", "argocd"}) |
Contributor
There was a problem hiding this comment.
mhhh i get why you did this but we need to generalize this using the catalog processing logic and instead of cloning the services from the hub we need to use the catalog provided and apply the defaults from the catalog. especially as some of the services can have a filter that they aren't applicable for spoke cluster types
Contributor
Author
There was a problem hiding this comment.
function now applies the catalog to the newly created spoke cluster
Comment on lines
+12
to
+13
| func AddCluster(configFilePath string, spokeName string) error { | ||
|
|
Comment on lines
+12
to
+17
| // Internal Function for the 'kubara cluster ls' command | ||
| // Requires the configFilePath for the ConfigStore | ||
| // Prints out the context in tabular form | ||
| func ListClusters(configFilePath string) error { | ||
|
|
||
| configStore := config.NewConfigStoreWithCatalog(configFilePath, catalog.LoadOptions{}) |
Contributor
There was a problem hiding this comment.
Suggested change
| // Internal Function for the 'kubara cluster ls' command | |
| // Requires the configFilePath for the ConfigStore | |
| // Prints out the context in tabular form | |
| func ListClusters(configFilePath string) error { | |
| configStore := config.NewConfigStoreWithCatalog(configFilePath, catalog.LoadOptions{}) | |
| func ListClusters(configFilePath string) error { | |
| configStore := config.NewConfigStoreWithCatalog(configFilePath, catalog.LoadOptions{}) |
i think this is self explanatory and doesn't need a comment
Contributor
Author
There was a problem hiding this comment.
I don't think, that it is self explanatory. As someone who has not worked with the library before and who was not familiar with the cmd structure of the project a single comment like this helps explain to me, how the project works with this.
However I do agree that three lines are a bit too much and have removed two lines.
tuunit
requested changes
Jun 19, 2026
Comment on lines
+18
to
+19
| Usage: "Create a new spoke cluster for the hub", | ||
| UsageText: "kubara cluster add <cluster-name>", |
Contributor
There was a problem hiding this comment.
Suggested change
| Usage: "Create a new spoke cluster for the hub", | |
| UsageText: "kubara cluster add <cluster-name>", | |
| Usage: "Add a new spoke cluster to your config", | |
| UsageText: "kubara cluster add <cluster-name>", |
Contributor
Author
There was a problem hiding this comment.
Changed description.
| Name: "add", | ||
| Usage: "Create a new spoke cluster for the hub", | ||
| UsageText: "kubara cluster add <cluster-name>", | ||
| Description: "Adds a new spoke cluster to the existing hub cluster", |
Contributor
There was a problem hiding this comment.
Suggested change
| Description: "Adds a new spoke cluster to the existing hub cluster", | |
| Description: "Adds a new spoke cluster to an existing config yaml", |
Contributor
Author
There was a problem hiding this comment.
changed description.
| Name: "cluster", | ||
| Usage: "Manage clusters for Kubara", | ||
| UsageText: "kubara cluster [command]", | ||
| Description: "Enables handling for hub and spoke clusters", |
Contributor
There was a problem hiding this comment.
Suggested change
| Description: "Enables handling for hub and spoke clusters", | |
| Description: "Enables the configuration and quick setup of clusters", |
In order for this to work one needs to place the necessary config secrets in the secret store for argocd to find them
davrad
force-pushed
the
feat/add-cluster-cmd
branch
from
6e8b3d1 to
afa35bb
Compare
davrad
force-pushed
the
feat/add-cluster-cmd
branch
2 times, most recently
from
a5dca95 to
55feed6
Compare
davrad
force-pushed
the
feat/add-cluster-cmd
branch
from
55feed6 to
30188ab
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📝 Summary
Draft:
This MR adds a new command: cluster, to work better with multi cluster setups
In addtion this MR (will fix) fixes some bugs
🧩 Type of change
🧪 Testing
🔗 Related Issues / Tickets
Addresses #346
✅ Checklist
📎 Additional Context (optional)