Introduced feature gate for etcd druid and added 'UseEtcdWrapper' fea…

…ture gate

charts/images.yaml

@@ -4,8 +4,8 @@ images:
     name: 'etcdbrctl'
   sourceRepository: github.com/gardener/etcd-backup-restore
   repository: eu.gcr.io/gardener-project/gardener/etcdbrctl
-  tag: "v0.25.0"
+  tag: "v0.24.2"
 - name: etcd
-  sourceRepository: github.com/gardener/etcd-wrapper
-  repository: eu.gcr.io/gardener-project/gardener/etcd-wrapper
-  tag: "v0.1.0"
+  sourceRepository: github.com/gardener/etcd-custom-image
+  repository: aaronfernandes/etcd-custom
+  tag: "bootstrap-entrypoint-1"

controllers/compaction/config.go

@@ -15,12 +15,19 @@
 package compaction
 
 import (
-	"flag"
 	"time"
 
 	"github.com/gardener/etcd-druid/controllers/utils"
+	"github.com/gardener/etcd-druid/pkg/features"
+	flag "github.com/spf13/pflag"
+	"k8s.io/component-base/featuregate"
 )
 
+// relevantFeatures holds the feature flag names that are relevant for the Compaction Controller.
+var relevantFeatures = []featuregate.Feature{
+	features.UseEtcdWrapper,
+}
+
 const (
 	enableBackupCompactionFlagName = "enable-backup-compaction"
 	workersFlagName                = "compaction-workers"
@@ -43,6 +50,8 @@ type Config struct {
 	EventsThreshold int64
 	// ActiveDeadlineDuration is the duration after which a running compaction job will be killed.
 	ActiveDeadlineDuration time.Duration
+	// FeatureGates contains the feature flags to be used by Compaction Controller.
+	FeatureGates map[string]bool
 }
 
 // InitFromFlags initializes the compaction controller config from the provided CLI flag set.
@@ -70,3 +79,8 @@ func (cfg *Config) Validate() error {
 	}
 	return nil
 }
+
+// GetRelevantFeatures returns feature gates relevant to the Compaction controller
+func (cfg *Config) GetRelevantFeatures() []featuregate.Feature {
+	return relevantFeatures
+}

controllers/compaction/reconciler.go

