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

Merge pull request #7113 from erictune/kube-proxy-token

Browse Source 
Added kube-proxy token.
This commit is contained in:
Zach Loafman
2015-04-22 09:16:04 -07:00
parent f1d9a88be6 2ca8a9d15d
commit 854c20c5e2
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/gce/util.sh
View File

@@ -585,11 +585,12 @@ function kube-up {
--zone "${ZONE}" \
--size "10GB"
# Generate a bearer token for this cluster. We push this separately
# from the other cluster variables so that the client (this
# Generate a bearer token for kubelets in this cluster. We push this
# separately from the other cluster variables so that the client (this
# computer) can forget it later. This should disappear with
# https://github.com/GoogleCloudPlatform/kubernetes/issues/3168
KUBELET_TOKEN=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
KUBE_PROXY_TOKEN=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
# Reserve the master's IP so that it can later be transferred to another VM
# without disrupting the kubelets. IPs are associated with regions, not zones,
@@ -616,7 +617,8 @@ function kube-up {
# Wait for last batch of jobs
wait-for-jobs
add-instance-metadata "${MASTER_NAME}" "kube-token=${KUBELET_TOKEN}"
add-instance-metadata "${MASTER_NAME}" "kubelet-token=${KUBELET_TOKEN}"
add-instance-metadata "${MASTER_NAME}" "kube-proxy-token=${KUBE_PROXY_TOKEN}"
echo "Creating minions."
@@ -631,7 +633,8 @@ function kube-up {
create-node-template "${NODE_INSTANCE_PREFIX}-template" "${scope_flags[*]}" \
"startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh" \
"kube-env=${KUBE_TEMP}/node-kube-env.yaml" \
"kube-token=${KUBELET_TOKEN}"
"kubelet-token=${KUBELET_TOKEN}" \
"kube-proxy-token=${KUBE_PROXY_TOKEN}"
gcloud preview managed-instance-groups --zone "${ZONE}" \
create "${NODE_INSTANCE_PREFIX}-group" \
@@ -869,7 +872,7 @@ function kube-push {
# TODO(zmerlynn): Re-create instance-template with the new
# node-kube-env. This isn't important until the node-ip-range issue
# is solved (because that's blocking automatic dynamic nodes from
# working). The node-kube-env has to be composed with the kube-token
# working). The node-kube-env has to be composed with the kube*-token
# metadata. Ideally we would have
# https://github.com/GoogleCloudPlatform/kubernetes/issues/3168
# implemented before then, though, so avoiding this mess until then.