diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh index f0f5104381..93bb7a1698 100755 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -578,14 +578,14 @@ function create-salt-master-auth() { if [[ ! -z "${CA_CERT:-}" ]] && [[ ! -z "${MASTER_CERT:-}" ]] && [[ ! -z "${MASTER_KEY:-}" ]]; then mkdir -p /srv/kubernetes (umask 077; - echo "${CA_CERT}" | base64 -d > /srv/kubernetes/ca.crt; - echo "${MASTER_CERT}" | base64 -d > /srv/kubernetes/server.cert; - echo "${MASTER_KEY}" | base64 -d > /srv/kubernetes/server.key; + echo "${CA_CERT}" | base64 --decode > /srv/kubernetes/ca.crt; + echo "${MASTER_CERT}" | base64 --decode > /srv/kubernetes/server.cert; + echo "${MASTER_KEY}" | base64 --decode > /srv/kubernetes/server.key; # Kubecfg cert/key are optional and included for backwards compatibility. # TODO(roberthbailey): Remove these two lines once GKE no longer requires # fetching clients certs from the master VM. - echo "${KUBECFG_CERT:-}" | base64 -d > /srv/kubernetes/kubecfg.crt; - echo "${KUBECFG_KEY:-}" | base64 -d > /srv/kubernetes/kubecfg.key) + echo "${KUBECFG_CERT:-}" | base64 --decode > /srv/kubernetes/kubecfg.crt; + echo "${KUBECFG_KEY:-}" | base64 --decode > /srv/kubernetes/kubecfg.key) fi fi if [ ! -e "${BASIC_AUTH_FILE}" ]; then diff --git a/cluster/gce/coreos/configure-node.sh b/cluster/gce/coreos/configure-node.sh index 45f42953cc..c03a2b083d 100644 --- a/cluster/gce/coreos/configure-node.sh +++ b/cluster/gce/coreos/configure-node.sh @@ -239,14 +239,14 @@ function create-salt-master-auth() { if [[ ! -z "${CA_CERT:-}" ]] && [[ ! -z "${MASTER_CERT:-}" ]] && [[ ! -z "${MASTER_KEY:-}" ]]; then mkdir -p /srv/kubernetes (umask 077; - echo "${CA_CERT}" | base64 -d > /srv/kubernetes/ca.crt; - echo "${MASTER_CERT}" | base64 -d > /srv/kubernetes/server.cert; - echo "${MASTER_KEY}" | base64 -d > /srv/kubernetes/server.key; + echo "${CA_CERT}" | base64 --decode > /srv/kubernetes/ca.crt; + echo "${MASTER_CERT}" | base64 --decode > /srv/kubernetes/server.cert; + echo "${MASTER_KEY}" | base64 --decode > /srv/kubernetes/server.key; # Kubecfg cert/key are optional and included for backwards compatibility. # TODO(roberthbailey): Remove these two lines once GKE no longer requires # fetching clients certs from the master VM. - echo "${KUBECFG_CERT:-}" | base64 -d > /srv/kubernetes/kubecfg.crt; - echo "${KUBECFG_KEY:-}" | base64 -d > /srv/kubernetes/kubecfg.key) + echo "${KUBECFG_CERT:-}" | base64 --decode > /srv/kubernetes/kubecfg.crt; + echo "${KUBECFG_KEY:-}" | base64 --decode > /srv/kubernetes/kubecfg.key) fi fi if [ ! -e "${BASIC_AUTH_FILE}" ]; then diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 0d4a9dda6c..406b1c8d23 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -106,9 +106,9 @@ function create-master-auth { echo "Creating master auth files" local -r auth_dir="/etc/srv/kubernetes" if [[ ! -e "${auth_dir}/ca.crt" && ! -z "${CA_CERT:-}" && ! -z "${MASTER_CERT:-}" && ! -z "${MASTER_KEY:-}" ]]; then - echo "${CA_CERT}" | base64 -d > "${auth_dir}/ca.crt" - echo "${MASTER_CERT}" | base64 -d > "${auth_dir}/server.cert" - echo "${MASTER_KEY}" | base64 -d > "${auth_dir}/server.key" + echo "${CA_CERT}" | base64 --decode > "${auth_dir}/ca.crt" + echo "${MASTER_CERT}" | base64 --decode > "${auth_dir}/server.cert" + echo "${MASTER_KEY}" | base64 --decode > "${auth_dir}/server.key" fi local -r basic_auth_csv="${auth_dir}/basic_auth.csv" if [[ ! -e "${basic_auth_csv}" ]]; then diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index e7bb6be202..6bab86b92d 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -280,14 +280,14 @@ create_master_auth() { readonly auth_dir="/etc/srv/kubernetes" if [ ! -e "${auth_dir}/ca.crt" ]; then if [ ! -z "${CA_CERT:-}" ] && [ ! -z "${MASTER_CERT:-}" ] && [ ! -z "${MASTER_KEY:-}" ]; then - echo "${CA_CERT}" | base64 -d > "${auth_dir}/ca.crt" - echo "${MASTER_CERT}" | base64 -d > "${auth_dir}/server.cert" - echo "${MASTER_KEY}" | base64 -d > "${auth_dir}/server.key" + echo "${CA_CERT}" | base64 --decode > "${auth_dir}/ca.crt" + echo "${MASTER_CERT}" | base64 --decode > "${auth_dir}/server.cert" + echo "${MASTER_KEY}" | base64 --decode > "${auth_dir}/server.key" # Kubecfg cert/key are optional and included for backwards compatibility. # TODO(roberthbailey): Remove these two lines once GKE no longer requires # fetching clients certs from the master VM. - echo "${KUBECFG_CERT:-}" | base64 -d > "${auth_dir}/kubecfg.crt" - echo "${KUBECFG_KEY:-}" | base64 -d > "${auth_dir}/kubecfg.key" + echo "${KUBECFG_CERT:-}" | base64 --decode > "${auth_dir}/kubecfg.crt" + echo "${KUBECFG_KEY:-}" | base64 --decode > "${auth_dir}/kubecfg.key" fi fi readonly basic_auth_csv="${auth_dir}/basic_auth.csv" diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 31795aad58..7d1f6487d3 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -126,9 +126,9 @@ create-certs ${MASTER_IP} 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) -echo "${CA_CERT_BASE64}" | base64 -d > "${RESOURCE_DIRECTORY}/ca.crt" -echo "${KUBECFG_CERT_BASE64}" | base64 -d > "${RESOURCE_DIRECTORY}/kubecfg.crt" -echo "${KUBECFG_KEY_BASE64}" | base64 -d > "${RESOURCE_DIRECTORY}/kubecfg.key" +echo "${CA_CERT_BASE64}" | base64 --decode > "${RESOURCE_DIRECTORY}/ca.crt" +echo "${KUBECFG_CERT_BASE64}" | base64 --decode > "${RESOURCE_DIRECTORY}/kubecfg.crt" +echo "${KUBECFG_KEY_BASE64}" | base64 --decode > "${RESOURCE_DIRECTORY}/kubecfg.key" until gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" "${MASTER_NAME}" --command="ls" &> /dev/null; do sleep 1 @@ -138,11 +138,11 @@ password=$(python -c 'import string,random; print("".join(random.SystemRandom(). gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" "${MASTER_NAME}" \ --command="sudo mkdir /srv/kubernetes -p && \ - sudo bash -c \"echo ${MASTER_CERT_BASE64} | base64 -d > /srv/kubernetes/server.cert\" && \ - sudo bash -c \"echo ${MASTER_KEY_BASE64} | base64 -d > /srv/kubernetes/server.key\" && \ - sudo bash -c \"echo ${CA_CERT_BASE64} | base64 -d > /srv/kubernetes/ca.crt\" && \ - sudo bash -c \"echo ${KUBECFG_CERT_BASE64} | base64 -d > /srv/kubernetes/kubecfg.crt\" && \ - sudo bash -c \"echo ${KUBECFG_KEY_BASE64} | base64 -d > /srv/kubernetes/kubecfg.key\" && \ + sudo bash -c \"echo ${MASTER_CERT_BASE64} | base64 --decode > /srv/kubernetes/server.cert\" && \ + sudo bash -c \"echo ${MASTER_KEY_BASE64} | base64 --decode > /srv/kubernetes/server.key\" && \ + sudo bash -c \"echo ${CA_CERT_BASE64} | base64 --decode > /srv/kubernetes/ca.crt\" && \ + sudo bash -c \"echo ${KUBECFG_CERT_BASE64} | base64 --decode > /srv/kubernetes/kubecfg.crt\" && \ + sudo bash -c \"echo ${KUBECFG_KEY_BASE64} | base64 --decode > /srv/kubernetes/kubecfg.key\" && \ sudo bash -c \"echo \"${KUBE_BEARER_TOKEN},admin,admin\" > /srv/kubernetes/known_tokens.csv\" && \ sudo bash -c \"echo \"${KUBELET_TOKEN},kubelet,kubelet\" >> /srv/kubernetes/known_tokens.csv\" && \ sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" && \