fix(client): fix new client error if VolumeAttributeClass is not enabled (#6077)

Author: liubog2008

cmd/operator/main.go

@@ -283,7 +283,7 @@ func BuildCacheByObject() map[client.Object]cache.ByObject {
 			Label: labels.Everything(),
 		},
 	}
-	if kubefeat.FeatureGates.Stage(kubefeat.VolumeAttributesClass).Enabled(kubefeat.BETA) {
+	if kubefeat.Stage(kubefeat.VolumeAttributesClass).Enabled(kubefeat.BETA) {
 		byObj[&storagev1beta1.VolumeAttributesClass{}] = cache.ByObject{
 			Label: labels.Everything(),
 		}

pkg/client/client.go

@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/structured-merge-diff/v4/typed"
 
 	"github.com/pingcap/tidb-operator/pkg/scheme"
+	"github.com/pingcap/tidb-operator/pkg/utils/kubefeat"
 	forkedproto "github.com/pingcap/tidb-operator/third_party/kube-openapi/pkg/util/proto"
 )
 
@@ -189,6 +190,8 @@ func gvToAPIPath(gv schema.GroupVersion) string {
 }
 
 func New(cfg *rest.Config, opts client.Options) (Client, error) {
+	kubefeat.MustInitFeatureGates(cfg)
+
 	dc, err := discovery.NewDiscoveryClientForConfig(cfg)
 	if err != nil {
 		return nil, fmt.Errorf("cannot new discovery client: %w", err)
@@ -199,7 +202,7 @@ func New(cfg *rest.Config, opts client.Options) (Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	gvs := scheme.GroupVersions
+	gvs := scheme.GroupVersions()
 
 	parser, err := NewGVKParser(gvs, paths)
 	if err != nil {

pkg/scheme/scheme.go

@@ -25,6 +25,7 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 
 	"github.com/pingcap/tidb-operator/api/v2/core/v1alpha1"
+	"github.com/pingcap/tidb-operator/pkg/utils/kubefeat"
 )
 
 // Scheme is used by client to visit kubernetes API.
@@ -39,9 +40,15 @@ func init() {
 	utilruntime.Must(v1alpha1.Install(Scheme))
 }
 
-var GroupVersions = []schema.GroupVersion{
-	corev1.SchemeGroupVersion,
-	storagev1.SchemeGroupVersion,
-	v1alpha1.SchemeGroupVersion,
-	storagev1beta1.SchemeGroupVersion,
+func GroupVersions() []schema.GroupVersion {
+	gvs := []schema.GroupVersion{
+		corev1.SchemeGroupVersion,
+		storagev1.SchemeGroupVersion,
+		v1alpha1.SchemeGroupVersion,
+	}
+	if kubefeat.Stage(kubefeat.VolumeAttributesClass).Enabled(kubefeat.BETA) {
+		gvs = append(gvs, storagev1beta1.SchemeGroupVersion)
+	}
+
+	return gvs
 }

pkg/utils/kubefeat/gates.go

@@ -25,32 +25,40 @@ import (
 	"k8s.io/client-go/rest"
 )
 
-var FeatureGates Gates
+var defaultFeatureGates Gates
+
+func Stage(key Feature) StagedFeature {
+	if defaultFeatureGates == nil {
+		panic("please init featureGates before use it")
+	}
+
+	return defaultFeatureGates.Stage(key)
+}
 
 type Gates interface {
 	Stage(key Feature) StagedFeature
 }
 
 type StagedFeature interface {
-	Enabled(Stage) bool
+	Enabled(FeatureStage) bool
 }
 
 type featureGates struct {
 	feats map[Feature]spec
 }
 
-type Stage int
+type FeatureStage int
 
 const (
-	INVAILD Stage = 0
+	INVAILD FeatureStage = 0
 
-	ALPHA Stage = 1 << iota
+	ALPHA FeatureStage = 1 << iota
 	BETA
 	STABLE
 	ANY = ALPHA | BETA | STABLE
 )
 
-func stageFromString(s string) Stage {
+func stageFromString(s string) FeatureStage {
 	switch s {
 	case "ALPHA":
 		return ALPHA
@@ -65,10 +73,10 @@ func stageFromString(s string) Stage {
 
 type spec struct {
 	enabled bool
-	stage   Stage
+	stage   FeatureStage
 }
 
-func (s spec) Enabled(stage Stage) bool {
+func (s spec) Enabled(stage FeatureStage) bool {
 	if s.stage&stage == 0 {
 		return false
 	}
@@ -80,6 +88,9 @@ func (g *featureGates) Stage(key Feature) StagedFeature {
 }
 
 func MustInitFeatureGates(cfg *rest.Config) {
+	if defaultFeatureGates != nil {
+		return
+	}
 	gates, err := NewFeatureGates(cfg)
 	if err != nil {
 		// TODO: use a common panic util to panic
@@ -88,7 +99,7 @@ func MustInitFeatureGates(cfg *rest.Config) {
 
 	fmt.Println("init feature gates")
 
-	FeatureGates = gates
+	defaultFeatureGates = gates
 }
 
 func NewFeatureGates(cfg *rest.Config) (Gates, error) {