Merge pull request #660 from typeid/OSD-25864

Feat(OSD-25864): add osdctl hcp must-gather
openshift · Feb 13, 2025 · 9bef5e7 · 9bef5e7
2 parents 2b93fdf + 3e004cd
commit 9bef5e7
Show file tree

Hide file tree

Showing 11 changed files with 1,136 additions and 773 deletions.
diff --git a/cmd/cluster/cleanup_leaked_ec2.go b/cmd/cluster/cleanup_leaked_ec2.go
diff --git a/cmd/cluster/cleanup_leaked_ec2_test.go b/cmd/cluster/cleanup_leaked_ec2_test.go
diff --git a/cmd/cluster/cmd.go b/cmd/cluster/cmd.go
@@ -40,7 +40,6 @@ func NewCmdCluster(streams genericclioptions.IOStreams, client *k8s.LazyClient,
 	clusterCmd.AddCommand(newCmdFromInfraId(globalOpts))
 	clusterCmd.AddCommand(NewCmdHypershiftInfo(streams))
 	clusterCmd.AddCommand(newCmdOrgId())
-	clusterCmd.AddCommand(newCmdCleanupLeakedEC2())
 	clusterCmd.AddCommand(newCmdDetachStuckVolume())
 	clusterCmd.AddCommand(ssh.NewCmdSSH())
 	clusterCmd.AddCommand(sre_operators.NewCmdSREOperators(streams, client))

diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -26,6 +26,7 @@ import (
 	"github.com/openshift/osdctl/cmd/cost"
 	"github.com/openshift/osdctl/cmd/dynatrace"
 	"github.com/openshift/osdctl/cmd/env"
+	"github.com/openshift/osdctl/cmd/hcp"
 	"github.com/openshift/osdctl/cmd/hive"
 	"github.com/openshift/osdctl/cmd/iampermissions"
 	"github.com/openshift/osdctl/cmd/jira"
@@ -97,6 +98,7 @@ func NewCmdRoot(streams genericclioptions.IOStreams) *cobra.Command {
 	rootCmd.AddCommand(jira.Cmd)
 	rootCmd.AddCommand(jumphost.NewCmdJumphost())
 	rootCmd.AddCommand(mc.NewCmdMC())
+	rootCmd.AddCommand(hcp.NewCmdHCP())
 	rootCmd.AddCommand(network.NewCmdNetwork(streams, kubeClient))
 	rootCmd.AddCommand(org.NewCmdOrg())
 	rootCmd.AddCommand(promote.NewCmdPromote())