diff --git a/README.md b/README.md index 983eaa3..2812085 100644 --- a/README.md +++ b/README.md @@ -92,14 +92,6 @@ There is a number of dependencies needed to make kubefarm working: kubectl apply -f https://github.com/metallb/metallb/raw/v0.10.2/manifests/metallb.yaml ``` - There is currently a bug in MetalLB that may block the use of multiple services on shared IP [metallb/metallb#558](https://github.com/metallb/metallb/issues/558). - However you can simple use patched images from this PR [metallb/metallb#922](https://github.com/metallb/metallb/pull/922): - - ```bash - kubectl set image -n metallb-system deploy/controller controller=ghcr.io/kvaps/metallb-controller:v0.10.2-fix558 - kubectl set image -n metallb-system ds/speaker speaker=ghcr.io/kvaps/metallb-speaker:v0.10.2-fix558 - ``` - Also [configure MetalLB Layer 2 address range](https://metallb.universe.tf/configuration/#layer-2-configuration) after the installation. These IP-addresses will be used for the child Kubernetes clusters and network booting servers. @@ -143,14 +135,17 @@ Spawn new cluster: ```bash helm repo add kvaps https://kvaps.github.io/charts -helm show values kvaps/kubefarm --version 0.11.0 > values.yaml +helm show values kvaps/kubefarm --version 0.12.0 > values.yaml vim values.yaml -helm install cluster1 kvaps/kubefarm --version 0.11.0 \ +helm install cluster1 kvaps/kubefarm --version 0.12.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f values.yaml ``` +> **Warning:** As in standard case, clusters are bootstrapped without the CNI-plugin installed. Please follow official Kubernetes to choose and install the CNI-plugin to complete the installation. + + ### Cleanup ```bash diff --git a/build/ltsp/Dockerfile b/build/ltsp/Dockerfile index 9c294c5..8ab0365 100644 --- a/build/ltsp/Dockerfile +++ b/build/ltsp/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:20.04 as ltsp -ENV VERSION=v0.11.0 +ENV VERSION=v0.12.0 ENV DEBIAN_FRONTEND=noninteractive # Install updates and LTSP package diff --git a/deploy/helm/kubefarm/Chart.yaml b/deploy/helm/kubefarm/Chart.yaml index ffa5c3d..f49f05c 100644 --- a/deploy/helm/kubefarm/Chart.yaml +++ b/deploy/helm/kubefarm/Chart.yaml @@ -1,7 +1,7 @@ name: kubefarm description: Kubefarm cluster -version: 0.11.0 -appVersion: 1.21.0 +version: 0.12.0 +appVersion: 1.21.3 icon: https://avatars1.githubusercontent.com/u/68351149?s=150&u=b8b4cb0f364281274159d4098090c0e229370cf0 keywords: - kubernetes @@ -14,5 +14,5 @@ maintainers: email: kvapss@gmail.com dependencies: - name: kubernetes - version: 0.11.0 + version: 0.12.0 condition: kubernetes.enabled diff --git a/deploy/helm/kubefarm/values.yaml b/deploy/helm/kubefarm/values.yaml index 95e0b21..88ac824 100644 --- a/deploy/helm/kubefarm/values.yaml +++ b/deploy/helm/kubefarm/values.yaml @@ -42,7 +42,7 @@ ltsp: enabled: true image: repository: ghcr.io/kvaps/kubefarm-ltsp - tag: v0.11.0 + tag: v0.12.0 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 diff --git a/deploy/helm/kubefarm/vendor/github.com/kvaps/kubernetes-in-kubernetes b/deploy/helm/kubefarm/vendor/github.com/kvaps/kubernetes-in-kubernetes index ed78b51..3285e86 160000 --- a/deploy/helm/kubefarm/vendor/github.com/kvaps/kubernetes-in-kubernetes +++ b/deploy/helm/kubefarm/vendor/github.com/kvaps/kubernetes-in-kubernetes @@ -1 +1 @@ -Subproject commit ed78b513c73b81e623aeaf82fc0ff7055ff8707a +Subproject commit 3285e8648e0f0f74606890a62997365d943b0ad5 diff --git a/examples/advanced_network/README.md b/examples/advanced_network/README.md index 59f139f..4e07545 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.11.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.12.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f ../generic/values.yaml \ diff --git a/examples/catchall/README.md b/examples/catchall/README.md index cb9b456..e04be69 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.11.0 \ +helm install catchall kvaps/kubefarm --version 0.12.0 \ --namespace kubefarm-catchall \ --create-namespace \ -f values.yaml diff --git a/examples/dualstack_network/README.md b/examples/dualstack_network/README.md index aab9112..8cff40a 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.11.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.12.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f ../generic/values.yaml \ @@ -59,7 +59,7 @@ Install [Cilium](https://cilium.io/): ```bash helm upgrade \ --install cilium cilium/cilium \ - --version 1.9.8 \ + --version 1.10.3 \ --namespace kube-system \ --set kubeProxyReplacement=strict \ --set k8sServiceHost=cluster1-kubernetes-apiserver \ diff --git a/examples/dualstack_network/values.yaml b/examples/dualstack_network/values.yaml index d004454..9ce0049 100644 --- a/examples/dualstack_network/values.yaml +++ b/examples/dualstack_network/values.yaml @@ -18,9 +18,3 @@ kubernetes: kubeProxy: enabled: false - -ltsp: - config: - options: - # workaround: https://github.com/cilium/cilium/issues/6320 - POST_SERVICE_CILIUM_MASQ: ip6tables -t nat -A POSTROUTING ! -o cilium_+ -s fd00::/104 -j MASQUERADE diff --git a/examples/generic/README.md b/examples/generic/README.md index 0e02165..5338dfd 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.11.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.12.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f values.yaml