Skip to content

Commit

Permalink
Fix so setup-files don't recreate/invalidate certificates that alread…
Browse files Browse the repository at this point in the history
…y exist
  • Loading branch information
luxas committed Apr 2, 2016
1 parent 0db698c commit 895d37f
Showing 1 changed file with 37 additions and 13 deletions.
50 changes: 37 additions & 13 deletions cluster/images/hyperkube/setup-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,52 @@ set -o errexit
set -o nounset
set -o pipefail

create_token() {
echo $(cat /dev/urandom | base64 | tr -d "=+/" | dd bs=32 count=1 2> /dev/null)
}

# Additional address of the API server to be added to the
# list of Subject Alternative Names of the server TLS certificate
# Should contain internal IP, i.e. IP:10.0.0.1 for 10.0.0.0/24 cluster IP range
EXTRA_SANS=$1

create_token() {
echo $(cat /dev/urandom | base64 | tr -d "=+/" | dd bs=32 count=1 2> /dev/null)
}
# Files in /data are persistent across reboots, so we don't want to re-create the files if they already
# exist, because the state is persistent in etcd too, and we don't want a conflict between "old" data in
# etcd and "new" data that this script would create for apiserver. Therefore, if the file exist, skip it.
if [[ ! -f /data/ca.crt ]]; then

# Create HTTPS certificates
groupadd -f -r kube-cert-test

# hostname -I gets the ip of the node
CERT_DIR=/data CERT_GROUP=kube-cert-test /make-ca-cert.sh $(hostname -I | awk '{print $1}') ${EXTRA_SANS}

echo "Certificates created $(date)"
else
echo "Certificates already found, not recreating."
fi

if [[ ! -f /data/basic_auth.csv ]]; then

# Create basic token authorization
echo "admin,admin,admin" > /data/basic_auth.csv

# Create basic token authorization
echo "admin,admin,admin" > /data/basic_auth.csv
echo "basic_auth.csv created $(date)"
else
echo "basic_auth.csv already found, not recreating."
fi

# Create HTTPS certificates
groupadd -f -r kube-cert-test
if [[ ! -f /data/known_tokens.csv ]]; then

# hostname -I gets the ip of the node
CERT_DIR=/data CERT_GROUP=kube-cert-test /make-ca-cert.sh $(hostname -I | awk '{print $1}') ${EXTRA_SANS}
# Create known tokens for service accounts
echo "$(create_token),admin,admin" >> /data/known_tokens.csv
echo "$(create_token),kubelet,kubelet" >> /data/known_tokens.csv
echo "$(create_token),kube_proxy,kube_proxy" >> /data/known_tokens.csv

# Create known tokens for service accounts
echo "$(create_token),admin,admin" >> /data/known_tokens.csv
echo "$(create_token),kubelet,kubelet" >> /data/known_tokens.csv
echo "$(create_token),kube_proxy,kube_proxy" >> /data/known_tokens.csv
echo "known_tokens.csv created $(date)"
else
echo "known_tokens.csv already found, not recreating."
fi

while true; do
sleep 3600
Expand Down

0 comments on commit 895d37f

Please sign in to comment.