Skip to content

Commit

Permalink
Merge branch 'release-0.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
kvaps committed Jan 21, 2021
2 parents 43ef5bf + 31890f3 commit 00f7831
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/ltsp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/kubefarm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -14,5 +14,5 @@ maintainers:
email: [email protected]
dependencies:
- name: kubernetes
version: 0.8.0
version: 0.9.0
condition: kubernetes.enabled
9 changes: 4 additions & 5 deletions deploy/helm/kubefarm/templates/ltsp-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ spec:
labels:
app: {{ $fullName }}-publisher
spec:
{{- with .Values.kubernetes.admin.image.PullSecrets }}
{{- with .Values.kubernetes.admin.image.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 10 }}
{{- end }}
containers:
- 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:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/kubefarm/templates/token-generator-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ spec:
labels:
app: {{ $fullName }}-token-generator
spec:
{{- with .Values.kubernetes.admin.image.PullSecrets }}
{{- with .Values.kubernetes.admin.image.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 10 }}
{{- end }}
containers:
- 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:
Expand Down
8 changes: 4 additions & 4 deletions deploy/helm/kubefarm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ tokenGenerator:
ltsp:
enabled: true
image:
repository: docker.io/kvaps/kubefarm-ltsp
tag: v0.7.0
PullPolicy: IfNotPresent
PullSecrets: []
repository: ghcr.io/kvaps/kubefarm-ltsp
tag: v0.9.0
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1

publishDHCP: true
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced_network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion examples/catchall/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/dualstack_network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion examples/generic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 00f7831

Please sign in to comment.