From 4fad54e6fbc6f7193f83dee023344797f40c9183 Mon Sep 17 00:00:00 2001 From: Ishan Tyagi Date: Wed, 3 Jan 2024 14:34:15 +0530 Subject: [PATCH 1/3] Move feature:etcd-wrapper from alpha to beta feature. --- docs/deployment/feature-gates.md | 2 +- pkg/features/features.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/deployment/feature-gates.md b/docs/deployment/feature-gates.md index 92c31986c..aa56e9780 100644 --- a/docs/deployment/feature-gates.md +++ b/docs/deployment/feature-gates.md @@ -22,7 +22,7 @@ The following tables are a summary of the feature gates that you can set on etcd | Feature | Default | Stage | Since | Until | |------------------|---------|---------|--------|-------| -| `UseEtcdWrapper` | `false` | `Alpha` | `0.19` | | +| `UseEtcdWrapper` | `true` | `Beta` | `0.22` | | ## Feature Gates for Graduated or Deprecated Features diff --git a/pkg/features/features.go b/pkg/features/features.go index a7941de36..30a96cb76 100644 --- a/pkg/features/features.go +++ b/pkg/features/features.go @@ -31,11 +31,12 @@ const ( // changes required for the usage of the etcd-wrapper image. // owner @unmarshall @aaronfern // alpha: v0.19 + // beta: v0.22 UseEtcdWrapper featuregate.Feature = "UseEtcdWrapper" ) var defaultFeatures = map[featuregate.Feature]featuregate.FeatureSpec{ - UseEtcdWrapper: {Default: false, PreRelease: featuregate.Alpha}, + UseEtcdWrapper: {Default: true, PreRelease: featuregate.Beta}, } // GetDefaultFeatures returns the default feature gates known to etcd-druid. From 3ccb5218e841d730a652764406fa8ab0a17a6548 Mon Sep 17 00:00:00 2001 From: Ishan Tyagi Date: Thu, 4 Jan 2024 13:22:18 +0530 Subject: [PATCH 2/3] Address review comments. --- docs/deployment/feature-gates.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/deployment/feature-gates.md b/docs/deployment/feature-gates.md index aa56e9780..46e80a0ba 100644 --- a/docs/deployment/feature-gates.md +++ b/docs/deployment/feature-gates.md @@ -22,6 +22,7 @@ The following tables are a summary of the feature gates that you can set on etcd | Feature | Default | Stage | Since | Until | |------------------|---------|---------|--------|-------| +| `UseEtcdWrapper` | `false` | `Alpha` | `0.19` | `0.21`| | `UseEtcdWrapper` | `true` | `Beta` | `0.22` | | ## Feature Gates for Graduated or Deprecated Features From 988f08087171e9423f43c7f6363ea7f71beaffd4 Mon Sep 17 00:00:00 2001 From: Ishan Tyagi Date: Thu, 4 Jan 2024 17:08:28 +0530 Subject: [PATCH 3/3] Adjusted the skafold activation profile with use-feature-gates to do-not-use-feature-gates. --- skaffold.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skaffold.yaml b/skaffold.yaml index 8017b46ef..42c33ba01 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -27,14 +27,14 @@ deploy: eventsThreshold: 15 metricsScrapeWaitDuration: "30s" profiles: -- name: use-feature-gates +- name: do-not-use-feature-gates activation: - - env: "USE_ETCD_DRUID_FEATURE_GATES=true" + - env: "USE_ETCD_DRUID_FEATURE_GATES=false" patches: - op: add path: /deploy/helm/releases/0/setValues/featureGates value: - UseEtcdWrapper: true + UseEtcdWrapper: false --- apiVersion: skaffold/v2beta25 kind: Config