github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42375 from nikhiljindal/controllerRequiredResources

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42369, 42375, 42397, 42435, 42455)

Fixing federation controllers to support controllers flag

Fixes https://github.com/kubernetes/kubernetes/issues/42374

cc @kubernetes/sig-federation-pr-reviews
This commit is contained in:
Kubernetes Submit Queue
2017-03-03 23:21:40 -08:00
committed by GitHub
parent db4fbf5958 244f8c87ea
commit 6675dada8d
17 changed files with 97 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
federation/pkg/federation-controller/ingress/ingress_controller.go
View File

@@ -60,7 +60,7 @@ const (
// We wait for ingress to be created in this cluster before creating it any
// other cluster.
firstClusterAnnotation = "ingress.federation.kubernetes.io/first-cluster"
ControllerName = "ingress"
ControllerName = "ingresses"
)
var (