From 26edea9b735a8782abce5078a7d1ff6c81836807 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 20 Jan 2021 16:49:31 +0100 Subject: [PATCH 1/5] update kubernetes v1.20.2 --- README.md | 2 +- build/tools/Dockerfile | 2 +- deploy/helm/kubernetes/Chart.yaml | 4 ++-- .../templates/konnectivity-server-deployment.yaml | 2 +- deploy/helm/kubernetes/values.yaml | 8 ++++---- docs/README.md | 7 +++++++ 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 docs/README.md diff --git a/README.md b/README.md index 261ac31..c97fcba 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Deploy Kubernetes in Kubernetes using Helm ```bash helm repo add kvaps https://kvaps.github.io/charts -helm install foo kvaps/kubernetes --version 0.8.0 \ +helm install foo kvaps/kubernetes --version 0.9.0 \ --namespace foo \ --create-namespace \ --set persistence.storageClassName=local-path diff --git a/build/tools/Dockerfile b/build/tools/Dockerfile index c82fa1f..bd12384 100644 --- a/build/tools/Dockerfile +++ b/build/tools/Dockerfile @@ -1,7 +1,7 @@ FROM docker.io/library/alpine:3.12 RUN apk add --no-cache openssl -ARG VERSION=v1.19.3 +ARG VERSION=v1.20.2 RUN wget "https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl" \ -O /usr/local/bin/kubectl \ && chmod +x /usr/local/bin/kubectl diff --git a/deploy/helm/kubernetes/Chart.yaml b/deploy/helm/kubernetes/Chart.yaml index e1604de..8ab02d5 100644 --- a/deploy/helm/kubernetes/Chart.yaml +++ b/deploy/helm/kubernetes/Chart.yaml @@ -1,7 +1,7 @@ name: kubernetes description: Production-Grade Container Scheduling and Management -version: 0.8.0 -appVersion: 1.19.3 +version: 0.9.0 +appVersion: v1.20.2 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Kubernetes_logo_without_workmark.svg/723px-Kubernetes_logo_without_workmark.svg.png keywords: - kubernetes diff --git a/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml b/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml index b0f7d62..c673379 100644 --- a/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml +++ b/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml @@ -82,8 +82,8 @@ spec: name: health {{- with .Values.konnectivityServer.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .PullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.konnectivityServer.image.PullPolicy }} livenessProbe: failureThreshold: 8 httpGet: diff --git a/deploy/helm/kubernetes/values.yaml b/deploy/helm/kubernetes/values.yaml index d6cc428..b7cf18e 100644 --- a/deploy/helm/kubernetes/values.yaml +++ b/deploy/helm/kubernetes/values.yaml @@ -64,7 +64,7 @@ apiServer: enabled: true image: repository: k8s.gcr.io/kube-apiserver - tag: v1.19.3 + tag: v1.20.2 PullPolicy: IfNotPresent PullSecrets: [] replicaCount: 2 @@ -111,7 +111,7 @@ controllerManager: enabled: true image: repository: k8s.gcr.io/kube-controller-manager - tag: v1.19.3 + tag: v1.20.2 PullPolicy: IfNotPresent PullSecrets: [] replicaCount: 2 @@ -149,7 +149,7 @@ scheduler: enabled: true image: repository: k8s.gcr.io/kube-scheduler - tag: v1.19.3 + tag: v1.20.2 PullPolicy: IfNotPresent PullSecrets: [] replicaCount: 2 @@ -187,7 +187,7 @@ admin: enabled: true image: repository: docker.io/kvaps/kubernetes-tools - tag: v1.19.3 + tag: v1.20.2 PullPolicy: IfNotPresent PullSecrets: [] replicaCount: 1 diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..ec4cd28 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,7 @@ +k edit sts generic-kubernetes-etcd # update: --initial-cluster-state=existing + +k exec -ti pod/generic-kubernetes-etcd-0 -- etcdctl member list -w table +k exec -ti pod/generic-kubernetes-etcd-0 -- etcdctl member remove 3d7220137a2218ca + +k exec -ti pod/generic-kubernetes-etcd-0 -- etcdctl member add generic-kubernetes-etcd-2 --peer-urls=https://generic-kubernetes-etcd-2.generic-kubernetes-etcd:2380 +k exec -ti pod/generic-kubernetes-etcd-0 -- etcdctl endpoint status -w table From 56710352bcd8064e1be9a2d42bcba9040aee6bae Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 21 Jan 2021 10:32:51 +0100 Subject: [PATCH 2/5] upd .pullPolicy and .pullSecrets --- .../templates/admin-deployment.yaml | 4 +-- .../templates/apiserver-deployment.yaml | 4 +-- .../controller-manager-deployment.yaml | 4 +-- .../templates/etcd-statefulset.yaml | 4 +-- .../konnectivity-server-deployment.yaml | 4 +-- .../kubernetes/templates/kubeadm-job.yaml | 4 +-- .../templates/scheduler-deployment.yaml | 4 +-- deploy/helm/kubernetes/values.yaml | 28 +++++++++---------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/deploy/helm/kubernetes/templates/admin-deployment.yaml b/deploy/helm/kubernetes/templates/admin-deployment.yaml index 29ac158..e773bb8 100644 --- a/deploy/helm/kubernetes/templates/admin-deployment.yaml +++ b/deploy/helm/kubernetes/templates/admin-deployment.yaml @@ -43,7 +43,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.admin.image.PullSecrets }} + {{- with .Values.admin.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -53,8 +53,8 @@ spec: - command: [ 'sleep', 'infinity' ] {{- with .Values.admin.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .pullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.admin.image.PullPolicy }} name: admin readinessProbe: exec: diff --git a/deploy/helm/kubernetes/templates/apiserver-deployment.yaml b/deploy/helm/kubernetes/templates/apiserver-deployment.yaml index c34c5f5..212b894 100644 --- a/deploy/helm/kubernetes/templates/apiserver-deployment.yaml +++ b/deploy/helm/kubernetes/templates/apiserver-deployment.yaml @@ -45,7 +45,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.apiServer.image.PullSecrets }} + {{- with .Values.apiServer.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -98,8 +98,8 @@ spec: name: client {{- with .Values.apiServer.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .pullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.apiServer.image.PullPolicy }} livenessProbe: failureThreshold: 8 httpGet: diff --git a/deploy/helm/kubernetes/templates/controller-manager-deployment.yaml b/deploy/helm/kubernetes/templates/controller-manager-deployment.yaml index 7c33f10..1d14e57 100644 --- a/deploy/helm/kubernetes/templates/controller-manager-deployment.yaml +++ b/deploy/helm/kubernetes/templates/controller-manager-deployment.yaml @@ -43,7 +43,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.controllerManager.image.PullSecrets }} + {{- with .Values.controllerManager.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -73,8 +73,8 @@ spec: {{- end }} {{- with .Values.controllerManager.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .pullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.controllerManager.image.PullPolicy }} livenessProbe: failureThreshold: 8 httpGet: diff --git a/deploy/helm/kubernetes/templates/etcd-statefulset.yaml b/deploy/helm/kubernetes/templates/etcd-statefulset.yaml index c3e0c89..a214d92 100644 --- a/deploy/helm/kubernetes/templates/etcd-statefulset.yaml +++ b/deploy/helm/kubernetes/templates/etcd-statefulset.yaml @@ -47,7 +47,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.etcd.image.PullSecrets }} + {{- with .Values.etcd.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -97,6 +97,7 @@ spec: {{- end }} {{- with .Values.etcd.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .pullPolicy }} {{- end }} ports: - containerPort: {{ .Values.etcd.ports.client }} @@ -105,7 +106,6 @@ spec: name: peer - containerPort: {{ .Values.etcd.ports.metrics }} name: metrics - imagePullPolicy: {{ .Values.etcd.image.PullPolicy }} livenessProbe: failureThreshold: 8 httpGet: diff --git a/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml b/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml index c673379..1f8a0a9 100644 --- a/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml +++ b/deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml @@ -43,7 +43,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.konnectivityServer.image.PullSecrets }} + {{- with .Values.konnectivityServer.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -82,7 +82,7 @@ spec: name: health {{- with .Values.konnectivityServer.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" - imagePullPolicy: {{ .PullPolicy }} + imagePullPolicy: {{ .pullPolicy }} {{- end }} livenessProbe: failureThreshold: 8 diff --git a/deploy/helm/kubernetes/templates/kubeadm-job.yaml b/deploy/helm/kubernetes/templates/kubeadm-job.yaml index 4363568..1d0980a 100644 --- a/deploy/helm/kubernetes/templates/kubeadm-job.yaml +++ b/deploy/helm/kubernetes/templates/kubeadm-job.yaml @@ -43,7 +43,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.admin.image.PullSecrets }} + {{- with .Values.admin.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -53,8 +53,8 @@ spec: - name: kubeadm {{- with .Values.admin.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .pullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.admin.image.PullPolicy }} command: [ '/scripts/configure-cluster.sh' ] env: - name: KUBECONFIG diff --git a/deploy/helm/kubernetes/templates/scheduler-deployment.yaml b/deploy/helm/kubernetes/templates/scheduler-deployment.yaml index faf302b..259ebf1 100644 --- a/deploy/helm/kubernetes/templates/scheduler-deployment.yaml +++ b/deploy/helm/kubernetes/templates/scheduler-deployment.yaml @@ -43,7 +43,7 @@ spec: affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.scheduler.image.PullSecrets }} + {{- with .Values.scheduler.image.pullSecrets }} imagePullSecrets: {{- toYaml . | nindent 10 }} {{- end }} @@ -64,8 +64,8 @@ spec: {{- end }} {{- with .Values.scheduler.image }} image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}" + imagePullPolicy: {{ .pullPolicy }} {{- end }} - imagePullPolicy: {{ .Values.scheduler.image.PullPolicy }} livenessProbe: failureThreshold: 8 httpGet: diff --git a/deploy/helm/kubernetes/values.yaml b/deploy/helm/kubernetes/values.yaml index b7cf18e..ea55cd0 100644 --- a/deploy/helm/kubernetes/values.yaml +++ b/deploy/helm/kubernetes/values.yaml @@ -15,8 +15,8 @@ etcd: image: repository: k8s.gcr.io/etcd tag: 3.4.9-1 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 3 resources: requests: @@ -65,8 +65,8 @@ apiServer: image: repository: k8s.gcr.io/kube-apiserver tag: v1.20.2 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 2 resources: requests: @@ -112,8 +112,8 @@ controllerManager: image: repository: k8s.gcr.io/kube-controller-manager tag: v1.20.2 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 2 resources: requests: @@ -150,8 +150,8 @@ scheduler: image: repository: k8s.gcr.io/kube-scheduler tag: v1.20.2 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 2 resources: requests: @@ -188,8 +188,8 @@ admin: image: repository: docker.io/kvaps/kubernetes-tools tag: v1.20.2 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 1 resources: requests: @@ -228,8 +228,8 @@ konnectivityServer: image: repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-server tag: v0.0.12 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 2 resources: requests: @@ -277,8 +277,8 @@ konnectivityAgent: image: repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent tag: v0.0.12 - PullPolicy: IfNotPresent - PullSecrets: [] + pullPolicy: IfNotPresent + pullSecrets: [] replicaCount: 2 hostNetwork: true From 989f7b25583b011eb6ed11bb3478380f77037d8c Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 21 Jan 2021 11:18:02 +0100 Subject: [PATCH 3/5] update Konnectivity --- deploy/helm/kubernetes/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/kubernetes/values.yaml b/deploy/helm/kubernetes/values.yaml index ea55cd0..8812df0 100644 --- a/deploy/helm/kubernetes/values.yaml +++ b/deploy/helm/kubernetes/values.yaml @@ -227,7 +227,7 @@ konnectivityServer: enabled: false image: repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-server - tag: v0.0.12 + tag: v0.0.14 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 2 @@ -276,7 +276,7 @@ konnectivityAgent: enabled: false image: repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent - tag: v0.0.12 + tag: v0.0.14 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 2 From 0a484d8f7d332cf91449942a1fe528c72da9250d Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 21 Jan 2021 11:26:25 +0100 Subject: [PATCH 4/5] upd etcd version --- deploy/helm/kubernetes/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/kubernetes/values.yaml b/deploy/helm/kubernetes/values.yaml index 8812df0..e9beda6 100644 --- a/deploy/helm/kubernetes/values.yaml +++ b/deploy/helm/kubernetes/values.yaml @@ -14,7 +14,7 @@ etcd: enabled: true image: repository: k8s.gcr.io/etcd - tag: 3.4.9-1 + tag: 3.4.13-0 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 3 From 640d5658eefbdbe51a73f57b6ad7fa5030a143de Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 21 Jan 2021 11:50:56 +0100 Subject: [PATCH 5/5] upd kubernetes-tools registry --- deploy/helm/kubernetes/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/kubernetes/values.yaml b/deploy/helm/kubernetes/values.yaml index e9beda6..09e205b 100644 --- a/deploy/helm/kubernetes/values.yaml +++ b/deploy/helm/kubernetes/values.yaml @@ -186,8 +186,8 @@ scheduler: admin: enabled: true image: - repository: docker.io/kvaps/kubernetes-tools - tag: v1.20.2 + repository: ghcr.io/kvaps/kubernetes-tools + tag: v0.9.0 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1