github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Refactor GCE kube-env for both OSes.

Browse Source
This commit is contained in:
Max Forbes 2015-05-08 15:47:49 -07:00
parent 1880f73658
commit 0acf8f9a00
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/coreos/helper.sh
View File

@ -69,9 +69,6 @@ ENABLE_CLUSTER_DNS=$(yaml-quote ${ENABLE_CLUSTER_DNS:-false})
DNS_REPLICAS=$(yaml-quote ${DNS_REPLICAS:-}) DNS_REPLICAS=$(yaml-quote ${DNS_REPLICAS:-})
DNS_SERVER_IP=$(yaml-quote ${DNS_SERVER_IP:-}) DNS_SERVER_IP=$(yaml-quote ${DNS_SERVER_IP:-})
DNS_DOMAIN=$(yaml-quote ${DNS_DOMAIN:-}) DNS_DOMAIN=$(yaml-quote ${DNS_DOMAIN:-})
KUBE_USER=$(yaml-quote ${KUBE_USER})
KUBE_PASSWORD=$(yaml-quote ${KUBE_PASSWORD})
KUBE_BEARER_TOKEN=$(yaml-quote ${KUBE_BEARER_TOKEN})
KUBELET_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-}) KUBELET_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-})
KUBE_PROXY_TOKEN=$(yaml-quote ${KUBE_PROXY_TOKEN:-}) KUBE_PROXY_TOKEN=$(yaml-quote ${KUBE_PROXY_TOKEN:-})
ADMISSION_CONTROL=$(yaml-quote ${ADMISSION_CONTROL:-}) ADMISSION_CONTROL=$(yaml-quote ${ADMISSION_CONTROL:-})

2
cluster/gce/coreos/node.yaml
View File

@ -17,7 +17,7 @@ write_files:
source /etc/kube-env source /etc/kube-env
/usr/bin/mkdir -p /var/lib/kubelet /usr/bin/mkdir -p /var/lib/kubelet
/bin/echo {\"BearerToken\": \"${KUBE_BEARER_TOKEN}\", \"Insecure\": true } > /var/lib/kubelet/kubernetes_auth /bin/echo {\"BearerToken\": \"${KUBELET_TOKEN}\", \"Insecure\": true } > /var/lib/kubelet/kubernetes_auth
- path: /run/config-kube-proxy.sh - path: /run/config-kube-proxy.sh
permissions: "0755" permissions: "0755"
content: | content: |

13
cluster/gce/debian/helper.sh
View File

@ -41,16 +41,21 @@ ENABLE_CLUSTER_DNS: $(yaml-quote ${ENABLE_CLUSTER_DNS:-false})
DNS_REPLICAS: $(yaml-quote ${DNS_REPLICAS:-}) DNS_REPLICAS: $(yaml-quote ${DNS_REPLICAS:-})
DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-}) DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-}) DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
KUBE_USER: $(yaml-quote ${KUBE_USER})
KUBE_PASSWORD: $(yaml-quote ${KUBE_PASSWORD})
KUBE_BEARER_TOKEN: $(yaml-quote ${KUBE_BEARER_TOKEN})
KUBELET_TOKEN: $(yaml-quote ${KUBELET_TOKEN:-}) KUBELET_TOKEN: $(yaml-quote ${KUBELET_TOKEN:-})
KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-}) KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-})
ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-}) ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-})
MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE}) MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE})
EOF EOF
if [[ "${master}" != "true" ]]; then if [[ "${master}" == "true" ]]; then
# Master-only env vars.
cat >>$file <<EOF
KUBE_USER: $(yaml-quote ${KUBE_USER})
KUBE_PASSWORD: $(yaml-quote ${KUBE_PASSWORD})
KUBE_BEARER_TOKEN: $(yaml-quote ${KUBE_BEARER_TOKEN})
EOF
else
# Node-only env vars.
cat >>$file <<EOF cat >>$file <<EOF
KUBERNETES_MASTER_NAME: $(yaml-quote ${MASTER_NAME}) KUBERNETES_MASTER_NAME: $(yaml-quote ${MASTER_NAME})
ZONE: $(yaml-quote ${ZONE}) ZONE: $(yaml-quote ${ZONE})