Skip to content

Commit b24c409

Browse files
committed
Update Helm release etcd to v12
Signed-off-by: Renovate Bot <[email protected]>
1 parent 6def9cf commit b24c409

File tree

8 files changed

+226
-17
lines changed

8 files changed

+226
-17
lines changed

class/defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ parameters:
2323
charts:
2424
etcd:
2525
source: https://charts.bitnami.com/bitnami
26-
version: "9.1.0"
26+
version: "12.0.18"
2727

2828
helm_release_name: ${_instance}
2929
helm_values:
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
apiVersion: networking.k8s.io/v1
2+
kind: NetworkPolicy
3+
metadata:
4+
labels:
5+
app.kubernetes.io/component: etcd
6+
app.kubernetes.io/instance: etcd
7+
app.kubernetes.io/managed-by: Helm
8+
app.kubernetes.io/name: etcd
9+
app.kubernetes.io/version: 3.6.4
10+
helm.sh/chart: etcd-12.0.18
11+
name: etcd
12+
namespace: syn-etcd
13+
spec:
14+
egress:
15+
- {}
16+
ingress:
17+
- ports:
18+
- port: 2379
19+
- port: 2380
20+
podSelector:
21+
matchLabels:
22+
app.kubernetes.io/component: etcd
23+
app.kubernetes.io/instance: etcd
24+
app.kubernetes.io/name: etcd
25+
policyTypes:
26+
- Ingress
27+
- Egress

tests/golden/defaults/etcd/etcd/10_chart/etcd/templates/pdb.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ apiVersion: policy/v1
22
kind: PodDisruptionBudget
33
metadata:
44
labels:
5+
app.kubernetes.io/component: etcd
56
app.kubernetes.io/instance: etcd
67
app.kubernetes.io/managed-by: Helm
78
app.kubernetes.io/name: etcd
8-
helm.sh/chart: etcd-9.1.0
9+
app.kubernetes.io/version: 3.6.4
10+
helm.sh/chart: etcd-12.0.18
911
name: etcd
1012
namespace: syn-etcd
1113
spec:
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
apiVersion: batch/v1
2+
kind: Job
3+
metadata:
4+
annotations:
5+
helm.sh/hook: pre-upgrade
6+
helm.sh/hook-delete-policy: before-hook-creation
7+
labels:
8+
app.kubernetes.io/component: etcd-pre-upgrade-job
9+
app.kubernetes.io/instance: etcd
10+
app.kubernetes.io/managed-by: Helm
11+
app.kubernetes.io/name: etcd
12+
app.kubernetes.io/version: 3.6.4
13+
helm.sh/chart: etcd-12.0.18
14+
name: etcd-pre-upgrade
15+
namespace: syn-etcd
16+
spec:
17+
template:
18+
metadata:
19+
annotations: null
20+
labels:
21+
app.kubernetes.io/component: etcd-pre-upgrade-job
22+
app.kubernetes.io/instance: etcd
23+
app.kubernetes.io/managed-by: Helm
24+
app.kubernetes.io/name: etcd
25+
app.kubernetes.io/version: 3.6.4
26+
helm.sh/chart: etcd-12.0.18
27+
spec:
28+
affinity:
29+
nodeAffinity: null
30+
podAffinity: null
31+
podAntiAffinity:
32+
preferredDuringSchedulingIgnoredDuringExecution:
33+
- podAffinityTerm:
34+
labelSelector:
35+
matchLabels:
36+
app.kubernetes.io/component: etcd-pre-upgrade-job
37+
app.kubernetes.io/instance: etcd
38+
app.kubernetes.io/name: etcd
39+
topologyKey: kubernetes.io/hostname
40+
weight: 1
41+
automountServiceAccountToken: false
42+
containers:
43+
- args:
44+
- /opt/bitnami/scripts/etcd/preupgrade.sh
45+
command:
46+
- /opt/bitnami/scripts/etcd/entrypoint.sh
47+
env:
48+
- name: BITNAMI_DEBUG
49+
value: 'false'
50+
- name: ETCD_ON_K8S
51+
value: 'yes'
52+
- name: ETCD_DATA_DIR
53+
value: /bitnami/etcd/data
54+
- name: ETCD_ROOT_PASSWORD_FILE
55+
value: /opt/bitnami/etcd/secrets/password
56+
- name: ETCD_INITIAL_CLUSTER
57+
value: etcd-0=https://etcd-0.etcd-headless.syn-etcd.svc.cluster.local:2379
58+
- name: ETCD_CERT_FILE
59+
value: /opt/bitnami/etcd/certs/client/cert.pem
60+
- name: ETCD_KEY_FILE
61+
value: /opt/bitnami/etcd/certs/client/key.pem
62+
- name: ETCD_EXTRA_AUTH_FLAGS
63+
value: --insecure-skip-tls-verify
64+
envFrom: null
65+
image: docker.io/bitnamilegacy/etcd:3.5.21-debian-12-r6
66+
imagePullPolicy: IfNotPresent
67+
name: pre-upgrade-job
68+
resources:
69+
limits:
70+
cpu: 375m
71+
ephemeral-storage: 2Gi
72+
memory: 384Mi
73+
requests:
74+
cpu: 250m
75+
ephemeral-storage: 50Mi
76+
memory: 256Mi
77+
securityContext:
78+
allowPrivilegeEscalation: false
79+
capabilities:
80+
add: []
81+
drop:
82+
- ALL
83+
privileged: false
84+
readOnlyRootFilesystem: true
85+
runAsGroup: 1001
86+
runAsNonRoot: true
87+
runAsUser: 1001
88+
seLinuxOptions: {}
89+
seccompProfile:
90+
type: RuntimeDefault
91+
volumeMounts:
92+
- mountPath: /opt/bitnami/etcd/conf/
93+
name: empty-dir
94+
subPath: app-conf-dir
95+
- mountPath: /tmp
96+
name: empty-dir
97+
subPath: tmp-dir
98+
- mountPath: /opt/bitnami/etcd/certs/token/
99+
name: etcd-jwt-token
100+
readOnly: true
101+
- mountPath: /opt/bitnami/etcd/certs/client/
102+
name: etcd-client-certs
103+
readOnly: true
104+
- mountPath: /opt/bitnami/etcd/secrets
105+
name: etcd-secrets
106+
restartPolicy: Never
107+
securityContext:
108+
fsGroup: 1001
109+
fsGroupChangePolicy: Always
110+
supplementalGroups: []
111+
sysctls: []
112+
volumes:
113+
- emptyDir: {}
114+
name: empty-dir
115+
- name: etcd-jwt-token
116+
secret:
117+
defaultMode: 256
118+
secretName: etcd-etcd-token-private-key
119+
- name: etcd-client-certs
120+
secret:
121+
defaultMode: 256
122+
secretName: etcd-etcd-client-auth
123+
- name: etcd-secrets
124+
projected:
125+
sources:
126+
- secret:
127+
name: etcd-etcd-root-auth
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: v1
2+
automountServiceAccountToken: false
3+
kind: ServiceAccount
4+
metadata:
5+
labels:
6+
app.kubernetes.io/instance: etcd
7+
app.kubernetes.io/managed-by: Helm
8+
app.kubernetes.io/name: etcd
9+
app.kubernetes.io/version: 3.6.4
10+
helm.sh/chart: etcd-12.0.18
11+
name: etcd
12+
namespace: syn-etcd

