Merge pull request #36643 from kzwang/ingress-controller

Automatic merge from submit-queue (batch tested with PRs 37870, 36643, 37664, 37545)

Add option to disable federation ingress controller

**What this PR does / why we need it**:
Added an option to enable/disable federation ingress controller as currently federated ingresses doesn't work in environments other than GCE/GKE. Also ignore reconcile config maps if no federated ingresses exist.

**Which issue this PR fixes** 
fixes #33943

@quinton-hoole

**Release note**:
```release-note
Add `--controllers` flag to federation controller manager for enable/disable federation ingress controller
```
This commit is contained in:
Kubernetes Submit Queue
2016-12-06 00:22:54 -08:00
committed by GitHub
9 changed files with 193 additions and 10 deletions

View File

@@ -522,6 +522,7 @@ k8s.io/kubernetes/cmd/mungedocs,mwielgus,1
k8s.io/kubernetes/examples,Random-Liu,0
k8s.io/kubernetes/federation/apis/federation/install,nikhiljindal,0
k8s.io/kubernetes/federation/apis/federation/validation,nikhiljindal,0
k8s.io/kubernetes/federation/cmd/federation-controller-manager/app,kzwang,0
k8s.io/kubernetes/federation/pkg/dnsprovider,sttts,1
k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53,cjcullen,1
k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns,jsafrane,1
1 name owner auto-assigned
522 k8s.io/kubernetes/examples Random-Liu 0
523 k8s.io/kubernetes/federation/apis/federation/install nikhiljindal 0
524 k8s.io/kubernetes/federation/apis/federation/validation nikhiljindal 0
525 k8s.io/kubernetes/federation/cmd/federation-controller-manager/app kzwang 0
526 k8s.io/kubernetes/federation/pkg/dnsprovider sttts 1
527 k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53 cjcullen 1
528 k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns jsafrane 1