Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

external etcd support #68

Merged
merged 10 commits into from Mar 16, 2018
Merged

external etcd support #68

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c37eee6
initial external etcd support
jnummelin Mar 13, 2018
8c3a68d
add note why we need the kubeadm beta binary
jnummelin Mar 15, 2018
9512e98
make config struct to use schema validation in constructor
jnummelin Mar 15, 2018
f32d9fe
cleanup master config spec
jnummelin Mar 15, 2018
d1b859b
download kubeadm directly, with possibility to override version
jnummelin Mar 15, 2018
ba6ac5b
use collected cpu arch info for downloading kubeadm
jnummelin Mar 16, 2018
9d0eb1f
Merge branch 'master' into feature/external-etcd
jnummelin Mar 16, 2018
467b677
document external etcd details
jnummelin Mar 16, 2018
d74486d
add etcd endpoints info
jnummelin Mar 16, 2018
e8ba9af
lowercase etcd
jnummelin Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/kupo/phases/configure_host.rb
View file
Open in desktop
Expand Up @@ -51,7 +51,8 @@ def call

logger.info { "Configuring Kubernetes packages ..." }
exec_script('configure-kube.sh', {
kube_version: KUBE_VERSION
kube_version: KUBE_VERSION,
kubeadm_version: ENV['KUBEADM_VERSION'] || KUBE_VERSION
})
rescue Kupo::Error => exc
logger.error { exc.message }
Expand Down
17 changes: 11 additions & 6 deletions lib/kupo/scripts/configure-kube.sh
View file
Open in desktop
Expand Up @@ -8,12 +8,17 @@ if [ "$(kubelet --version)" = "Kubernetes v<%= kube_version %>" ]; then
fi

apt-mark unhold kubelet kubeadm kubectl
apt-get install -y kubelet=<%= kube_version %>-00 kubeadm=<%= kube_version %>-00 kubectl=<%= kube_version %>-00
apt-get install -y kubelet=<%= kube_version %>-00 kubectl=<%= kube_version %>-00
apt-mark hold kubelet kubelet kubeadm kubectl

# Hack to get 1.10.beta.3 kubeadm in place
# Needed to be able to configure cri socket in the config file
# See: https://github.com/kubernetes/kubernetes/pull/59057
# FIXME Remove when we're using official 1.10 kubeadm
curl -o /usr/bin/kubeadm https://storage.googleapis.com/kubernetes-release/release/v1.10.0-beta.3/bin/linux/amd64/kubeadm
# Get kubeadm binary directly
arch=`uname -m`
case "$arch" in
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that arch should come as a variable from phase. We already collect host.cpu_arch information.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

x86_64) arch="amd64" ;;
aarch64) arch="arm64" ;;
*) echo "$arch not supported architecture, exiting..."
exit 11
;;
esac
curl -o /usr/bin/kubeadm https://storage.googleapis.com/kubernetes-release/release/<%= kubeadm_version %>/bin/linux/$arch/kubeadm
chmod +x /usr/bin/kubeadm