Merge pull request #1360 from mesosphere/hectorj2f/remove_federatedingress_feat

Remove FederatedIngress feature

Author: k8s-ci-robot

README.md

@@ -57,7 +57,6 @@ 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 Ingress DNS via `external-dns`](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/ingressdns-with-externaldns.md) | Alpha | FederatedIngress | false |
 | [Replica Scheduling Preferences](https://github.com/kubernetes-sigs/kubefed/blob/master/docs/userguide.md#replicaschedulingpreference) | Alpha | SchedulerPreferences | true |
 
 ## Guides

charts/kubefed/README.md

@@ -113,7 +113,6 @@ chart and their default values.
 | controllermanager.featureGates.PushReconciler               | Push reconciler feature.                                                                                                                                              | true                            |
 | controllermanager.featureGates.RawResourceStatusCollection               | Raw collection of resource status on target clusters feature.                                                                                                                                              | false                            |
 | controllermanager.featureGates.SchedulerPreferences         | Scheduler preferences feature.                                                                                                                                        | true                            |
-| controllermanager.featureGates.FederatedIngress             | Federated ingress feature.                                                                                                                                            | false                           |
 | 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                             |
 | controllermanager.leaderElectLeaseDuration | The maximum duration that a leader can be stopped before it is replaced by another candidate.                                                                                          | 15s                             |

charts/kubefed/charts/controllermanager/crds/crds.yaml

@@ -26,8 +26,6 @@ spec:
     configuration: {{ .Values.featureGates.PushReconciler | default "Enabled" | quote }}
   - name: SchedulerPreferences
     configuration: {{ .Values.featureGates.SchedulerPreferences | default "Enabled" | quote }}
-  - name: FederatedIngress
-    configuration: {{ .Values.featureGates.FederatedIngress | default "Disabled" | quote }}
   # NOTE: Commented feature gate to fix https://github.com/kubernetes-sigs/kubefed/issues/1333
   #- name: RawResourceStatusCollection
   #  configuration: {{ .Values.featureGates.RawResourceStatusCollection | default "Disabled" | quote }}

charts/kubefed/charts/controllermanager/templates/kubefedconfig.yaml

@@ -13,7 +13,7 @@ data:
     #!/bin/bash
     set -euo pipefail
 
-    kubectl patch kubefedconfig -n {{ .Release.Namespace }} kubefed --type='json' -p='[{"op": "add", "path": "/spec/featureGates", "value":[{"configuration": {{ .Values.featureGates.PushReconciler | default "Enabled" | quote }},"name":"PushReconciler"},{"configuration": {{ .Values.featureGates.RawResourceStatusCollection | default "Disabled" | quote }},"name":"RawResourceStatusCollection"},{"configuration": {{ .Values.featureGates.FederatedIngress | default "Disabled" | quote }},"name":"FederatedIngress"},{"configuration": {{ .Values.featureGates.SchedulerPreferences | default "Enabled" | quote }},"name":"SchedulerPreferences"}]}]'
+    kubectl patch kubefedconfig -n {{ .Release.Namespace }} kubefed --type='json' -p='[{"op": "add", "path": "/spec/featureGates", "value":[{"configuration": {{ .Values.featureGates.PushReconciler | default "Enabled" | quote }},"name":"PushReconciler"},{"configuration": {{ .Values.featureGates.RawResourceStatusCollection | default "Disabled" | quote }},"name":"RawResourceStatusCollection"},{"configuration": {{ .Values.featureGates.SchedulerPreferences | default "Enabled" | quote }},"name":"SchedulerPreferences"}]}]'
 
     echo "Kubefedconfig patched successfully!"
 

charts/kubefed/charts/controllermanager/templates/post-install-job.yaml

@@ -23,7 +23,6 @@ controllermanager:
   featureGates:
     PushReconciler:
     SchedulerPreferences:
-    FederatedIngress:
     RawResourceStatusCollection:
 
   ## common node selector

charts/kubefed/values.yaml

@@ -48,9 +48,7 @@ import (
 	corev1b1 "sigs.k8s.io/kubefed/pkg/apis/core/v1beta1"
 	"sigs.k8s.io/kubefed/pkg/apis/core/v1beta1/validation"
 	genericclient "sigs.k8s.io/kubefed/pkg/client/generic"
-	"sigs.k8s.io/kubefed/pkg/controller/dnsendpoint"
 	"sigs.k8s.io/kubefed/pkg/controller/federatedtypeconfig"
-	"sigs.k8s.io/kubefed/pkg/controller/ingressdns"
 	"sigs.k8s.io/kubefed/pkg/controller/kubefedcluster"
 	"sigs.k8s.io/kubefed/pkg/controller/schedulingmanager"
 	"sigs.k8s.io/kubefed/pkg/controller/util"
@@ -187,18 +185,6 @@ func startControllers(opts *options.Options, stopChan <-chan struct{}) {
 		}
 	}
 
-	if utilfeature.DefaultFeatureGate.Enabled(features.FederatedIngress) {
-		klog.Warningf("The feature '%s' is deprecated and will be removed in a future release.", features.FederatedIngress)
-
-		if err := ingressdns.StartController(opts.Config, stopChan); err != nil {
-			klog.Fatalf("Error starting ingress dns controller: %v", err)
-		}
-
-		if err := dnsendpoint.StartIngressDNSEndpointController(opts.Config, stopChan); err != nil {
-			klog.Fatalf("Error starting ingress dns endpoint controller: %v", err)
-		}
-	}
-
 	if utilfeature.DefaultFeatureGate.Enabled(features.PushReconciler) {
 		if utilfeature.DefaultFeatureGate.Enabled(features.RawResourceStatusCollection) {
 			opts.Config.RawResourceStatusCollection = true

cmd/controller-manager/app/controller-manager.go

@@ -20,8 +20,6 @@ spec:
     configuration: "Enabled"
   - name: SchedulerPreferences
     configuration: "Enabled"
-  - name: FederatedIngress
-    configuration: "Enabled"
   clusterHealthCheck:
     failureThreshold: 3
     period: 10s

config/kubefedconfig.yaml

@@ -15,7 +15,4 @@
 | Host Cluster         | A cluster which is used to expose the KubeFed API and run the KubeFed control plane.                                                                                                                                                                                                                          |
 | Cluster Registration | A cluster join the Host Cluster via command `kubefedctl join`.                                                                                                                                                                                                                                                        |
 | Member Cluster       | A cluster which is registered with the KubeFed API and that KubeFed controllers have authentication credentials for. The Host Cluster can also be a Member Cluster.                                                                                                                                           |
-| ServiceDNSRecord     | A resource that associates one or more Kubernetes Service resources and how to access the Service, with a scheme for constructing Domain Name System (DNS) [resource records](https://www.ietf.org/rfc/rfc1035.txt) for the Service.                                                                                |
-| IngressDNSRecord     | A resource that associates one or more [Kubernetes Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) and how to access the Kubernetes Ingress resources, with a scheme for constructing Domain Name System (DNS) [resource records](https://www.ietf.org/rfc/rfc1035.txt) for the Ingress. |
-| DNSEndpoint          | A [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) wrapper for the Endpoint resource.                                                                                                                                                                       |
 | Endpoint             | A resource that represents a Domain Name System (DNS) [resource record](https://www.ietf.org/rfc/rfc1035.txt).                                                                                                                                                                                                      |