Skip to content

Commit 84ecbaf

Browse files
authored
fix(lmutil): updated openshift templates (#79)
1 parent ed79522 commit 84ecbaf

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

charts/lmutil/Chart.yaml

Lines changed: 1 addition & 1 deletion
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: 0.1.4
18+
version: 0.1.5
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

charts/lmutil/templates/_customizations.tpl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
{{- define "lmutil.custom-pod-sec-context-nonroot" }}
1+
{{- define "lmutil.default-pod-sec-context-nonroot" }}
22
{{ if eq (include "lmutil.is-openshift" .) "true" }}
33
runAsUser: 1000670001
44
fsGroup: 1000670001
55
runAsGroup: 1000670001
6-
runAsNonRoot: true
6+
{{- else }}
7+
runAsUser: 2000
8+
fsGroup: 2000
9+
runAsGroup: 2000
710
{{- end }}
11+
runAsNonRoot: true
812
{{- end }}
913

1014

11-
{{- define "lmutil.custom-container-sec-context-nonroot" }}
15+
{{- define "lmutil.default-container-sec-context-nonroot" }}
1216
{{ if eq (include "lmutil.is-openshift" .) "true" }}
1317
allowPrivilegeEscalation: false
1418
capabilities:

charts/lmutil/templates/_util.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,14 @@ This takes an array of three values:
132132
{{- toYaml (merge $overrides $tpl) -}}
133133
{{- end -}}
134134

135-
{{- define "lmutil.default-pod-sec-context-nonroot" }}
135+
{{- define "lmutil.custom-pod-sec-context-nonroot" }}
136136
{{- toYaml .Values.podSecurityContext | nindent 0 }}
137137
{{- end }}
138138
{{- define "lmutil.pod-sec-context-nonroot" -}}
139139
{{- include "lmutil.merge" (append . "lmutil.default-pod-sec-context-nonroot" ) -}}
140140
{{- end -}}
141141

142-
{{- define "lmutil.default-container-sec-context-nonroot" }}
142+
{{- define "lmutil.custom-container-sec-context-nonroot" }}
143143
{{- toYaml .Values.securityContext | nindent 0 }}
144144
{{- end }}
145145
{{- define "lmutil.container-sec-context-nonroot" -}}

0 commit comments

Comments
 (0)