tests/golden/defaults/etcd/etcd/10_chart/etcd/templates/statefulset.yaml

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ metadata:
66
app.kubernetes.io/instance: etcd
77
app.kubernetes.io/managed-by: Helm
88
app.kubernetes.io/name: etcd
9-
helm.sh/chart: etcd-9.1.0
9+
app.kubernetes.io/version: 3.6.4
10+
helm.sh/chart: etcd-12.0.18
1011
name: etcd
1112
namespace: syn-etcd
1213
spec:
@@ -26,7 +27,8 @@ spec:
2627
app.kubernetes.io/instance: etcd
2728
app.kubernetes.io/managed-by: Helm
2829
app.kubernetes.io/name: etcd
29-
helm.sh/chart: etcd-9.1.0
30+
app.kubernetes.io/version: 3.6.4
31+
helm.sh/chart: etcd-12.0.18
3032
spec:
3133
affinity:
3234
nodeAffinity: null
@@ -36,10 +38,12 @@ spec:
3638
- podAffinityTerm:
3739
labelSelector:
3840
matchLabels:
41+
app.kubernetes.io/component: etcd
3942
app.kubernetes.io/instance: etcd
4043
app.kubernetes.io/name: etcd
4144
topologyKey: kubernetes.io/hostname
4245
weight: 1
46+
automountServiceAccountToken: false
4347
containers:
4448
- env:
4549
- name: BITNAMI_DEBUG
@@ -54,8 +58,6 @@ spec:
5458
fieldPath: metadata.name
5559
- name: MY_STS_NAME
5660
value: etcd
57-
- name: ETCDCTL_API
58-
value: '3'
5961
- name: ETCD_ON_K8S
6062
value: 'yes'
6163
- name: ETCD_START_FROM_SNAPSHOT
@@ -70,11 +72,8 @@ spec:
7072
value: info
7173
- name: ALLOW_NONE_AUTHENTICATION
7274
value: 'no'
73-
- name: ETCD_ROOT_PASSWORD
74-
valueFrom:
75-
secretKeyRef:
76-
key: password
77-
name: etcd-etcd-root-auth
75+
- name: ETCD_ROOT_PASSWORD_FILE
76+
value: /opt/bitnami/etcd/secrets/password
7877
- name: ETCD_AUTH_TOKEN
7978
value: jwt,priv-key=/opt/bitnami/etcd/certs/token/jwt-token.pem,sign-method=RS256,ttl=10m
8079
- name: ETCD_ADVERTISE_CLIENT_URLS
@@ -85,6 +84,10 @@ spec:
8584
value: https://$(MY_POD_NAME).etcd-headless.syn-etcd.svc.cluster.local:2380
8685
- name: ETCD_LISTEN_PEER_URLS
8786
value: https://0.0.0.0:2380
87+
- name: ETCD_INITIAL_CLUSTER_TOKEN
88+
value: etcd-cluster-k8s
89+
- name: ETCD_INITIAL_CLUSTER
90+
value: etcd-0=https://etcd-0.etcd-headless.syn-etcd.svc.cluster.local:2380
8891
- name: ETCD_CLUSTER_DOMAIN
8992
value: etcd-headless.syn-etcd.svc.cluster.local
9093
- name: ETCD_CERT_FILE
@@ -125,13 +128,34 @@ spec:
125128
successThreshold: 1
126129
timeoutSeconds: 5
127130
resources:
128-
limits: {}
129-
requests: {}
131+
limits:
132+
cpu: 375m
133+
ephemeral-storage: 2Gi
134+
memory: 384Mi
135+
requests:
136+
cpu: 250m
137+
ephemeral-storage: 50Mi
138+
memory: 256Mi
130139
securityContext:
131140
allowPrivilegeEscalation: false
141+
capabilities:
142+
drop:
143+
- ALL
144+
privileged: false
145+
readOnlyRootFilesystem: true
146+
runAsGroup: 1001
132147
runAsNonRoot: true
133148
runAsUser: 1001
149+
seLinuxOptions: {}
150+
seccompProfile:
151+
type: RuntimeDefault
134152
volumeMounts:
153+
- mountPath: /opt/bitnami/etcd/conf/
154+
name: empty-dir
155+
subPath: app-conf-dir
156+
- mountPath: /tmp
157+
name: empty-dir
158+
subPath: tmp-dir
135159
- mountPath: /bitnami/etcd
136160
name: data
137161
- mountPath: /opt/bitnami/etcd/certs/token/
@@ -143,10 +167,17 @@ spec:
143167
- mountPath: /opt/bitnami/etcd/certs/peer/
144168
name: etcd-peer-certs
145169
readOnly: true
170+
- mountPath: /opt/bitnami/etcd/secrets
171+
name: etcd-secrets
146172
securityContext:
147173
fsGroup: 1001
148-
serviceAccountName: default
174+
fsGroupChangePolicy: Always
175+
supplementalGroups: []
176+
sysctls: []
177+
serviceAccountName: etcd
149178
volumes:
179+
- emptyDir: {}
180+
name: empty-dir
150181
- name: etcd-jwt-token
151182
secret:
152183
defaultMode: 256
@@ -159,6 +190,11 @@ spec:
159190
secret:
160191
defaultMode: 256
161192
secretName: etcd-etcd-peer-auth
193+
- name: etcd-secrets
194+
projected:
195+
sources:
196+
- secret:
197+
name: etcd-etcd-root-auth
162198
updateStrategy:
163199
type: RollingUpdate
164200
volumeClaimTemplates:

