chore: disable CrossClusterDiscovery feature by default

kubernetes-retired · Oct 12, 2020 · 9d368f9 · 9d368f9
1 parent e3e6e76
commit 9d368f9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ higher-level APIs:
 
 - **Status** collects the status of resources distributed by KubeFed across all federated clusters
 - **Policy** determines which subset of clusters a resource is allowed to be distributed to
-- **Scheduling** refers to a decision-making capability that can decide how 
+- **Scheduling** refers to a decision-making capability that can decide how
   workloads should be spread across different clusters similar to how a human
   operator would
 
@@ -57,7 +57,7 @@ higher-level APIs:
 | [Push propagation of arbitrary types to remote clusters](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/userguide.md#verify-your-deployment-is-working) | Alpha | PushReconciler | true |
 | [CLI utility (`kubefedctl`)](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/userguide.md#kubefedctl-cli) | Alpha | | |
 | [Generate KubeFed APIs without writing code](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/userguide.md#enabling-federation-of-an-api-type) | Alpha | | |
-| [Multicluster Service DNS via `external-dns`](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/servicedns-with-externaldns.md) | Alpha | CrossClusterServiceDiscovery | true |
+| [Multicluster Service DNS via `external-dns`](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/servicedns-with-externaldns.md) | Alpha | CrossClusterServiceDiscovery | false |
 | [Multicluster Ingress DNS via `external-dns`](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/ingressdns-with-externaldns.md) | Alpha | FederatedIngress | true |
 | [Replica Scheduling Preferences](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/userguide.md#replicaschedulingpreference) | Alpha | SchedulerPreferences | true |
 

diff --git a/charts/kubefed/README.md b/charts/kubefed/README.md
@@ -105,7 +105,7 @@ chart and their default values.
 | controllermanager.imagePullPolicy     | Image pull policy.                                                                                                                                                                          | IfNotPresent                    |
 | controllermanager.featureGates.PushReconciler               | Push reconciler feature.                                                                                                                                              | true                            |
 | controllermanager.featureGates.SchedulerPreferences         | Scheduler preferences feature.                                                                                                                                        | true                            |
-| controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature.                                                                                                                              | true                            |
+| controllermanager.featureGates.CrossClusterServiceDiscovery | Cross cluster service discovery feature.                                                                                                                              | false                            |
 | controllermanager.featureGates.FederatedIngress             | Federated ingress feature.                                                                                                                                            | true                            |
 | controllermanager.clusterAvailableDelay   | Time to wait before reconciling on a healthy cluster.                                                                                                                                   | 20s                             |
 | controllermanager.clusterUnavailableDelay | Time to wait before giving up on an unhealthy cluster.                                                                                                                                  | 60s                             |

diff --git a/charts/kubefed/charts/controllermanager/templates/kubefedconfig.yaml b/charts/kubefed/charts/controllermanager/templates/kubefedconfig.yaml
@@ -27,7 +27,7 @@ spec:
   - name: SchedulerPreferences
     configuration: {{ .Values.featureGates.SchedulerPreferences | default "Enabled" | quote }}
   - name: CrossClusterServiceDiscovery
-    configuration: {{ .Values.featureGates.CrossClusterServiceDiscovery | default "Enabled" | quote }}
+    configuration: {{ .Values.featureGates.CrossClusterServiceDiscovery | default "Disabled" | quote }}
   - name: FederatedIngress
     configuration: {{ .Values.featureGates.FederatedIngress | default "Enabled" | quote }}
 {{- end }}
diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -67,6 +67,6 @@ func init() {
 var DefaultKubeFedFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	SchedulerPreferences:         {Default: true, PreRelease: featuregate.Alpha},
 	PushReconciler:               {Default: true, PreRelease: featuregate.Beta},
-	CrossClusterServiceDiscovery: {Default: true, PreRelease: featuregate.Alpha},
+	CrossClusterServiceDiscovery: {Default: false, PreRelease: featuregate.Alpha},
 	FederatedIngress:             {Default: true, PreRelease: featuregate.Alpha},
 }
diff --git a/scripts/deploy-kubefed.sh b/scripts/deploy-kubefed.sh
@@ -79,6 +79,7 @@ function helm-deploy-cmd {
         --set controllermanager.webhook.repository=${repo} \
         --set controllermanager.webhook.image=${image} \
         --set controllermanager.webhook.tag=${tag} \
+        --set controllermanager.featureGates.CrossClusterServiceDiscovery=Enabled \
         ${force_redeploy_values:-} \
         --create-namespace \
         --wait"