From 380fc8cc9a93a71039a160d516669c593bfef146 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Mon, 1 Feb 2021 17:38:49 +0100 Subject: [PATCH] fix kubeadm-join and bump version --- README.md | 4 ++-- build/ltsp/Dockerfile | 2 +- deploy/helm/kubefarm/Chart.yaml | 4 ++-- deploy/helm/kubefarm/templates/ltsp-configmap.yaml | 1 + examples/advanced_network/README.md | 2 +- examples/catchall/README.md | 2 +- examples/dualstack_network/README.md | 2 +- examples/generic/README.md | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 07c9f58..8e62f84 100644 --- a/README.md +++ b/README.md @@ -144,9 +144,9 @@ Spawn new cluster: ```bash helm repo add kvaps https://kvaps.github.io/charts -helm show values kvaps/kubefarm --version 0.9.0 > values.yaml +helm show values kvaps/kubefarm --version 0.9.1 > values.yaml vim values.yaml -helm install cluster1 kvaps/kubefarm --version 0.9.0 \ +helm install cluster1 kvaps/kubefarm --version 0.9.1 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f values.yaml diff --git a/build/ltsp/Dockerfile b/build/ltsp/Dockerfile index 306f631..d6e9f9c 100644 --- a/build/ltsp/Dockerfile +++ b/build/ltsp/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:20.04 as ltsp -ENV VERSION=v0.9.0 +ENV VERSION=v0.9.1 ENV DEBIAN_FRONTEND=noninteractive # Install updates and LTSP package diff --git a/deploy/helm/kubefarm/Chart.yaml b/deploy/helm/kubefarm/Chart.yaml index 8e8a2ea..5272c1a 100644 --- a/deploy/helm/kubefarm/Chart.yaml +++ b/deploy/helm/kubefarm/Chart.yaml @@ -1,6 +1,6 @@ name: kubefarm description: Kubefarm cluster -version: 0.9.0 +version: 0.9.1 appVersion: 1.19.0 icon: https://avatars1.githubusercontent.com/u/68351149?s=150&u=b8b4cb0f364281274159d4098090c0e229370cf0 keywords: @@ -14,5 +14,5 @@ maintainers: email: kvapss@gmail.com dependencies: - name: kubernetes - version: 0.9.0 + version: 0.9.1 condition: kubernetes.enabled diff --git a/deploy/helm/kubefarm/templates/ltsp-configmap.yaml b/deploy/helm/kubefarm/templates/ltsp-configmap.yaml index cfeb320..129492e 100644 --- a/deploy/helm/kubefarm/templates/ltsp-configmap.yaml +++ b/deploy/helm/kubefarm/templates/ltsp-configmap.yaml @@ -28,6 +28,7 @@ data: [Service] Type=oneshot + Environment=HOME=/root EnvironmentFile=/etc/ltsp/kubeadm-join.conf ExecStart=/bin/sh -c "exec ${JOIN_COMMAND}" Restart=on-failure diff --git a/examples/advanced_network/README.md b/examples/advanced_network/README.md index ff26096..eeca93a 100644 --- a/examples/advanced_network/README.md +++ b/examples/advanced_network/README.md @@ -42,7 +42,7 @@ or just put `debug_shell` at any place you want to debug. apply: ``` -helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.1 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f ../generic/values.yaml \ diff --git a/examples/catchall/README.md b/examples/catchall/README.md index 1bd25db..6be5b17 100644 --- a/examples/catchall/README.md +++ b/examples/catchall/README.md @@ -16,7 +16,7 @@ It might be used to catch all unknown clients in the network. apply: ``` -helm install catchall kvaps/kubefarm --version 0.9.0 \ +helm install catchall kvaps/kubefarm --version 0.9.1 \ --namespace kubefarm-catchall \ --create-namespace \ -f values.yaml diff --git a/examples/dualstack_network/README.md b/examples/dualstack_network/README.md index a8a5d85..02bee9b 100644 --- a/examples/dualstack_network/README.md +++ b/examples/dualstack_network/README.md @@ -47,7 +47,7 @@ sysctl -w net.ipv6.conf.all.forwarding=1 deploy kubernetes cluster without kube-proxy: ```bash -helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.1 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f ../generic/values.yaml \ diff --git a/examples/generic/README.md b/examples/generic/README.md index 454d868..4c92952 100644 --- a/examples/generic/README.md +++ b/examples/generic/README.md @@ -19,7 +19,7 @@ This setup illustrates the deployment of typical cluster with the static clients apply: ``` -helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.1 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f values.yaml