Skip to content

Commit 63358e3

Browse files
authored
Recreate etcd pods and certificates on update (#675)
Since updating from 2.5.0 to 2.6.0 renews all certificates including the trusted CAs for etcd, all etcd pods need a restart. As many people had problems with their etcds post-update, we decided to script the procedure, so the renewal of certs and pods is done automatically and in a predictable order. The hook fires when upgrading from <2.6.0 to >=2.6.1. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced pre- and post-upgrade tasks for the etcd package. - Added supporting resources, including roles, role bindings, service accounts, and a ConfigMap to facilitate smoother upgrade operations. - **Chores** - Updated the application version from 2.6.0 to 2.6.1. - Revised version mapping entries to reflect the updated release. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent 063439a commit 63358e3

7 files changed

Lines changed: 96 additions & 2 deletions

File tree

‎packages/extra/etcd/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ name: etcd
33
description: Storage for Kubernetes clusters
44
icon: /logos/etcd.svg
55
type: application
6-
version: 2.6.0
6+
version: 2.6.1
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{{- $shouldUpdateCerts := true }}
2+
{{- $configMap := lookup "v1" "ConfigMap" .Release.Namespace "etcd-deployed-version" }}
3+
{{- if $configMap }}
4+
{{- $deployedVersion := index $configMap "data" "version" }}
5+
{{- if $deployedVersion | semverCompare ">= 2.6.1" }}
6+
{{- $shouldUpdateCerts = false }}
7+
{{- end }}
8+
{{- end }}
9+
10+
{{- if $shouldUpdateCerts }}
11+
---
12+
apiVersion: batch/v1
13+
kind: Job
14+
metadata:
15+
name: etcd-hook
16+
annotations:
17+
helm.sh/hook: post-upgrade
18+
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
19+
spec:
20+
template:
21+
metadata:
22+
labels:
23+
policy.cozystack.io/allow-to-apiserver: "true"
24+
spec:
25+
serviceAccountName: etcd-hook
26+
containers:
27+
- name: kubectl
28+
image: bitnami/kubectl:latest
29+
command:
30+
- sh
31+
args:
32+
- -exc
33+
- |-
34+
kubectl --namespace={{ .Release.Namespace }} delete secrets etcd-ca-tls etcd-peer-ca-tls
35+
sleep 10
36+
kubectl --namespace={{ .Release.Namespace }} delete secrets etcd-client-tls etcd-peer-tls etcd-server-tls
37+
kubectl --namespace={{ .Release.Namespace }} delete pods --selector=app.kubernetes.io/instance=etcd,app.kubernetes.io/managed-by=etcd-operator,app.kubernetes.io/name=etcd,cozystack.io/service=etcd
38+
restartPolicy: Never
39+
{{- end }}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
annotations:
5+
helm.sh/hook: post-upgrade
6+
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
7+
name: etcd-hook
8+
rules:
9+
- apiGroups:
10+
- ""
11+
resources:
12+
- secrets
13+
- pods
14+
verbs:
15+
- get
16+
- list
17+
- watch
18+
- delete
19+
- apiGroups:
20+
- ""
21+
resources:
22+
- configmaps
23+
verbs:
24+
- get
25+
- list
26+
- watch
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: RoleBinding
3+
metadata:
4+
name: etcd-hook
5+
annotations:
6+
helm.sh/hook: post-upgrade
7+
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
8+
roleRef:
9+
apiGroup: rbac.authorization.k8s.io
10+
kind: Role
11+
name: etcd-hook
12+
subjects:
13+
- kind: ServiceAccount
14+
name: etcd-hook
15+
namespace: {{ .Release.Namespace | quote }}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: etcd-hook
5+
annotations:
6+
helm.sh/hook: post-upgrade
7+
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: etcd-deployed-version
5+
data:
6+
version: {{ .Chart.Version }}

‎packages/extra/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ etcd 2.2.0 5ca8823
77
etcd 2.3.0 b908400d
88
etcd 2.4.0 cb7b8158
99
etcd 2.5.0 861e6c46
10-
etcd 2.6.0 HEAD
10+
etcd 2.6.0 a7425b0
11+
etcd 2.6.1 HEAD
1112
info 1.0.0 HEAD
1213
ingress 1.0.0 f642698
1314
ingress 1.1.0 838bee5d

0 commit comments

Comments
 (0)