Skip to content

Commit 6a78139

Browse files
vitalykorolevvitalykorolev
authored
Merge branch 'release/2.1.0' into MLE-20181_scan-all-dependent-images
2 parents cba408f + 29e0f26 commit 6a78139

16 files changed

+197
-196
lines changed

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2022-2025 MarkLogic Corporation.
1+
Copyright © 2022-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All rights reserved.
22

33
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
44

‎NOTICE.txt

Lines changed: 84 additions & 87 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
211211
| `logCollection.files.auditLogs` | Parameter to enable collection of MarkLogics audit logs when log collection is enabled | `true` |
212212
| `logCollection.outputs` | Configure desired output for fluent-bit | `""` |
213213
| `haproxy.enabled` | Parameter to enable the HAProxy Load Balancer for MarkLogic Server | `false` |
214+
| `haproxy.image.repository` | Repository for HAProxy image | `haproxytech/haproxy-alpine` |
215+
| `haproxy.image.tag` | Tag for HAProxy image | `2.9.4` |
216+
| `haproxy.image.pullPolicy` | Haproxy iamge Pull Policy | `IfNotPresent` |
214217
| `haproxy.existingConfigmap` | Name of an existing configmap with configuration for HAProxy | `marklogic-haproxy` |
215218
| `haproxy.replicaCount` | Number of HAProxy Deployment | `2` |
216219
| `haproxy.restartWhenUpgrade.enabled` | Automatically roll Deployments for every helm upgrade | `true` |

‎charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ keywords:
1717
sources:
1818
- https://github.com/marklogic/marklogic-kubernetes
1919
- https://www.marklogic.com/
20-
version: 2.0.1
20+
version: 2.1.0

‎charts/charts/haproxy/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515

16-
Modifications copyright © 2022-2025 MarkLogic Corporation.
16+
Modifications copyright © 2022-2025 Progress Software Corporation and/or its subsidiaries or affiliates.
1717
This file is modified from the original file to support the MarkLogic Kubernetes Helm Chart.
1818
*/}}
1919

‎charts/charts/haproxy/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515

16-
Modifications copyright © 2022-2025 MarkLogic Corporation.
16+
Modifications copyright © 2022-2025 Progress Software Corporation and/or its subsidiaries or affiliates.
1717
This file is modified from the original file to support the MarkLogic Kubernetes Helm Chart.
1818
*/}}
1919

‎charts/charts/haproxy/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515

16-
Modifications copyright © 2022-2025 MarkLogic Corporation.
16+
Modifications copyright © 2022-2025 Progress Software Corporation and/or its subsidiaries or affiliates.
1717
This file is modified from the original file to support the MarkLogic Kubernetes Helm Chart.
1818
*/}}
1919

‎charts/charts/haproxy/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
#
15-
# Modifications copyright © 2022-2025 MarkLogic Corporation.
15+
# Modifications copyright © 2022-2025 Progress Software Corporation and/or its subsidiaries or affiliates.
1616
# This file is modified from the original file to support the MarkLogic Kubernetes Helm Chart.
1717

1818
## Default values for HAProxy

‎charts/templates/configmap-haproxy.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ data:
112112
balance leastconn
113113
option forwardfor
114114
http-request replace-path {{ $appservicespath }}(/)?(.*) /\2
115-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
115+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
116116
stick-table type string len 32 size 10k expire 4h
117117
stick store-response res.cook(HostId)
118118
stick store-response res.cook(SessionId)
@@ -132,7 +132,7 @@ data:
132132
balance leastconn
133133
option forwardfor
134134
http-request replace-path {{ $adminpath }}(/)?(.*) /\2
135-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
135+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
136136
stick-table type string len 32 size 10k expire 4h
137137
stick store-response res.cook(HostId)
138138
stick store-response res.cook(SessionId)
@@ -152,7 +152,7 @@ data:
152152
balance leastconn
153153
option forwardfor
154154
http-request replace-path {{ $managepath }}(/)?(.*) /\2
155-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
155+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
156156
stick-table type string len 32 size 10k expire 4h
157157
stick store-response res.cook(HostId)
158158
stick store-response res.cook(SessionId)
@@ -177,7 +177,7 @@ data:
177177
balance leastconn
178178
option forwardfor
179179
http-request replace-path {{$path}}(/)?(.*) /\2
180-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
180+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
181181
stick-table type string len 32 size 10k expire 4h
182182
stick store-response res.cook(HostId)
183183
stick store-response res.cook(SessionId)
@@ -209,7 +209,7 @@ data:
209209
mode http
210210
balance leastconn
211211
option forwardfor
212-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
212+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
213213
stick-table type string len 32 size 10k expire 4h
214214
stick store-response res.cook(HostId)
215215
stick store-response res.cook(SessionId)
@@ -238,7 +238,7 @@ data:
238238
mode http
239239
balance leastconn
240240
option forwardfor
241-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
241+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
242242
stick-table type string len 32 size 10k expire 4h
243243
stick store-response res.cook(HostId)
244244
stick store-response res.cook(SessionId)
@@ -267,7 +267,7 @@ data:
267267
mode http
268268
balance leastconn
269269
option forwardfor
270-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
270+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
271271
stick-table type string len 32 size 10k expire 4h
272272
stick store-response res.cook(HostId)
273273
stick store-response res.cook(SessionId)
@@ -300,7 +300,7 @@ data:
300300
mode http
301301
balance leastconn
302302
option forwardfor
303-
cookie haproxy insert indirect httponly secure nocache maxidle 30m maxlife 4h
303+
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
304304
stick-table type string len 32 size 10k expire 4h
305305
stick store-response res.cook(HostId)
306306
stick store-response res.cook(SessionId)

