Skip to content

Commit 750e384

Browse files
committed
Print addon-manager info
Signed-off-by: Rokibul Hasan <[email protected]>
1 parent d3cd9ba commit 750e384

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

pkg/cmd/get/hubinfo/exec.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ package hubinfo
44
import (
55
"context"
66
"fmt"
7+
"open-cluster-management.io/api/feature"
8+
"open-cluster-management.io/clusteradm/pkg/helpers/check"
79

810
"github.com/spf13/cobra"
911
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
@@ -62,6 +64,7 @@ const (
6264
componentNameWorkController = "cluster-manager-work-controller"
6365
componentNameWorkWebhook = "cluster-manager-work-webhook"
6466
componentNamePlacementController = "cluster-manager-placement-controller"
67+
componentNameAddOnManagerController = "cluster-manager-addon-manager-controller"
6568
)
6669

6770
func (o *Options) run() error {
@@ -115,6 +118,11 @@ func (o *Options) printComponents() error {
115118
}
116119

117120
o.printer.Write(printer.LEVEL_0, "Components:\n")
121+
if check.IsFeatureEnabled(cmgr.Spec.AddOnManagerConfiguration.FeatureGates, string(feature.AddonManagement)) {
122+
if err := o.printAddOnManager(cmgr); err != nil {
123+
return err
124+
}
125+
}
118126
if err := o.printRegistration(cmgr); err != nil {
119127
return err
120128
}
@@ -142,11 +150,12 @@ func (o *Options) printRegistration(cmgr *v1.ClusterManager) error {
142150

143151
func (o *Options) printWork(cmgr *v1.ClusterManager) error {
144152
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
153+
if check.IsFeatureEnabled(cmgr.Spec.WorkConfiguration.FeatureGates, string(feature.ManifestWorkReplicaSet)) {
154+
err := printer.PrintComponentsDeploy(o.printer, o.kubeClient, cmgr.Status.RelatedResources, componentNameWorkController)
155+
if err != nil {
156+
return err
157+
}
148158
}
149-
150159
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, cmgr.Status.RelatedResources, componentNameWorkWebhook)
151160
}
152161

@@ -155,6 +164,11 @@ func (o *Options) printPlacement(cmgr *v1.ClusterManager) error {
155164
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, cmgr.Status.RelatedResources, componentNamePlacementController)
156165
}
157166

167+
func (o *Options) printAddOnManager(cmgr *v1.ClusterManager) error {
168+
o.printer.Write(printer.LEVEL_1, "AddOn Manager:\n")
169+
return printer.PrintComponentsDeploy(o.printer, o.kubeClient, cmgr.Status.RelatedResources, componentNameAddOnManagerController)
170+
}
171+
158172
func (o *Options) printComponentsCRD(cmgr *v1.ClusterManager) error {
159173
o.printer.Write(printer.LEVEL_1, "CustomResourceDefinition:\n")
160174
return printer.PrintComponentsCRD(o.printer, o.crdClient, cmgr.Status.RelatedResources)

pkg/helpers/check/check.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package check
33

44
import (
55
"fmt"
6-
76
"k8s.io/apimachinery/pkg/api/errors"
87
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
98
clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned"
@@ -79,3 +78,12 @@ func findResource(list *metav1.APIResourceList, resourceName string) bool {
7978
}
8079
return false
8180
}
81+
82+
func IsFeatureEnabled(featureGates []operatorv1.FeatureGate, feature string) bool {
83+
for _, fg := range featureGates {
84+
if fg.Feature == feature {
85+
return true
86+
}
87+
}
88+
return false
89+
}

0 commit comments

Comments
 (0)