Skip to content

Commit b5f6426

Browse files
pmarigliapmariglia
authored
Merge pull request #186 from minijus/podSecurityContext
feat: add configurable pod security context for nx-cloud chart resources
2 parents b0f0ff6 + 3238fee commit b5f6426

File tree

8 files changed

+34
-7
lines changed

8 files changed

+34
-7
lines changed

‎charts/nx-cloud/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: nx-cloud
33
description: Nx Cloud Helm Chart
44
type: application
5-
version: 1.2.1
5+
version: 1.2.2
66
maintainers:
77
- name: nx
88
url: "https://nx.app/"

‎charts/nx-cloud/README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ Below is a summary table of configurable values from values.yaml.
7373
| fileServer.deployment.strategy.rollingUpdate.maxUnavailable | int | 1 | Max unavailable during rolling update. |
7474
| fileServer.deployment.strategy.rollingUpdate.maxSurge | int | 0 | Max surge during rolling update. |
7575
| fileServer.deployment.envFrom | list | [] | envFrom sources for file server. |
76-
| fileServer.deployment.securityContext | object | {} | Pod securityContext for file server. |
76+
| fileServer.deployment.securityContext | object | {} | Pod container securityContext for file server. |
77+
| fileServer.deployment.podSecurityContext | object | {} | Pod securityContext for file server. |
7778
| fileServer.deployment.affinity | object | {} | Affinity rules for file server. |
7879
| fileServer.deployment.tolerations | list | [] | Tolerations for file server. |
7980
| fileServer.deployment.nodeSelector | object | {} | Node selector for file server. |
@@ -111,7 +112,8 @@ Below is a summary table of configurable values from values.yaml.
111112
| aggregator.cronjob.env | object | {} | Environment variables for aggregator. |
112113
| aggregator.cronjob.envValueFrom | object | {} | env valueFrom references for aggregator. |
113114
| aggregator.cronjob.envFrom | list | [] | envFrom sources for aggregator. |
114-
| aggregator.cronjob.securityContext | object | {} | Pod securityContext for aggregator. |
115+
| aggregator.cronjob.securityContext | object | {} | Pod container securityContext for aggregator. |
116+
| aggregator.cronjob.podSecurityContext | object | {} | Pod securityContext for aggregator. |
115117
| aggregator.cronjob.affinity | object | {} | Affinity rules for aggregator. |
116118
| aggregator.cronjob.tolerations | list | [] | Tolerations for aggregator. |
117119
| aggregator.cronjob.nodeSelector | object | {} | Node selector for aggregator. |
@@ -149,7 +151,8 @@ Below is a summary table of configurable values from values.yaml.
149151
| frontend.deployment.strategy.rollingUpdate.maxUnavailable | int | 0 | Max unavailable during rolling update. |
150152
| frontend.deployment.strategy.rollingUpdate.maxSurge | int | 1 | Max surge during rolling update. |
151153
| frontend.deployment.envFrom | list | [] | envFrom sources for frontend. |
152-
| frontend.deployment.securityContext | object | {} | Pod securityContext for frontend. |
154+
| frontend.deployment.securityContext | object | {} | Pod container securityContext for frontend. |
155+
| frontend.deployment.podSecurityContext | object | {} | Pod securityContext for frontend. |
153156
| frontend.deployment.affinity | object | {} | Affinity rules for frontend. |
154157
| frontend.deployment.tolerations | list | [] | Tolerations for frontend. |
155158
| frontend.deployment.nodeSelector | object | {} | Node selector for frontend. |
@@ -209,7 +212,8 @@ Below is a summary table of configurable values from values.yaml.
209212
| api.deployment.strategy.rollingUpdate.maxUnavailable | int | 0 | Max unavailable during rolling update. |
210213
| api.deployment.strategy.rollingUpdate.maxSurge | int | 1 | Max surge during rolling update. |
211214
| api.deployment.envFrom | list | [] | envFrom sources for API. |
212-
| api.deployment.securityContext | object | {} | Pod securityContext for API. |
215+
| api.deployment.securityContext | object | {} | Pod container securityContext for API. |
216+
| api.deployment.podSecurityContext | object | {} | Pod securityContext for API. |
213217
| api.deployment.affinity | object | {} | Affinity rules for API. |
214218
| api.deployment.tolerations | list | [] | Tolerations for API. |
215219
| api.deployment.nodeSelector | object | {} | Node selector for API. |