‎charts/templates/configmap-scripts.yaml

Lines changed: 4 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,13 @@
11
# This configMap contains scirpts for MarkLogic Helm Chart:
2-
# liveness-probe.sh
32
# copy-certs.sh
43
# prestop-hook.sh
54
# poststart-hook.sh
65
apiVersion: v1
76
kind: ConfigMap
87
metadata:
98
name: {{ include "marklogic.fullname" . }}-scripts
9+
namespace: {{ .Release.Namespace }}
1010
data:
11-
liveness-probe.sh: |
12-
#!/bin/bash
13-
pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
14-
log () {
15-
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
16-
# Check to make sure pod doesn't terminate if PID value is empty for any reason
17-
if [ -n "$pid" ]; then
18-
echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
19-
fi
20-
}
21-
22-
# Check if ML service is running. Exit with 1 if it is other than running
23-
if [ -e /etc/init.d/MarkLogic ]; then
24-
ml_status=$(/etc/init.d/MarkLogic status)
25-
else
26-
ml_status=$(/etc/MarkLogic/MarkLogic-service.sh status)
27-
fi
28-
29-
if [[ "$ml_status" =~ "running" ]]; then
30-
http_code=$(curl -o /tmp/probe_response.txt -s -w "%{http_code}" "http://${HOSTNAME}:8001/admin/v1/timestamp")
31-
curl_code=$?
32-
http_resp=$(cat /tmp/probe_response.txt)
33-
34-
if [[ $curl_code -ne 0 && $http_code -ne 401 ]]; then
35-
log "Info: [Liveness Probe] Error with MarkLogic"
36-
log "Info: [Liveness Probe] Curl response code: "$curl_code
37-
log "Info: [Liveness Probe] Http response code: "$http_code
38-
log "Info: [Liveness Probe] Http response message: "$http_resp
39-
fi
40-
rm -f /tmp/probe_response.txt
41-
exit 0
42-
else
43-
exit 1
44-
fi
45-
4611
copy-certs.sh: |
4712
#!/bin/bash
4813
MARKLOGIC_ADMIN_USERNAME="$(< /run/secrets/ml-secrets/username)"
@@ -118,15 +83,9 @@ data:
11883
MARKLOGIC_ADMIN_USERNAME="$(< /run/secrets/ml-secrets/username)"
11984
MARKLOGIC_ADMIN_PASSWORD="$(< /run/secrets/ml-secrets/password)"
12085
121-
pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
122-
12386
log () {
12487
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
125-
# Check to make sure pod doesn't terminate if PID value is empty for any reason
126-
# If PID value is empty preStart hook logs are not recorded
127-
if [ -n "$pid" ]; then
128-
echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
129-
fi
88+
echo "${TIMESTAMP} $@" > /proc/1/fd/1
13089
}
13190
13291
log "Info: [prestop] Prestop Hook Execution"
@@ -195,8 +154,6 @@ data:
195154
echo "IS_BOOTSTRAP_HOST false"
196155
fi
197156
198-
pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
199-
200157
###############################################################
201158
# Logging utility
202159
###############################################################
@@ -215,13 +172,8 @@ data:
215172
216173
log () {
217174
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
218-
# Check to make sure pod doesn't terminate if PID value is empty for any reason
219-
# If PID value is empty postStart hook logs are not recorded
220175
message="${TIMESTAMP} [postStart] $@"
221-
if [ -n "$pid" ]; then
222-
echo $message > /proc/$pid/fd/1
223-
fi
224-
176+
echo $message > /proc/1/fd/1
225177
echo $message >> /tmp/script.log
226178
}
227179
@@ -889,13 +841,8 @@ data:
889841
#!/bin/bash
890842
log () {
891843
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
892-
# Check to make sure pod doesn't terminate if PID value is empty for any reason
893-
if [ -n "$pid" ]; then
894-
echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
895-
fi
844+
echo "${TIMESTAMP} $@" > /proc/1/fd/1
896845
}
897-
898-
pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
899846
900847
log "Info: [root-rootless-upgrade] Execution Start"
901848

0 commit comments

Comments
 (0)