Skip to content

MLE-13136: Merging release/1.1.1 from master to develop #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

MLE-13136: Merging release/1.1.1 from master to develop #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfa754c
MLE-12746: big fix for helm upgrade not working for TLS configuration
Mar 22, 2024
2092295
Merge pull request #203 from pengzhouml/release/1.1.1
rwinieski Mar 26, 2024
379abc1
Updating chart version in chart.yaml (#204)
barkhachoithani Mar 26, 2024
33b5726
add TLS enable check
rwinieski Mar 27, 2024
a21b0a3
Merge pull request #206 from marklogic/BUG-13141/Bootstrap-stuck
rwinieski Mar 27, 2024
1bdaa2f
MLE-13136: Merging release/1.1.1 to master (#205)
barkhachoithani Mar 27, 2024
8756fc9
Merge pull request #218 from marklogic/release/1.1.1
pengzhouml Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ keywords:
sources:
- https://github.com/marklogic/marklogic-kubernetes
- https://www.marklogic.com/
version: 1.1.0
version: 1.1.1
63 changes: 31 additions & 32 deletions charts/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,41 +315,40 @@ spec:
# Begin Group Configuration
if [[ $POD_NAME == *-0 ]] && [[ $MARKLOGIC_CLUSTER_TYPE == "bootstrap" ]]; then
[ -f /var/opt/MarkLogic/group_cfg ] && current_group_cfg=$(cat /var/opt/MarkLogic/group_cfg)
if [ "${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}" = "${current_group_cfg}" ]; then
log "Info: [poststart] Group config has not changed, poststart hook complete"
exit 0
fi

log "Info: [poststart] Begin group configuration."
while [ ! -f /var/opt/MarkLogic/ready ]; do
log "[poststart] waiting for MarkLogic server to be ready"
sleep 5s
done
if [ "${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}:${MARKLOGIC_JOIN_TLS_ENABLED}" = "${current_group_cfg}" ]; then
log "Info: [poststart] Group config has not changed, complete group configuration"
else
log "Info: [poststart] Begin group configuration."
while [ ! -f /var/opt/MarkLogic/ready ]; do
log "[poststart] waiting for MarkLogic server to be ready"
sleep 5s
done

GROUP_CFG_TEMPLATE='{"group-name":"%s", "xdqp-ssl-enabled":"%s"}'
GROUP_CFG=$(printf "$GROUP_CFG_TEMPLATE" "$MARKLOGIC_GROUP" "$XDQP_SSL_ENABLED")
GROUP_CFG_TEMPLATE='{"group-name":"%s", "xdqp-ssl-enabled":"%s"}'
GROUP_CFG=$(printf "$GROUP_CFG_TEMPLATE" "$MARKLOGIC_GROUP" "$XDQP_SSL_ENABLED")

log "Info: [poststart] Updating group configuration: ${GROUP_CFG}"
GROUP_RESP_CODE=`curl --retry 5 --retry-max-time 60 -o /tmp/restart_payload.xml -w "%{http_code}" --anyauth -m 20 -s -X PUT -H "Content-type: application/json" -d "${GROUP_CFG}" http://${MARKLOGIC_BOOTSTRAP_HOST}:8002/manage/v2/groups/Default/properties --user ${MARKLOGIC_ADMIN_USERNAME}:${MARKLOGIC_ADMIN_PASSWORD}`

# check whether MarkLogic has restarted
if [[ ${GROUP_RESP_CODE} -eq 202 ]] || [[ ${GROUP_RESP_CODE} -eq 204 ]]; then
log "Info: [poststart] Successfully configured properties for $MARKLOGIC_GROUP group on the MarkLogic cluster."
TIMESTAMP=$(< /tmp/restart_payload.xml grep "last-startup" | sed 's%^.*<last-startup.*>\(.*\)</last-startup>.*$%\1%')
rm -f /tmp/restart_payload.xml
if [[ -n ${TIMESTAMP} ]]; then
restart_check ${TIMESTAMP}
fi
if [[ $MARKLOGIC_IMAGE_TYPE == "rootless" ]]; then
sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
log "Info: [poststart] Updating group configuration: ${GROUP_CFG}"
GROUP_RESP_CODE=`curl --retry 5 --retry-max-time 60 -o /tmp/restart_payload.xml -w "%{http_code}" --anyauth -m 20 -s -X PUT -H "Content-type: application/json" -d "${GROUP_CFG}" http://${MARKLOGIC_BOOTSTRAP_HOST}:8002/manage/v2/groups/Default/properties --user ${MARKLOGIC_ADMIN_USERNAME}:${MARKLOGIC_ADMIN_PASSWORD}`

# check whether MarkLogic has restarted
if [[ ${GROUP_RESP_CODE} -eq 202 ]] || [[ ${GROUP_RESP_CODE} -eq 204 ]]; then
log "Info: [poststart] Successfully configured properties for $MARKLOGIC_GROUP group on the MarkLogic cluster."
TIMESTAMP=$(< /tmp/restart_payload.xml grep "last-startup" | sed 's%^.*<last-startup.*>\(.*\)</last-startup>.*$%\1%')
rm -f /tmp/restart_payload.xml
if [[ -n ${TIMESTAMP} ]]; then
restart_check ${TIMESTAMP}
fi
if [[ $MARKLOGIC_IMAGE_TYPE == "rootless" ]]; then
sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}:${MARKLOGIC_JOIN_TLS_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
else
sudo sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}:${MARKLOGIC_JOIN_TLS_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
fi
log "Info: [poststart] ${GROUP_CFG} saved"
else
sudo sh -c 'echo -n '"${MARKLOGIC_GROUP}:${XDQP_SSL_ENABLED}"' > /var/opt/MarkLogic/group_cfg'
log "Error: [poststart] Failed to configure properties for $MARKLOGIC_GROUP group.
log "Error: [poststart] Expected response code 202 or 204, got "${GROUP_RESP_CODE}"
exit 1
fi
log "Info: [poststart] ${GROUP_CFG} saved"
else
log "Error: [poststart] Failed to configure properties for $MARKLOGIC_GROUP group.
log "Error: [poststart] Expected response code 202 or 204, got "${GROUP_RESP_CODE}"
exit 1
fi
else
log "Info: [poststart] This is not bootstrap host. Skipping group configuration."
Expand Down Expand Up @@ -703,4 +702,4 @@ spec:
{{- if .Values.additionalVolumeClaimTemplates }}
{{- toYaml .Values.additionalVolumeClaimTemplates | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
Loading