Skip to content

Commit 5bfe973

Browse files
mipietamipieta
committed
feat(sidecar): allow more than one container per pod
1 parent 104e22a commit 5bfe973

File tree

10 files changed

+169
-70
lines changed

10 files changed

+169
-70
lines changed

‎dotnet/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
description: .NET Core Helm Chart
33
name: dotnet
4-
version: 13.0.1
4+
version: 13.1.0
55
dependencies:
66
- name: libchart
7-
version: 4.0.1
7+
version: 4.2.0
88
repository: file://../libchart

‎golang/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
description: golan Helm Chart
33
name: golang
4-
version: 17.0.1
4+
version: 17.1.0
55
dependencies:
66
- name: libchart
7-
version: 4.0.1
7+
version: 4.2.0
88
repository: file://../libchart

‎java/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
description: Java Helm Chart
33
name: java
4-
version: 10.0.1
4+
version: 10.1.0
55
dependencies:
66
- name: libchart
7-
version: 4.0.1
7+
version: 4.2.0
88
repository: file://../libchart

‎java/values.yaml

+43-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,49 @@ image:
1313
# pullSecrets:
1414
# - secret1
1515
# - secret2
16-
16+
sidecars:
17+
- name: helper1
18+
image:
19+
repository: "repo"
20+
tag: "123"
21+
extraContainerPorts: [8088, 9099]
22+
securityContext:
23+
readOnlyRootFilesystem: true
24+
allowPrivilegeEscalation: false
25+
resources:
26+
limits:
27+
cpu: 100m
28+
memory: 128Mi
29+
requests:
30+
cpu: 100m
31+
memory: 128Mi
32+
environment: { }
33+
secrets: { }
34+
volumeMounts: [ ]
35+
# - name: secret-volume
36+
# mountPath: /app/secrets
37+
# readOnly: true
38+
- name: helper2
39+
image:
40+
repository: "repo"
41+
tag: "456"
42+
extraContainerPorts: [8088, 9099]
43+
securityContext:
44+
readOnlyRootFilesystem: true
45+
allowPrivilegeEscalation: false
46+
resources:
47+
limits:
48+
cpu: 100m
49+
memory: 128Mi
50+
requests:
51+
cpu: 100m
52+
memory: 128Mi
53+
environment: { }
54+
secrets: { }
55+
volumeMounts:
56+
- name: secret-volume
57+
mountPath: /app/secrets
58+
readOnly: true
1759
nameOverride: ""
1860
fullnameOverride: ""
1961

‎libchart/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: library
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 4.0.1
18+
version: 4.2.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎libchart/templates/_container.tpl

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{{- define "libchart.container" }}
2+
image: "{{ .image.repository }}:{{ .image.tag }}"
3+
imagePullPolicy: Always
4+
{{- if .command }}
5+
command:
6+
{{ toYaml .command | nindent 6 }}
7+
{{- end }}
8+
{{- if .args }}
9+
args:
10+
{{ toYaml .args | nindent 6 }}
11+
{{- end }}
12+
{{- if or (.volumeMounts) (.csi) }}
13+
volumeMounts:
14+
{{- if .volumeMounts }}
15+
{{- toYaml .volumeMounts | nindent 6 }}
16+
{{- end }}
17+
{{- if .csi }}
18+
- name: {{ .csi.name }}
19+
mountPath: {{ .csi.mountPath | quote }}
20+
readOnly: true
21+
{{- end }}
22+
{{- end }}
23+
ports:
24+
{{- if .deployKind }} {{/* a hack to check if we are in the root context or in a sidecar; sidecars are not using the port mapping from the service */}}
25+
{{- "- name: http" | nindent 4 }}
26+
{{- "containerPort: " | nindent 6 }}{{ .service.targetPort | default 8080 }}
27+
protocol: TCP
28+
{{- end }}
29+
{{- if .extraContainerPorts }}
30+
{{ toYaml .extraContainerPorts | nindent 6 }}
31+
{{- end }}
32+
{{- $liveness := default dict .liveness }}
33+
{{- $livenessEnabled := default false $liveness.enabled }}
34+
{{- if and $liveness $livenessEnabled }}
35+
livenessProbe:
36+
httpGet:
37+
path: {{ .liveness.path | default "/" }}
38+
port: {{ .liveness.port | default 8080 }}
39+
initialDelaySeconds: {{ .liveness.delay | default 15 }}
40+
timeoutSeconds: {{ .liveness.timeout | default 15 }}
41+
periodSeconds: {{ .liveness.periodSeconds | default 15 }}
42+
{{- end }}
43+
{{- $readiness := default dict .readiness }}
44+
{{- $readinessEnabled := default false $readiness.enabled }}
45+
{{- if and $readiness $readinessEnabled }}
46+
readinessProbe:
47+
httpGet:
48+
path: {{ .readiness.path | default "/" }}
49+
port: {{ .readiness.port | default 8080 }}
50+
initialDelaySeconds: {{ .readiness.delay | default 15 }}
51+
timeoutSeconds: {{ .readiness.timeout | default 15 }}
52+
periodSeconds: {{ .readiness.periodSeconds | default 15 }}
53+
{{- end }}
54+
env:
55+
{{- if .secrets }}
56+
{{ toYaml .secrets | nindent 6 }}
57+
{{- end }}
58+
{{- if .environment }}
59+
{{ toYaml .environment | nindent 6 }}
60+
{{- end }}
61+
resources:
62+
{{- toYaml .resources | nindent 6 }}
63+
securityContext:
64+
{{- toYaml .securityContext | nindent 6 }}
65+
{{- end }}

