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

Update the DNS template from cluster/addons/dns and combine into one file. Make DNS working on docker and docker-multinode

Browse Source
This commit is contained in:
Lucas Käldström
2016-02-25 21:59:07 +02:00
parent df234d83cd
commit e9af6c34af
8 changed files with 78 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/master-multi.json
View File

@@ -65,7 +65,7 @@
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"command": [
"/setup-files.sh",
"IP:10.0.0.1"
"IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
],
"volumeMounts": [
{

2
cluster/images/hyperkube/master.json
View File

@@ -65,7 +65,7 @@
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"command": [
"/setup-files.sh",
"IP:10.0.0.1"
"IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
],
"volumeMounts": [
{

4
cluster/images/hyperkube/setup-files.sh
View File

@@ -37,7 +37,9 @@ echo "admin,admin,admin" > /data/basic_auth.csv
# Create HTTPS certificates
groupadd -f -r kube-cert-test
CERT_DIR=/data CERT_GROUP=kube-cert-test /make-ca-cert.sh $(hostname -i) ${EXTRA_SANS}
# 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