tests/golden/defaults/etcd/etcd/10_chart/etcd/templates/svc-headless.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ metadata:
44
annotations:
55
service.alpha.kubernetes.io/tolerate-unready-endpoints: 'true'
66
labels:
7+
app.kubernetes.io/component: etcd
78
app.kubernetes.io/instance: etcd
89
app.kubernetes.io/managed-by: Helm
910
app.kubernetes.io/name: etcd
10-
helm.sh/chart: etcd-9.1.0
11+
app.kubernetes.io/version: 3.6.4
12+
helm.sh/chart: etcd-12.0.18
1113
name: etcd-headless
1214
namespace: syn-etcd
1315
spec:
@@ -21,6 +23,7 @@ spec:
2123
targetPort: peer
2224
publishNotReadyAddresses: true
2325
selector:
26+
app.kubernetes.io/component: etcd
2427
app.kubernetes.io/instance: etcd
2528
app.kubernetes.io/name: etcd
2629
type: ClusterIP

tests/golden/defaults/etcd/etcd/10_chart/etcd/templates/svc.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
annotations: null
54
labels:
5+
app.kubernetes.io/component: etcd
66
app.kubernetes.io/instance: etcd
77
app.kubernetes.io/managed-by: Helm
88
app.kubernetes.io/name: etcd
9-
helm.sh/chart: etcd-9.1.0
9+
app.kubernetes.io/version: 3.6.4
10+
helm.sh/chart: etcd-12.0.18
1011
name: etcd
1112
namespace: syn-etcd
1213
spec:
@@ -20,6 +21,7 @@ spec:
2021
port: 2380
2122
targetPort: peer
2223
selector:
24+
app.kubernetes.io/component: etcd
2325
app.kubernetes.io/instance: etcd
2426
app.kubernetes.io/name: etcd
2527
sessionAffinity: None

0 commit comments

Comments
 (0)