feat: first stab at Kubernetes 1.20 kubeadm config

This commit is contained in:
Stefan Reimer 2021-04-15 15:51:46 +02:00
parent 882165cc58
commit adb54b7663
6 changed files with 19 additions and 19 deletions

View File

@ -42,6 +42,7 @@ apiServer:
audit-log-maxage: "7" audit-log-maxage: "7"
audit-log-maxsize: "100" audit-log-maxsize: "100"
audit-log-maxbackup: "3" audit-log-maxbackup: "3"
audit-log-compress: "true"
tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
admission-control-config-file: /etc/kubernetes/apiserver/admission-configuration.yaml admission-control-config-file: /etc/kubernetes/apiserver/admission-configuration.yaml
{{- if eq .Values.platform "aws" }} {{- if eq .Values.platform "aws" }}

View File

@ -1,3 +1,4 @@
# https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/
apiVersion: kubelet.config.k8s.io/v1beta1 apiVersion: kubelet.config.k8s.io/v1beta1
kind: KubeletConfiguration kind: KubeletConfiguration
metadata: metadata:
@ -22,14 +23,15 @@ featureGates: {{ include "kubeadm.featuregates" ( dict "return" "map" "platform"
podsPerCore: 20 podsPerCore: 20
# cpuCFSQuotaPeriod: 10ms # cpuCFSQuotaPeriod: 10ms
# Basic OS on Ubuntu 20.04 incl. crio # Basic OS on Ubuntu 20.04 incl. crio
#systemReserved: systemReserved:
# memory: 256Mi memory: 256Mi
# This should be dynamic based on number of maxpods and available cores ephemeral-storage: "2Gi"
# https://cloud.google.com/kubernetes-engine/docs/concepts/cluster-architecture#memory_cpu # kubelet memory should be static as runc,conmon are added to each pod's cgroup
# Below are default minimal for 2 cores and minimum kubelet
kubeReserved: kubeReserved:
cpu: 70m cpu: 70m
# memory: 128Mi memory: 128Mi
# Lets use below to reserve memory for system processes as kubeReserved/sytemReserved doesnt go well with systemd it seems # Lets use below to reserve memory for system processes as kubeReserved/sytemReserved doesnt go well with systemd it seems
evictionHard: #evictionHard:
memory.available: "484Mi" # memory.available: "484Mi"
imageGCLowThresholdPercent: 70
kernelMemcgNotification: true

View File

@ -2,17 +2,14 @@
Feature gates for all control plane components Feature gates for all control plane components
*/ -}} */ -}}
{{- define "kubeadm.featuregates" -}} {{- define "kubeadm.featuregates" -}}
{{- $gates := dict "DefaultPodTopologySpread" "true" "CustomCPUCFSQuotaPeriod" "true" "GenericEphemeralVolume" "true" }} {{- $gates := list "CustomCPUCFSQuotaPeriod" "GenericEphemeralVolume" "CSIMigrationAWSComplete" "CSIMigrationAzureDiskComplete" "CSIMigrationAzureFileComplete" "CSIMigrationGCEComplete" "CSIMigrationOpenStackComplete" "CSIMigrationvSphereComplete" }}
{{- if eq .platform "aws" }}
{{- $gates = merge $gates ( dict "CSIMigrationAWS" "true" "CSIMigrationAWSComplete" "true") }}
{{- end }}
{{- if eq .return "csv" }} {{- if eq .return "csv" }}
{{- range $key, $val := $gates }} {{- range $key := $gates }}
{{- $key }}={{- $val }}, {{- $key }}=true,
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- range $key, $val := $gates }} {{- range $key := $gates }}
{{ $key }}: {{ $val }} {{ $key }}: true
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}

View File

@ -3,5 +3,5 @@ spec:
- name: etcd - name: etcd
resources: resources:
requests: requests:
cpu: 250m cpu: 200m
memory: 192Mi memory: 192Mi

View File

@ -3,5 +3,5 @@ spec:
- name: kube-apiserver - name: kube-apiserver
resources: resources:
requests: requests:
cpu: 250m cpu: 200m
memory: 1Gi memory: 1Gi

View File

@ -3,5 +3,5 @@ spec:
- name: kube-controller-manager - name: kube-controller-manager
resources: resources:
requests: requests:
cpu: 200m cpu: 100m
memory: 128Mi memory: 128Mi