From 6aca5b4f2457e859c97120f761d6641d8b82329b Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 24 Sep 2016 18:11:27 -0400 Subject: [PATCH] Revert AdmissionControl change that should not have been in #507 --- upup/pkg/api/componentconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/pkg/api/componentconfig.go b/upup/pkg/api/componentconfig.go index 58b9366146..1dfb8ac908 100644 --- a/upup/pkg/api/componentconfig.go +++ b/upup/pkg/api/componentconfig.go @@ -359,7 +359,7 @@ type KubeAPIServerConfig struct { Address string `json:"address,omitempty" flag:"address"` EtcdServers string `json:"etcdServers,omitempty" flag:"etcd-servers"` EtcdServersOverrides string `json:"etcdServersOverrides,omitempty" flag:"etcd-servers-overrides"` - AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"` + AdmissionControl string `json:"admissionControl,omitempty" flag:"admission-control"` ServiceClusterIPRange string `json:"serviceClusterIPRange,omitempty" flag:"service-cluster-ip-range"` ClientCAFile string `json:"clientCAFile,omitempty" flag:"client-ca-file"` BasicAuthFile string `json:"basicAuthFile,omitempty" flag:"basic-auth-file"`