‎libchart/templates/_pod.tpl

+7-57
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,13 @@ securityContext:
1010
{{- toYaml .Values.podSecurityContext | nindent 2 }}
1111
containers:
1212
- name: {{ .Chart.Name }}
13-
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
14-
imagePullPolicy: Always
15-
{{- if .Values.command }}
16-
command:
17-
{{ toYaml .Values.command | nindent 6 }}
18-
{{- end }}
19-
{{- if .Values.args }}
20-
args:
21-
{{ toYaml .Values.args | nindent 6 }}
22-
{{- end }}
23-
{{- if or (.Values.volumeMounts) (.Values.csi) }}
24-
volumeMounts:
25-
{{- if .Values.volumeMounts }}
26-
{{ toYaml .Values.volumeMounts | nindent 6 }}
27-
{{- end }}
28-
{{- if .Values.csi }}
29-
- name: {{ .Values.csi.name }}
30-
mountPath: {{ .Values.csi.mountPath | quote }}
31-
readOnly: true
32-
{{- end }}
33-
{{- end }}
34-
ports:
35-
- name: http
36-
containerPort: {{ .Values.service.targetPort | default 8080 }}
37-
protocol: TCP
38-
{{ if .Values.extraContainerPorts }}
39-
{{ toYaml .Values.extraContainerPorts | nindent 6 }}
40-
{{- end }}
41-
{{- if and (.Values.liveness) (.Values.liveness.enabled) }}
42-
livenessProbe:
43-
httpGet:
44-
path: {{ .Values.liveness.path | default "/" }}
45-
port: {{ .Values.liveness.port | default 8080 }}
46-
initialDelaySeconds: {{ .Values.liveness.delay | default 15 }}
47-
timeoutSeconds: {{ .Values.liveness.timeout | default 15 }}
48-
periodSeconds: {{ .Values.liveness.periodSeconds | default 15 }}
49-
{{- end }}
50-
{{- if and (.Values.readiness) (.Values.readiness.enabled) }}
51-
readinessProbe:
52-
httpGet:
53-
path: {{ .Values.readiness.path | default "/" }}
54-
port: {{ .Values.readiness.port | default 8080 }}
55-
initialDelaySeconds: {{ .Values.readiness.delay | default 15 }}
56-
timeoutSeconds: {{ .Values.readiness.timeout | default 15 }}
57-
periodSeconds: {{ .Values.readiness.periodSeconds | default 15 }}
58-
{{- end }}
59-
env:
60-
{{- if .Values.secrets }}
61-
{{ toYaml .Values.secrets | nindent 6 }}
62-
{{- end }}
63-
{{- if .Values.environment }}
64-
{{ toYaml .Values.environment | nindent 6 }}
65-
{{- end }}
66-
resources:
67-
{{ toYaml .Values.resources | nindent 6 }}
68-
securityContext:
69-
{{- toYaml .Values.securityContext | nindent 6 }}
13+
{{- include "libchart.container" .Values | indent 2 -}}
14+
{{- range $sc := .Values.sidecars -}}
15+
{{ "- name: " | nindent 2 }}{{ $sc.name }}
16+
{{- include "libchart.container" $sc | indent 2 }}
17+
{{- end }}
18+
{{- if .Values.initContainers }}
19+
{{- end }}
7020
{{- with .Values.nodeSelector }}
7121
nodeSelector:
7222
{{ toYaml . | nindent 4 }}

‎libchart/values.yaml

+43-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,49 @@ image:
1414
# pullSecrets:
1515
# - secret1
1616
# - secret2
17-
17+
sidecars:
18+
- name: helper1
19+
image:
20+
repository: "repo"
21+
tag: "123"
22+
extraContainerPorts: [8088, 9099]
23+
securityContext:
24+
readOnlyRootFilesystem: true
25+
allowPrivilegeEscalation: false
26+
resources:
27+
limits:
28+
cpu: 100m
29+
memory: 128Mi
30+
requests:
31+
cpu: 100m
32+
memory: 128Mi
33+
environment: { }
34+
secrets: { }
35+
volumeMounts: [ ]
36+
# - name: secret-volume
37+
# mountPath: /app/secrets
38+
# readOnly: true
39+
- name: helper2
40+
image:
41+
repository: "repo"
42+
tag: "456"
43+
extraContainerPorts: [8088, 9099]
44+
securityContext:
45+
readOnlyRootFilesystem: true
46+
allowPrivilegeEscalation: false
47+
resources:
48+
limits:
49+
cpu: 100m
50+
memory: 128Mi
51+
requests:
52+
cpu: 100m
53+
memory: 128Mi
54+
environment: { }
55+
secrets: { }
56+
volumeMounts:
57+
- name: secret-volume
58+
mountPath: /app/secrets
59+
readOnly: true
1860
nameOverride: ""
1961
fullnameOverride: ""
2062

‎nodejs/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
description: Node.js Helm Chart
33
name: nodejs
4-
version: 17.0.1
4+
version: 17.1.0
55
dependencies:
66
- name: libchart
7-
version: 4.0.1
7+
version: 4.2.0
88
repository: file://../libchart

‎web/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
appVersion: "1.0"
33
description: Helm chart for deployment of web servers
44
name: web
5-
version: 14.0.1
5+
version: 14.1.0
66
dependencies:
77
- name: libchart
8-
version: 4.0.1
8+
version: 4.2.0
99
repository: file://../libchart

0 commit comments

Comments
 (0)