File tree Expand file tree Collapse file tree 4 files changed +27
-1
lines changed Expand file tree Collapse file tree 4 files changed +27
-1
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,16 @@ Thank you for installing {{ .Chart.Name }}.
2
2
3
3
Your release is named {{ .Release.Name }}.
4
4
5
+ {{- if eq (include "marklogic.imageType" .) "rootless" }}
6
+ {{- if .Values.containerSecurityContext.allowPrivilegeEscalation }}
7
+ WARNING
8
+ ***********************************************************************************************************
9
+ Setting "containerSecurityContext.allowPrivilegeEscalation" is set to true.
10
+ This is not recommended and is not a secure configuration while using rootless MarkLogic images.
11
+ ***********************************************************************************************************
12
+ {{- end }}
13
+ {{- end }}
14
+
5
15
FQDN is {{ include "marklogic.fqdn" . }}
6
16
{{- if gt (len (include "marklogic.fqdn" .)) 64 }}
7
17
WARNING: The hostname is greater than 64 characters
Original file line number Diff line number Diff line change @@ -108,3 +108,14 @@ Validate values file
108
108
{ {- end } }
109
109
{ {- end } }
110
110
111
+ { {/*
112
+ Name to distinguish marklogic image whether root or rootless
113
+ */} }
114
+ { {- define " marklogic.imageType" -} }
115
+ { {- if .Values.image.tag | contains " rootless" } }
116
+ { {- printf " rootless" } }
117
+ { {- else } }
118
+ { {- printf " root" } }
119
+ { {- end } }
120
+ { {- end } }
121
+
Original file line number Diff line number Diff line change 24
24
MARKLOGIC_JOIN_CLUSTER : " true"
25
25
MARKLOGIC_GROUP : {{ .Values.group.name }}
26
26
XDQP_SSL_ENABLED : {{ quote .Values.group.enableXdqpSsl }}
27
+ MARKLOGIC_IMAGE_TYPE : {{ include "marklogic.imageType" . }}
27
28
---
28
29
{{- if .Values.logCollection.enabled }}
29
30
apiVersion : v1
Original file line number Diff line number Diff line change @@ -338,7 +338,11 @@ spec:
338
338
if [[ -n ${TIMESTAMP} ]]; then
339
339
restart_check ${TIMESTAMP}
340
340
fi
341
- sudo sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
341
+ if [[ $MARKLOGIC_IMAGE_TYPE == "rootless" ]]; then
342
+ sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
343
+ else
344
+ sudo sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
345
+ fi
342
346
log "Info: [poststart] ${GROUP_CFG} saved"
343
347
else
344
348
log "Error: [poststart] Failed to configure properties for $MARKLOGIC_GROUP group.
You can’t perform that action at this time.
0 commit comments