github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 14:11:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bunch of places where the -machines flag was still attached to the apiserver.

Browse Source
This commit is contained in:
Brendan Burns
2014-11-01 20:38:45 -07:00
parent bbb66af3db
commit 8d34231381
17 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/run-images/apiserver/run.sh
View File

@@ -14,8 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# If the user doesn't specify a minion, assume we are running in a single node
# configuration and that we have a local minion.
KUBE_MINIONS="${KUBE_MINIONS:-$(hostname -f)}"
./apiserver -address=0.0.0.0 -etcd_servers="${ETCD_SERVERS}" --machines="${KUBE_MINIONS}"
./apiserver -address=0.0.0.0 -etcd_servers="${ETCD_SERVERS}"

4
build/run-images/bootstrap/run.sh
View File

@@ -39,11 +39,11 @@ containers:
hostPort: 8080
containerPort: 8080
protocol: TCP
command: ["/kubernetes/apiserver", "-v=5", "-address=0.0.0.0", "-etcd_servers=http://127.0.0.1:4001", "-machines=${KUBELET_IP}"]
command: ["/kubernetes/apiserver", "-v=5", "-address=0.0.0.0", "-etcd_servers=http://127.0.0.1:4001"]
- name: controller-manager
image: kubernetes
imagePullPolicy: never
command: ["/kubernetes/controller-manager", "-v=5", "-master=127.0.0.1:8080"]
command: ["/kubernetes/controller-manager", "-v=5", "-master=127.0.0.1:8080", "-machines=${KUBELET_IP}"]
- name: proxy
image: kubernetes
imagePullPolicy: never

6
build/run-images/controller-manager/run.sh
View File

@@ -14,4 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
./controller-manager -master="${API_SERVER}"
# If the user doesn't specify a minion, assume we are running in a single node
# configuration and that we have a local minion.
KUBE_MINIONS="${KUBE_MINIONS:-$(hostname -f)}"
./controller-manager -master="${API_SERVER}" --machines="${KUBE_MINIONS}"