Add new apiserver flags for clusterIP (nee portal)

Leave old flags but marked as deprecated
2015-05-23 21:59:46 -07:00
parent 4318ca5a8b
commit 3005471100
24 changed files with 31 additions and 28 deletions
--- a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
+++ b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
@@ -11,7 +11,7 @@ exec /usr/local/bin/apiserver \
     --address=%(api_bind_address)s \
     --etcd_servers=%(etcd_servers)s \
     --logtostderr=true \
-     --portal_net=10.244.240.0/20
+     --service-cluster-ip-range=10.244.240.0/20