Merge branch 'release-0.9.0'

aenix-io · Jan 21, 2021 · ec10153 · ec10153
2 parents 46be4eb + 640d565
commit ec10153
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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,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/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
@@ -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
@@ -14,9 +14,9 @@ etcd:
   enabled: true
   image:
     repository: k8s.gcr.io/etcd
-    tag: 3.4.9-1
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    tag: 3.4.13-0
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 3
   resources:
     requests:
@@ -64,9 +64,9 @@ apiServer:
   enabled: true
   image:
     repository: k8s.gcr.io/kube-apiserver
-    tag: v1.19.3
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    tag: v1.20.2
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -111,9 +111,9 @@ controllerManager:
   enabled: true
   image:
     repository: k8s.gcr.io/kube-controller-manager
-    tag: v1.19.3
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    tag: v1.20.2
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -149,9 +149,9 @@ scheduler:
   enabled: true
   image:
     repository: k8s.gcr.io/kube-scheduler
-    tag: v1.19.3
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    tag: v1.20.2
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -186,10 +186,10 @@ scheduler:
 admin:
   enabled: true
   image:
-    repository: docker.io/kvaps/kubernetes-tools
-    tag: v1.19.3
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    repository: ghcr.io/kvaps/kubernetes-tools
+    tag: v0.9.0
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 1
   resources:
     requests:
@@ -227,9 +227,9 @@ konnectivityServer:
   enabled: false
   image:
     repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-server
-    tag: v0.0.12
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    tag: v0.0.14
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -276,9 +276,9 @@ konnectivityAgent:
   enabled: false
   image:
     repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent
-    tag: v0.0.12
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    tag: v0.0.14
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   hostNetwork: true
 

diff --git a/docs/README.md 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