Skip to content

Commit ec10153

Browse files
kvapskvaps
committed
Merge branch 'release-0.9.0'
2 parents 46be4eb + 640d565 commit ec10153

12 files changed

+47
-40
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Deploy Kubernetes in Kubernetes using Helm
2626

2727
```bash
2828
helm repo add kvaps https://kvaps.github.io/charts
29-
helm install foo kvaps/kubernetes --version 0.8.0 \
29+
helm install foo kvaps/kubernetes --version 0.9.0 \
3030
--namespace foo \
3131
--create-namespace \
3232
--set persistence.storageClassName=local-path

‎build/tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM docker.io/library/alpine:3.12
22

33
RUN apk add --no-cache openssl
4-
ARG VERSION=v1.19.3
4+
ARG VERSION=v1.20.2
55
RUN wget "https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl" \
66
-O /usr/local/bin/kubectl \
77
&& chmod +x /usr/local/bin/kubectl

‎deploy/helm/kubernetes/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: kubernetes
22
description: Production-Grade Container Scheduling and Management
3-
version: 0.8.0
4-
appVersion: 1.19.3
3+
version: 0.9.0
4+
appVersion: v1.20.2
55
icon: https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Kubernetes_logo_without_workmark.svg/723px-Kubernetes_logo_without_workmark.svg.png
66
keywords:
77
- kubernetes

‎deploy/helm/kubernetes/templates/admin-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
affinity:
4444
{{- toYaml . | nindent 8 }}
4545
{{- end }}
46-
{{- with .Values.admin.image.PullSecrets }}
46+
{{- with .Values.admin.image.pullSecrets }}
4747
imagePullSecrets:
4848
{{- toYaml . | nindent 10 }}
4949
{{- end }}
@@ -53,8 +53,8 @@ spec:
5353
- command: [ 'sleep', 'infinity' ]
5454
{{- with .Values.admin.image }}
5555
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
56+
imagePullPolicy: {{ .pullPolicy }}
5657
{{- end }}
57-
imagePullPolicy: {{ .Values.admin.image.PullPolicy }}
5858
name: admin
5959
readinessProbe:
6060
exec:

‎deploy/helm/kubernetes/templates/apiserver-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
affinity:
4646
{{- toYaml . | nindent 8 }}
4747
{{- end }}
48-
{{- with .Values.apiServer.image.PullSecrets }}
48+
{{- with .Values.apiServer.image.pullSecrets }}
4949
imagePullSecrets:
5050
{{- toYaml . | nindent 10 }}
5151
{{- end }}
@@ -98,8 +98,8 @@ spec:
9898
name: client
9999
{{- with .Values.apiServer.image }}
100100
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
101+
imagePullPolicy: {{ .pullPolicy }}
101102
{{- end }}
102-
imagePullPolicy: {{ .Values.apiServer.image.PullPolicy }}
103103
livenessProbe:
104104
failureThreshold: 8
105105
httpGet:

‎deploy/helm/kubernetes/templates/controller-manager-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
affinity:
4444
{{- toYaml . | nindent 8 }}
4545
{{- end }}
46-
{{- with .Values.controllerManager.image.PullSecrets }}
46+
{{- with .Values.controllerManager.image.pullSecrets }}
4747
imagePullSecrets:
4848
{{- toYaml . | nindent 10 }}
4949
{{- end }}
@@ -73,8 +73,8 @@ spec:
7373
{{- end }}
7474
{{- with .Values.controllerManager.image }}
7575
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
76+
imagePullPolicy: {{ .pullPolicy }}
7677
{{- end }}
77-
imagePullPolicy: {{ .Values.controllerManager.image.PullPolicy }}
7878
livenessProbe:
7979
failureThreshold: 8
8080
httpGet:

‎deploy/helm/kubernetes/templates/etcd-statefulset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
{{- toYaml . | nindent 8 }}
4848
{{- end }}
4949

50-
{{- with .Values.etcd.image.PullSecrets }}
50+
{{- with .Values.etcd.image.pullSecrets }}
5151
imagePullSecrets:
5252
{{- toYaml . | nindent 10 }}
5353
{{- end }}
@@ -97,6 +97,7 @@ spec:
9797
{{- end }}
9898
{{- with .Values.etcd.image }}
9999
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
100+
imagePullPolicy: {{ .pullPolicy }}
100101
{{- end }}
101102
ports:
102103
- containerPort: {{ .Values.etcd.ports.client }}
@@ -105,7 +106,6 @@ spec:
105106
name: peer
106107
- containerPort: {{ .Values.etcd.ports.metrics }}
107108
name: metrics
108-
imagePullPolicy: {{ .Values.etcd.image.PullPolicy }}
109109
livenessProbe:
110110
failureThreshold: 8
111111
httpGet:

‎deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
affinity:
4444
{{- toYaml . | nindent 8 }}
4545
{{- end }}
46-
{{- with .Values.konnectivityServer.image.PullSecrets }}
46+
{{- with .Values.konnectivityServer.image.pullSecrets }}
4747
imagePullSecrets:
4848
{{- toYaml . | nindent 10 }}
4949
{{- end }}
@@ -82,8 +82,8 @@ spec:
8282
name: health
8383
{{- with .Values.konnectivityServer.image }}
8484
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
85+
imagePullPolicy: {{ .pullPolicy }}
8586
{{- end }}
86-
imagePullPolicy: {{ .Values.konnectivityServer.image.PullPolicy }}
8787
livenessProbe:
8888
failureThreshold: 8
8989
httpGet:

‎deploy/helm/kubernetes/templates/kubeadm-job.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
affinity:
4444
{{- toYaml . | nindent 8 }}
4545
{{- end }}
46-
{{- with .Values.admin.image.PullSecrets }}
46+
{{- with .Values.admin.image.pullSecrets }}
4747
imagePullSecrets:
4848
{{- toYaml . | nindent 10 }}
4949
{{- end }}
@@ -53,8 +53,8 @@ spec:
5353
- name: kubeadm
5454
{{- with .Values.admin.image }}
5555
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
56+
imagePullPolicy: {{ .pullPolicy }}
5657
{{- end }}
57-
imagePullPolicy: {{ .Values.admin.image.PullPolicy }}
5858
command: [ '/scripts/configure-cluster.sh' ]
5959
env:
6060
- name: KUBECONFIG

‎deploy/helm/kubernetes/templates/scheduler-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
affinity:
4444
{{- toYaml . | nindent 8 }}
4545
{{- end }}
46-
{{- with .Values.scheduler.image.PullSecrets }}
46+
{{- with .Values.scheduler.image.pullSecrets }}
4747
imagePullSecrets:
4848
{{- toYaml . | nindent 10 }}
4949
{{- end }}
@@ -64,8 +64,8 @@ spec:
6464
{{- end }}
6565
{{- with .Values.scheduler.image }}
6666
image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
67+
imagePullPolicy: {{ .pullPolicy }}
6768
{{- end }}
68-
imagePullPolicy: {{ .Values.scheduler.image.PullPolicy }}
6969
livenessProbe:
7070
failureThreshold: 8
7171
httpGet:

0 commit comments

Comments
 (0)