ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 26 Packages Projects Releases Wiki Activity

fix: all upgrade_120.sh to run more than once

Browse Source
This commit is contained in:
Stefan Reimer 2021-07-16 22:41:02 +02:00
parent 1c16122184
commit 74b8e59fa4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubeadm/templates/ClusterConfiguration.yaml
View File

@ -68,6 +68,8 @@ apiServer:
api-audiences: "istio-ca" api-audiences: "istio-ca"
{{- end }} {{- end }}
feature-gates: {{ include "kubeadm.featuregates" ( dict "return" "csv" "platform" .Values.platform ) | trimSuffix "," | quote }} feature-gates: {{ include "kubeadm.featuregates" ( dict "return" "csv" "platform" .Values.platform ) | trimSuffix "," | quote }}
# for 1.21
# enable-admission-plugins: DenyServiceExternalIPs,NodeRestriction,EventRateLimit
enable-admission-plugins: NodeRestriction,EventRateLimit enable-admission-plugins: NodeRestriction,EventRateLimit
# {{- if .Values.highAvailable }} # {{- if .Values.highAvailable }}
# goaway-chance: ".001" # goaway-chance: ".001"

1
scripts/upgrade_120.sh
View File

@ -79,6 +79,7 @@ spec:
echo "Patching ClusterConfig to re-create new etcd server certificates" echo "Patching ClusterConfig to re-create new etcd server certificates"
yq w /etc/kubezero/kubeadm/templates/ClusterConfiguration.yaml etcd.local.serverCertSANs[+] $nodename > /etc/kubernetes/kubeadm-recert.yaml yq w /etc/kubezero/kubeadm/templates/ClusterConfiguration.yaml etcd.local.serverCertSANs[+] $nodename > /etc/kubernetes/kubeadm-recert.yaml
yq w -i /etc/kubernetes/kubeadm-recert.yaml etcd.local.serverCertSANs[+] $nodename.$zone_name
rm -f /etc/kubernetes/pki/etcd/server.* rm -f /etc/kubernetes/pki/etcd/server.*
kubeadm init phase certs etcd-server --config=/etc/kubernetes/kubeadm-recert.yaml 2>/dev/null kubeadm init phase certs etcd-server --config=/etc/kubernetes/kubeadm-recert.yaml 2>/dev/null
kill -s HUP $(ps -e | grep etcd | awk '{print $1}') kill -s HUP $(ps -e | grep etcd | awk '{print $1}')