‎charts/nx-cloud/templates/aggregator/cronjob.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ spec:
2929
{{- if .Values.aggregator.serviceAccount.create }}
3030
serviceAccountName: {{ .Values.aggregator.serviceAccount.name }}
3131
{{- end }}
32+
{{- with .Values.aggregator.cronjob.podSecurityContext }}
33+
securityContext:
34+
{{- toYaml . | nindent 12 }}
35+
{{- end }}
3236
{{- with .Values.aggregator.cronjob.nodeSelector }}
3337
nodeSelector:
3438
{{- toYaml . | nindent 12 }}

‎charts/nx-cloud/templates/api/deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ spec:
3535
{{- if .Values.api.serviceAccount.create }}
3636
serviceAccountName: {{ .Values.api.serviceAccount.name }}
3737
{{- end }}
38+
{{- with .Values.api.deployment.podSecurityContext }}
39+
securityContext:
40+
{{- toYaml . | nindent 8 }}
41+
{{- end }}
3842
{{- if or .Values.config.agentConfigs .Values.api.deployment.volumes }}
3943
volumes:
4044
{{- if .Values.config.agentConfigs }}

‎charts/nx-cloud/templates/file-server/deployment.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ spec:
3535
{{- if .Values.fileServer.serviceAccount.create }}
3636
serviceAccountName: {{ .Values.fileServer.serviceAccount.name }}
3737
{{- end }}
38-
{{- if .Values.fileServer.deployment.securityContext }}
39-
securityContext: {{- toYaml .Values.fileServer.deployment.securityContext | nindent 8 }}
38+
{{- with .Values.fileServer.deployment.podSecurityContext }}
39+
securityContext:
40+
{{- toYaml . | nindent 8 }}
4041
{{- end }}
4142
{{- with .Values.fileServer.deployment.nodeSelector }}
4243
nodeSelector:

‎charts/nx-cloud/templates/frontend/deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ spec:
3838
{{- if .Values.frontend.serviceAccount.create }}
3939
serviceAccountName: {{ .Values.frontend.serviceAccount.name }}
4040
{{- end }}
41+
{{- with .Values.frontend.deployment.podSecurityContext }}
42+
securityContext:
43+
{{- toYaml . | nindent 8 }}
44+
{{- end }}
4145
{{- if or .Values.config.agentConfigs .Values.frontend.deployment.volumes }}
4246
volumes:
4347
{{- if .Values.config.agentConfigs }}

‎charts/nx-cloud/values.schema.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,9 @@
268268
"securityContext": {
269269
"type": "object"
270270
},
271+
"podSecurityContext": {
272+
"type": "object"
273+
},
271274
"affinity": {
272275
"type": "object"
273276
},
@@ -727,6 +730,9 @@
727730
"securityContext": {
728731
"type": "object"
729732
},
733+
"podSecurityContext": {
734+
"type": "object"
735+
},
730736
"affinity": {
731737
"type": "object"
732738
},

‎charts/nx-cloud/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ fileServer:
6969
envFrom: []
7070

7171
securityContext: {}
72+
podSecurityContext: {}
7273

7374
affinity: {}
7475
tolerations: []
@@ -140,6 +141,7 @@ aggregator:
140141
envFrom: []
141142

142143
securityContext: {}
144+
podSecurityContext: {}
143145

144146
affinity: {}
145147
tolerations: []
@@ -205,6 +207,7 @@ frontend:
205207
envFrom: []
206208

207209
securityContext: {}
210+
podSecurityContext: {}
208211

209212
affinity: {}
210213
tolerations: []
@@ -309,6 +312,7 @@ api:
309312
envFrom: []
310313

311314
securityContext: {}
315+
podSecurityContext: {}
312316

313317
affinity: {}
314318
tolerations: []

0 commit comments

Comments
 (0)