Skip to content

Commit c776493

Browse files
committed
Fix klusterlet-info command and update hub-info output.
Signed-off-by: Rokibul Hasan <[email protected]>
1 parent 6d53922 commit c776493

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

pkg/cmd/get/hubinfo/exec.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ const (
5959

6060
componentNameRegistrationController = "cluster-manager-registration-controller"
6161
componentNameRegistrationWebhook = "cluster-manager-registration-webhook"
62+
componentNameWorkController = "cluster-manager-work-controller"
6263
componentNameWorkWebhook = "cluster-manager-work-webhook"
6364
componentNamePlacementController = "cluster-manager-placement-controller"
6465
)
@@ -141,6 +142,11 @@ func (o *Options) printRegistration(cmgr *v1.ClusterManager) error {
141142

142143
func (o *Options) printWork(cmgr *v1.ClusterManager) error {
143144
o.printer.Write(printer.LEVEL_1, "Work:\n")
145+
err := printer.PrintComponentsDeploy(o.printer, o.kubeClient, cmgr.Status.RelatedResources, componentNameWorkController)
146+
if err != nil {
147+
return err
148+
}
149+
144150
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, cmgr.Status.RelatedResources, componentNameWorkWebhook)
145151
}
146152

pkg/cmd/get/klusterletinfo/exec.go

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ const (
5757
registrationOperatorNamespace = "open-cluster-management"
5858
klusterletCRD = "klusterlets.operator.open-cluster-management.io"
5959

60-
componentNameRegistrationAgent = "klusterlet-registration-agent"
61-
componentNameWorkAgent = "klusterlet-work-agent"
60+
componentNameKlusterletAgent = "klusterlet-agent"
6261
)
6362

6463
func (o *Options) run() error {
@@ -139,10 +138,7 @@ func (o *Options) printComponents(klet *v1.Klusterlet) error {
139138

140139
o.printer.Write(printer.LEVEL_0, "Components:\n")
141140

142-
if err := o.printRegistration(klet); err != nil {
143-
return err
144-
}
145-
if err := o.printWork(klet); err != nil {
141+
if err := o.printAgent(klet); err != nil {
146142
return err
147143
}
148144
if err := o.printComponentsCRD(klet); err != nil {
@@ -151,14 +147,9 @@ func (o *Options) printComponents(klet *v1.Klusterlet) error {
151147
return nil
152148
}
153149

154-
func (o *Options) printRegistration(klet *v1.Klusterlet) error {
155-
o.printer.Write(printer.LEVEL_1, "Registration:\n")
156-
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, klet.Status.RelatedResources, componentNameRegistrationAgent)
157-
}
158-
159-
func (o *Options) printWork(klet *v1.Klusterlet) error {
160-
o.printer.Write(printer.LEVEL_1, "Work:\n")
161-
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, klet.Status.RelatedResources, componentNameWorkAgent)
150+
func (o *Options) printAgent(klet *v1.Klusterlet) error {
151+
o.printer.Write(printer.LEVEL_1, "Controller:\n")
152+
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, klet.Status.RelatedResources, componentNameKlusterletAgent)
162153
}
163154

164155
func (o *Options) printComponentsCRD(klet *v1.Klusterlet) error {

0 commit comments

Comments
 (0)