@@ -22,6 +22,7 @@ import (
 
 	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
 	ctrlutils "github.com/gardener/etcd-druid/controllers/utils"
+	"github.com/gardener/etcd-druid/pkg/features"
 	druidmetrics "github.com/gardener/etcd-druid/pkg/metrics"
 	"github.com/gardener/etcd-druid/pkg/utils"
 	"github.com/gardener/gardener/pkg/utils/imagevector"
@@ -56,7 +57,7 @@ type Reconciler struct {
 
 // NewReconciler creates a new reconciler for Compaction
 func NewReconciler(mgr manager.Manager, config *Config) (*Reconciler, error) {
-	imageVector, err := ctrlutils.CreateImageVector()
+	imageVector, err := ctrlutils.CreateImageVector(config.FeatureGates[string(features.UseEtcdWrapper)])
 	if err != nil {
 		return nil, err
 	}

controllers/config.go

@@ -15,8 +15,10 @@
 package controllers
 
 import (
-	"flag"
+	"fmt"
+
 	"github.com/gardener/etcd-druid/pkg/features"
+	flag "github.com/spf13/pflag"
 	"k8s.io/component-base/featuregate"
 
 	"github.com/gardener/etcd-druid/controllers/compaction"
@@ -63,8 +65,8 @@ type ManagerConfig struct {
 	DisableLeaseCache bool
 	// IgnoreOperationAnnotation specifies whether to ignore or honour the operation annotation on resources to be reconciled.
 	IgnoreOperationAnnotation bool
-	// FeatureFlags contains the feature flags to be used by etcd-druid.
-	FeatureFlags map[string]bool
+	// FeatureFlags contains the feature gates to be used by etcd-druid.
+	FeatureFlags featuregate.MutableFeatureGate
 	// EtcdControllerConfig is the configuration required for etcd controller.
 	EtcdControllerConfig *etcd.Config
 	// CustodianControllerConfig is the configuration required for custodian controller.
@@ -78,7 +80,7 @@ type ManagerConfig struct {
 }
 
 // InitFromFlags initializes the controller manager config from the provided CLI flag set.
-func InitFromFlags(fs *flag.FlagSet, cfg *ManagerConfig) {
+func InitFromFlags(fs *flag.FlagSet, cfg *ManagerConfig) error {
 	flag.StringVar(&cfg.MetricsAddr, metricsAddrFlagName, defaultMetricsAddr, ""+
 		"The address the metric endpoint binds to.")
 	flag.BoolVar(&cfg.EnableLeaderElection, enableLeaderElectionFlagName, defaultEnableLeaderElection,
@@ -92,8 +94,9 @@ func InitFromFlags(fs *flag.FlagSet, cfg *ManagerConfig) {
 	flag.BoolVar(&cfg.IgnoreOperationAnnotation, ignoreOperationAnnotationFlagName, defaultIgnoreOperationAnnotation,
 		"Specifies whether to ignore or honour the operation annotation on resources to be reconciled.")
 
-	cfg.FeatureFlags = features.GetDefaultFeatureFlags()
-	InitFeatureFlags(fs, cfg.FeatureFlags)
+	if err := InitFeatureGates(fs, &cfg.FeatureFlags); err != nil {
+		return err
+	}
 
 	cfg.EtcdControllerConfig = &etcd.Config{}
 	etcd.InitFromFlags(fs, cfg.EtcdControllerConfig)
@@ -109,19 +112,53 @@ func InitFromFlags(fs *flag.FlagSet, cfg *ManagerConfig) {
 
 	cfg.SecretControllerConfig = &secret.Config{}
 	secret.InitFromFlags(fs, cfg.SecretControllerConfig)
+
+	return nil
 }
 
-// InitFeatureFlags initializes the features flags from the provided CLI flag set.
-// TODO: passing by value and not by reference, will this work?
-func InitFeatureFlags(fs *flag.FlagSet, featureFlags map[string]bool) {
-	for feature, value := range featureFlags {
-		fs.BoolVar(&value, feature, value, features.FeatureDescriptions[featuregate.Feature(feature)])
+// InitFeatureGates initializes feature gates from the provided CLI flag set.
+func InitFeatureGates(fs *flag.FlagSet, featureFlags *featuregate.MutableFeatureGate) error {
+	*featureFlags = featuregate.NewFeatureGate()
+	if err := (*featureFlags).Add(features.GetDefaultFeatures()); err != nil {
+		return fmt.Errorf("error adding features to the featuregate: %v", err)
 	}
+	(*featureFlags).AddFlag(fs)
+
+	return nil
 }
 
-// PopulateControllerFeatureFlags
-// TODO: opt1
-func PopulateControllerFeatureFlags() {
+// PopulateControllerFeatureFlags adds relevant feature gates to every controller configuration
+func PopulateControllerFeatureGates(config *ManagerConfig) {
+
+	// Add etcd controller feature flags
+	config.EtcdControllerConfig.FeatureGates = make(map[string]bool)
+	for _, feature := range config.EtcdControllerConfig.GetRelevantFeatures() {
+		config.EtcdControllerConfig.FeatureGates[string(feature)] = config.FeatureFlags.Enabled(feature)
+	}
+
+	// Add custodian controller feature flags
+	config.CustodianControllerConfig.FeatureGates = make(map[string]bool)
+	for _, feature := range config.CustodianControllerConfig.GetRelevantFeatures() {
+		config.CustodianControllerConfig.FeatureGates[string(feature)] = config.FeatureFlags.Enabled(feature)
+	}
+
+	// Add compaction controller feature flags
+	config.CompactionControllerConfig.FeatureGates = make(map[string]bool)
+	for _, feature := range config.CompactionControllerConfig.GetRelevantFeatures() {
+		config.CompactionControllerConfig.FeatureGates[string(feature)] = config.FeatureFlags.Enabled(feature)
+	}
+
+	// Add etcdcopybackuptask controller feature flags
+	config.EtcdCopyBackupsTaskControllerConfig.FeatureGates = make(map[string]bool)
+	for _, feature := range config.EtcdCopyBackupsTaskControllerConfig.GetRelevantFeatures() {
+		config.EtcdCopyBackupsTaskControllerConfig.FeatureGates[string(feature)] = config.FeatureFlags.Enabled(feature)
+	}
+
+	// Add secret controller feature flags
+	config.SecretControllerConfig.FeatureGates = make(map[string]bool)
+	for _, feature := range config.SecretControllerConfig.GetRelevantFeatures() {
+		config.SecretControllerConfig.FeatureGates[string(feature)] = config.FeatureFlags.Enabled(feature)
+	}
 
 }
 

controllers/custodian/config.go

@@ -15,12 +15,16 @@
 package custodian
 
 import (
-	"flag"
 	"time"
 
 	"github.com/gardener/etcd-druid/controllers/utils"
+	flag "github.com/spf13/pflag"
+	"k8s.io/component-base/featuregate"
 )
 
+// relevantFeatures holds the feature flag names that are relevant for the Custodian Controller.
+var relevantFeatures = []featuregate.Feature{}
+
 const (
 	workersFlagName                     = "custodian-workers"
 	syncPeriodFlagName                  = "custodian-sync-period"
@@ -41,6 +45,8 @@ type Config struct {
 	SyncPeriod time.Duration
 	// EtcdMember holds configuration related to etcd members.
 	EtcdMember EtcdMemberConfig
+	// FeatureGates contains the feature flags to be used by Custodian Controller.
+	FeatureGates map[string]bool
 }
 
 // EtcdMemberConfig holds configuration related to etcd members.
@@ -79,3 +85,8 @@ func (cfg *Config) Validate() error {
 	}
 	return nil
 }
+
+// GetRelevantFeatures returns feature gates relevant to the Custodian controller
+func (cfg *Config) GetRelevantFeatures() []featuregate.Feature {
+	return relevantFeatures
+}

controllers/etcd/config.go

@@ -15,7 +15,8 @@
 package etcd
 
 import (
-	"flag"
+	flag "github.com/spf13/pflag"
+	"k8s.io/component-base/featuregate"
 
 	"github.com/gardener/etcd-druid/controllers/utils"
 	"github.com/gardener/etcd-druid/pkg/features"
@@ -29,11 +30,9 @@ const (
 	defaultDisableEtcdServiceAccountAutomount = false
 )
 
-// RelevantFeatures holds the feature flag names that are relevant for the Etcd Controller.
-// TODO: come up with better name for this variable
-// TODO: write getter method on Config struct for this var
-var RelevantFeatures = []string{
-	string(features.UseEtcdWrapper),
+// relevantFeatures holds the feature flag names that are relevant for the Etcd Controller.
+var relevantFeatures = []featuregate.Feature{
+	features.UseEtcdWrapper,
 }
 
 // Config defines the configuration for the Etcd Controller.
@@ -42,9 +41,8 @@ type Config struct {
 	Workers int
 	// DisableEtcdServiceAccountAutomount controls the auto-mounting of service account token for etcd statefulsets.
 	DisableEtcdServiceAccountAutomount bool
-	// FeatureFlags contains the feature flags to be used by Etcd Controller.
-	// TODO: set this from managerConfig (filtered using RelevantFeatures) before running the reconciler
-	FeatureFlags map[string]bool
+	// FeatureGates contains the feature flags to be used by Etcd Controller.
+	FeatureGates map[string]bool
 }
 
 // InitFromFlags initializes the config from the provided CLI flag set.
@@ -62,3 +60,8 @@ func (cfg *Config) Validate() error {
 	}
 	return nil
 }
+
+// GetRelevantFeatures returns feature gates relevant to the Etcd controller
+func (cfg *Config) GetRelevantFeatures() []featuregate.Feature {
+	return relevantFeatures
+}

controllers/etcd/reconciler.go

@@ -30,6 +30,7 @@ import (
 	componentservice "github.com/gardener/etcd-druid/pkg/component/etcd/service"
 	componentserviceaccount "github.com/gardener/etcd-druid/pkg/component/etcd/serviceaccount"
 	componentsts "github.com/gardener/etcd-druid/pkg/component/etcd/statefulset"
+	"github.com/gardener/etcd-druid/pkg/features"
 	druidutils "github.com/gardener/etcd-druid/pkg/utils"
 
 	v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
@@ -76,7 +77,7 @@ type Reconciler struct {
 
 // NewReconciler creates a new reconciler for Etcd.
 func NewReconciler(mgr manager.Manager, config *Config) (*Reconciler, error) {
-	imageVector, err := utils.CreateImageVector()
+	imageVector, err := utils.CreateImageVector(config.FeatureGates[string(features.UseEtcdWrapper)])
 	if err != nil {
 		return nil, err
 	}
@@ -367,15 +368,18 @@ func (r *Reconciler) reconcileEtcd(ctx context.Context, logger logr.Logger, etcd
 	}
 
 	peerUrlTLSChangedToEnabled := isPeerTLSChangedToEnabled(peerTLSEnabled, configMapValues)
-	statefulSetValues := componentsts.GenerateValues(etcd,
+	statefulSetValues := componentsts.GenerateValues(
+		etcd,
 		&serviceValues.ClientPort,
 		&serviceValues.PeerPort,
 		&serviceValues.BackupPort,
 		*etcdImage,
 		*etcdBackupImage,
 		map[string]string{
 			"checksum/etcd-configmap": configMapValues.ConfigMapChecksum,
-		}, peerUrlTLSChangedToEnabled)
+		}, peerUrlTLSChangedToEnabled,
+		r.config.FeatureGates[string(features.UseEtcdWrapper)],
+	)
 
 	// Create an OpWaiter because after the deployment we want to wait until the StatefulSet is ready.
 	var (

controllers/etcdcopybackupstask/config.go

@@ -15,11 +15,17 @@
 package etcdcopybackupstask
 
 import (
-	"flag"
-
 	"github.com/gardener/etcd-druid/controllers/utils"
+	"github.com/gardener/etcd-druid/pkg/features"
+	flag "github.com/spf13/pflag"
+	"k8s.io/component-base/featuregate"
 )
 
+// relevantFeatures holds the feature flag names that are relevant for the EtcdCopyBackupTask Controller.
+var relevantFeatures = []featuregate.Feature{
+	features.UseEtcdWrapper,
+}
+
 const (
 	workersFlagName = "etcd-copy-backups-task-workers"
 
@@ -30,6 +36,8 @@ const (
 type Config struct {
 	// Workers is the number of workers concurrently processing reconciliation requests.
 	Workers int
+	// FeatureGates contains the feature flags to be used by EtcdCopyBackupTask Controller.
+	FeatureGates map[string]bool
 }
 
 // InitFromFlags initializes the config from the provided CLI flag set.
@@ -45,3 +53,8 @@ func (cfg *Config) Validate() error {
 	}
 	return nil
 }
+
+// GetRelevantFeatures returns feature gates relevant to the EtcdCopyBackupTask controller
+func (cfg *Config) GetRelevantFeatures() []featuregate.Feature {
+	return relevantFeatures
+}

controllers/etcdcopybackupstask/reconciler.go

@@ -23,6 +23,7 @@ import (
 	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
 	"github.com/gardener/etcd-druid/controllers/utils"
 	"github.com/gardener/etcd-druid/pkg/common"
+	"github.com/gardener/etcd-druid/pkg/features"
 	druidutils "github.com/gardener/etcd-druid/pkg/utils"
 	v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
 	"github.com/gardener/gardener/pkg/controllerutils"
@@ -60,7 +61,7 @@ type Reconciler struct {
 
 // NewReconciler creates a new reconciler for EtcdCopyBackupsTask.
 func NewReconciler(mgr manager.Manager, config *Config) (*Reconciler, error) {
-	imageVector, err := utils.CreateImageVector()
+	imageVector, err := utils.CreateImageVector(config.FeatureGates[string(features.UseEtcdWrapper)])
 	if err != nil {
 		return nil, err
 	}

controllers/manager.go

@@ -45,6 +45,8 @@ func CreateManagerWithControllers(config *ManagerConfig) (ctrl.Manager, error) {
 		mgr ctrl.Manager
 	)
 
+	PopulateControllerFeatureGates(config)
+
 	if mgr, err = createManager(config); err != nil {
 		return nil, err
 	}