openstack
/
magnum
Code Issues Proposed changes

[k8s_coreos] update to etcdv3 and kube 1.6 

Change-Id: I6314ca1483c85bfe8b4577449d4c2ed553be87d9
This commit is contained in:
Kevin Lefevre 2017-04-13 15:45:35 +02:00 committed by ArchiFleKs
parent 3a1f41f9f4
commit c14f7d7c56
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
View File

@ -25,7 +25,7 @@ write_files:
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi fi
DROP_IN_FILE=/etc/systemd/system/etcd2.service.d/20-configure-etcd.conf DROP_IN_FILE=/etc/systemd/system/etcd-member.service.d/20-configure-etcd.conf
mkdir -p $(dirname $DROP_IN_FILE) mkdir -p $(dirname $DROP_IN_FILE)
protocol="https" protocol="https"
@ -53,6 +53,8 @@ write_files:
Environment=ETCD_PEER_CA_FILE=${KUBE_CERTS_PATH}/ca.pem Environment=ETCD_PEER_CA_FILE=${KUBE_CERTS_PATH}/ca.pem
Environment=ETCD_PEER_CERT_FILE=${KUBE_CERTS_PATH}/apiserver.pem Environment=ETCD_PEER_CERT_FILE=${KUBE_CERTS_PATH}/apiserver.pem
Environment=ETCD_PEER_KEY_FILE=${KUBE_CERTS_PATH}/apiserver-key.pem Environment=ETCD_PEER_KEY_FILE=${KUBE_CERTS_PATH}/apiserver-key.pem
Environment="RKT_RUN_ARGS=--volume ssl,kind=host,source=${KUBE_CERTS_PATH} \
--mount volume=ssl,target=${KUBE_CERTS_PATH}"
EOF EOF
fi fi
@ -61,5 +63,5 @@ write_files:
echo "Environment=ETCD_DISCOVERY_PROXY=$HTTP_PROXY" >> $DROP_IN_FILE echo "Environment=ETCD_DISCOVERY_PROXY=$HTTP_PROXY" >> $DROP_IN_FILE
fi fi
systemctl enable etcd2 systemctl enable etcd-member
systemctl --no-block start etcd2 systemctl --no-block start etcd-member

2
magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
View File

@ -228,7 +228,7 @@ parameters:
kube_version: kube_version:
type: string type: string
description: version of kubernetes used for kubernetes cluster description: version of kubernetes used for kubernetes cluster
default: v1.5.2_coreos.1 default: v1.6.2_coreos.0
kube_dashboard_version: kube_dashboard_version:
type: string type: string