From db20d770b33aba91f9e44af375fa1d614eec1397 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 21 Jan 2021 11:35:35 +0100 Subject: [PATCH 1/2] update version v0.9.0 --- README.md | 4 ++-- build/ltsp/Dockerfile | 2 +- deploy/helm/kubefarm/Chart.yaml | 4 ++-- deploy/helm/kubefarm/values.yaml | 4 ++-- .../kubefarm/vendor/github.com/kvaps/kubernetes-in-kubernetes | 2 +- examples/advanced_network/README.md | 2 +- examples/catchall/README.md | 2 +- examples/dualstack_network/README.md | 4 ++-- examples/generic/README.md | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d869708..07c9f58 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.8.0 > values.yaml +helm show values kvaps/kubefarm --version 0.9.0 > values.yaml vim values.yaml -helm install cluster1 kvaps/kubefarm --version 0.8.0 \ +helm install cluster1 kvaps/kubefarm --version 0.9.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f values.yaml diff --git a/build/ltsp/Dockerfile b/build/ltsp/Dockerfile index e7af0c2..306f631 100644 --- a/build/ltsp/Dockerfile +++ b/build/ltsp/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:20.04 as ltsp -ENV VERSION=v0.8.0 +ENV VERSION=v0.9.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 aa38559..8e8a2ea 100644 --- a/deploy/helm/kubefarm/Chart.yaml +++ b/deploy/helm/kubefarm/Chart.yaml @@ -1,6 +1,6 @@ name: kubefarm description: Kubefarm cluster -version: 0.8.0 +version: 0.9.0 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.8.0 + version: 0.9.0 condition: kubernetes.enabled diff --git a/deploy/helm/kubefarm/values.yaml b/deploy/helm/kubefarm/values.yaml index 56139d7..30a3790 100644 --- a/deploy/helm/kubefarm/values.yaml +++ b/deploy/helm/kubefarm/values.yaml @@ -41,8 +41,8 @@ tokenGenerator: ltsp: enabled: true image: - repository: docker.io/kvaps/kubefarm-ltsp - tag: v0.7.0 + repository: ghcr.io/kvaps/kubefarm-ltsp + tag: v0.9.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 8ab2b8e..640d565 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 8ab2b8ef23d0007cdf6d070632461e82a8155811 +Subproject commit 640d5658eefbdbe51a73f57b6ad7fa5030a143de diff --git a/examples/advanced_network/README.md b/examples/advanced_network/README.md index be8ed4f..ff26096 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.8.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f ../generic/values.yaml \ diff --git a/examples/catchall/README.md b/examples/catchall/README.md index f851345..1bd25db 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.8.0 \ +helm install catchall kvaps/kubefarm --version 0.9.0 \ --namespace kubefarm-catchall \ --create-namespace \ -f values.yaml diff --git a/examples/dualstack_network/README.md b/examples/dualstack_network/README.md index 7297230..a8a5d85 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.8.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.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.1 \ + --version 1.9.2 \ --namespace kube-system \ --set kubeProxyReplacement=strict \ --set k8sServiceHost=cluster1-kubernetes-apiserver \ diff --git a/examples/generic/README.md b/examples/generic/README.md index 53dc0a7..454d868 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.8.0 \ +helm upgrade --install cluster1 kvaps/kubefarm --version 0.9.0 \ --namespace kubefarm-cluster1 \ --create-namespace \ -f values.yaml From 31890f306a703d69e01d2058218fd38bc3148caf Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 21 Jan 2021 11:39:50 +0100 Subject: [PATCH 2/2] upd .pullPolicy and .pullSecrets --- deploy/helm/kubefarm/templates/ltsp-deployment.yaml | 9 ++++----- deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml | 4 ++-- deploy/helm/kubefarm/templates/token-generator-job.yaml | 4 ++-- deploy/helm/kubefarm/values.yaml | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/deploy/helm/kubefarm/templates/ltsp-deployment.yaml b/deploy/helm/kubefarm/templates/ltsp-deployment.yaml index 561643b..416f69a 100644 --- a/deploy/helm/kubefarm/templates/ltsp-deployment.yaml +++ b/deploy/helm/kubefarm/templates/ltsp-deployment.yaml @@ -44,7 +44,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.ltsp.image.PullSecrets }} + {{- with .Values.ltsp.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -53,7 +53,7 @@ spec: - name: config {{- with .Values.ltsp.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" - imagePullPolicy: {{ .PullPolicy }} + imagePullPolicy: {{ .pullPolicy }} {{- end }} command: - /bin/sh @@ -73,7 +73,7 @@ spec: - name: http {{- with .Values.ltsp.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" - imagePullPolicy: {{ .PullPolicy }} + imagePullPolicy: {{ .pullPolicy }} {{- end }} command: - /bin/sh @@ -100,9 +100,8 @@ spec: - name: tftp {{- with .Values.ltsp.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" - imagePullPolicy: {{ .PullPolicy }} + imagePullPolicy: {{ .pullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.ltsp.image.PullPolicy }} command: - /bin/sh - -c diff --git a/deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml b/deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml index 17690ef..e224679 100644 --- a/deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml +++ b/deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml @@ -16,7 +16,7 @@ spec: labels: app: {{ $fullName }}-publisher spec: - {{- with .Values.kubernetes.admin.image.PullSecrets }} + {{- with .Values.kubernetes.admin.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -24,7 +24,7 @@ spec: - name: kubeadm {{- with .Values.kubernetes.admin.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" - imagePullPolicy: {{ .PullPolicy }} + imagePullPolicy: {{ .pullPolicy }} {{- end }} command: [ '/scripts/publiship.sh' ] env: diff --git a/deploy/helm/kubefarm/templates/token-generator-job.yaml b/deploy/helm/kubefarm/templates/token-generator-job.yaml index cca0934..a1d0201 100644 --- a/deploy/helm/kubefarm/templates/token-generator-job.yaml +++ b/deploy/helm/kubefarm/templates/token-generator-job.yaml @@ -16,7 +16,7 @@ spec: labels: app: {{ $fullName }}-token-generator spec: - {{- with .Values.kubernetes.admin.image.PullSecrets }} + {{- with .Values.kubernetes.admin.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -24,7 +24,7 @@ spec: - name: kubeadm {{- with .Values.kubernetes.admin.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" - imagePullPolicy: {{ .PullPolicy }} + imagePullPolicy: {{ .pullPolicy }} {{- end }} command: [ '/scripts/gentoken.sh' ] env: diff --git a/deploy/helm/kubefarm/values.yaml b/deploy/helm/kubefarm/values.yaml index 30a3790..100f137 100644 --- a/deploy/helm/kubefarm/values.yaml +++ b/deploy/helm/kubefarm/values.yaml @@ -43,8 +43,8 @@ ltsp: image: repository: ghcr.io/kvaps/kubefarm-ltsp tag: v0.9.0 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 1 publishDHCP: true