Merge pull request #26952 from madhusudancs/fed-apiserver-admissioncontrol-todo

Automatic merge from submit-queue Add a TODO to enable admission control in federation apiserver when the support is added. Only the last commit here needs review. Depends on #26951. cc @kubernetes/sig-cluster-federation [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Merge pull request #26952 from madhusudancs/fed-apiserver-admissioncontrol-todo
9ae6a008 · k8s-merge-robot · GitHub · 00501122 · 227e836c · 9ae6a008
Commit 9ae6a008 authored Jun 09, 2016 by k8s-merge-robot Committed by GitHub Jun 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

federation-apiserver-deployment.yaml federation/manifests/federation-apiserver-deployment.yaml +1 -0

No files found.
--- a/federation/manifests/federation-apiserver-deployment.yaml
+++ b/federation/manifests/federation-apiserver-deployment.yaml
@@ -23,6 +23,7 @@ spec:
        - --service-cluster-ip-range={{.FEDERATION_SERVICE_CIDR}}
        - --secure-port=443
        - --advertise-address={{.FEDERATION_API_HOST}}
+        # TODO: --admission-control values must be set when support is added for each type of control.
        - --token-auth-file=/srv/kubernetes/known-tokens.csv
        ports:
        - containerPort: 443