fix: lazy featuregate init in callers

Author: ericsnv

cmd/webhook/main_test.go

@@ -413,11 +413,11 @@ func TestResourceClaimValidatingWebhook(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			err := featuregates.FeatureGates.SetEmulationVersion(utilversion.MajorMinor(999, 999))
+			err := featuregates.GetFeatureGates().SetEmulationVersion(utilversion.MajorMinor(999, 999))
 			require.NoError(t, err)
 
 			if test.featureGates != nil {
-				err := featuregates.FeatureGates.SetFromMap(test.featureGates)
+				err := featuregates.GetFeatureGates().SetFromMap(test.featureGates)
 				require.NoError(t, err)
 			}
 

pkg/featuregates/featuregates.go

@@ -18,6 +18,7 @@ package featuregates
 
 import (
 	"strings"
+	"sync"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/version"
@@ -38,10 +39,6 @@ const (
 	IMEXDaemonsWithDNSNames featuregate.Feature = "IMEXDaemonsWithDNSNames"
 )
 
-// FeatureGates is a singleton representing the set of all feature gates and their values.
-// It contains both project-specific feature gates and standard Kubernetes logging feature gates.
-var FeatureGates featuregate.MutableVersionedFeatureGate
-
 // defaultFeatureGates contains the default settings for all project-specific feature gates.
 // These will be registered with the standard Kubernetes feature gate system.
 var defaultFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
@@ -68,9 +65,19 @@ var defaultFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
 	},
 }
 
-// init instantiates and sets the singleton 'FeatureGates' variable with newFeatureGates().
-func init() {
-	FeatureGates = newFeatureGates(parseProjectVersion())
+var (
+	featureGatesOnce sync.Once
+	featureGates     featuregate.MutableVersionedFeatureGate
+)
+
+// GetFeatureGates instantiates and returns the package-level singleton representing
+// the set of all feature gates and their values.
+// It contains both project-specific feature gates and standard Kubernetes logging feature gates.
+func GetFeatureGates() featuregate.MutableVersionedFeatureGate {
+	featureGatesOnce.Do(func() {
+		featureGates = newFeatureGates(parseProjectVersion())
+	})
+	return featureGates
 }
 
 // parseProjectVersion parses the project version string and returns major.minor version.
@@ -106,21 +113,21 @@ func newFeatureGates(version *version.Version) featuregate.MutableVersionedFeatu
 // Enabled returns true if the specified feature gate is enabled in the global FeatureGates singleton.
 // This is a convenience function that uses the global feature gate registry.
 func Enabled(feature featuregate.Feature) bool {
-	return FeatureGates.Enabled(feature)
+	return GetFeatureGates().Enabled(feature)
 }
 
 // KnownFeatures returns a list of known feature gates with their descriptions.
 func KnownFeatures() []string {
-	return FeatureGates.KnownFeatures()
+	return GetFeatureGates().KnownFeatures()
 }
 
 // ToMap returns all known feature gates as a map[string]bool suitable for
 // template rendering (e.g., {"FeatureA": true, "FeatureB": false}).
 // Returns an empty map if no feature gates are configured.
 func ToMap() map[string]bool {
 	result := make(map[string]bool)
-	for feature := range FeatureGates.GetAll() {
-		result[string(feature)] = FeatureGates.Enabled(feature)
+	for feature := range GetFeatureGates().GetAll() {
+		result[string(feature)] = GetFeatureGates().Enabled(feature)
 	}
 	return result
 }

pkg/flags/featuregates.go

@@ -43,7 +43,7 @@ func (f *FeatureGateConfig) Flags() []cli.Flag {
 		Name: "feature-gates",
 		Usage: "A set of key=value pairs that describe feature gates for alpha/experimental features. " +
 			"Options are:\n     " + strings.Join(featuregates.KnownFeatures(), "\n     "),
-		Value: featuregates.FeatureGates.(pflag.Value), //nolint:forcetypeassert // No need for type check: FeatureGates is a *featuregate.featureGate, which implements pflag.Value.
+		Value: featuregates.GetFeatureGates().(pflag.Value), //nolint:forcetypeassert // No need for type check: FeatureGates is a *featuregate.featureGate, which implements pflag.Value.
 	})
 
 	var flags []cli.Flag

pkg/flags/featuregates_test.go

@@ -44,7 +44,7 @@ var (
 
 func TestFeatureGateConfigBasicFunctionality(t *testing.T) {
 	// Test that the config provides basic feature gate functionality
-	fg := featuregates.FeatureGates
+	fg := featuregates.GetFeatureGates()
 
 	// Test that the feature gate is functional
 	require.NotNil(t, fg, "FeatureGate should not be nil")
@@ -93,7 +93,7 @@ func TestFeatureGateConfigSeparationOfConcerns(t *testing.T) {
 func TestFeatureGateConfigSetFromMap(t *testing.T) {
 	t.Run("EnableDisabledFeature", func(t *testing.T) {
 		// Test that we can enable a disabled feature
-		fg := featuregates.FeatureGates
+		fg := featuregates.GetFeatureGates()
 
 		// Test enabling a disabled feature - we know AllAlpha starts as false
 		require.False(t, featuregates.Enabled(testValidDisabledFeature), "AllAlpha feature should start as false")
@@ -116,7 +116,7 @@ func TestFeatureGateConfigSetFromMap(t *testing.T) {
 
 	t.Run("DisableEnabledFeature", func(t *testing.T) {
 		// Test that we can disable an enabled feature
-		fg := featuregates.FeatureGates
+		fg := featuregates.GetFeatureGates()
 
 		// First enable AllBeta so we can test disabling it
 		err := fg.SetFromMap(map[string]bool{
@@ -145,7 +145,7 @@ func TestFeatureGateConfigSetFromMap(t *testing.T) {
 }
 
 func TestFeatureGateConfigKnownFeatures(t *testing.T) {
-	fg := featuregates.FeatureGates
+	fg := featuregates.GetFeatureGates()
 
 	knownFeatures := fg.KnownFeatures()
 	require.NotEmpty(t, knownFeatures, "Should have some known features")
@@ -163,7 +163,7 @@ func TestFeatureGateConfigKnownFeatures(t *testing.T) {
 }
 
 func TestFeatureGateConfigErrorHandling(t *testing.T) {
-	fg := featuregates.FeatureGates
+	fg := featuregates.GetFeatureGates()
 
 	// Test error handling with invalid features
 	err := fg.SetFromMap(map[string]bool{

pkg/flags/logging.go

@@ -43,7 +43,7 @@ func NewLoggingConfig() *LoggingConfig {
 // line flags and before running any code which emits log entries.
 // It uses the global feature gate singleton.
 func (l *LoggingConfig) Apply() error {
-	return logsapi.ValidateAndApply(l.config, featuregates.FeatureGates)
+	return logsapi.ValidateAndApply(l.config, featuregates.GetFeatureGates())
 }
 
 // Flags returns the flags for logging configuration (NOT including feature gates).