Skip to content

Commit 498b62c

Browse files
pengzhoumlPeng Zhou
pengzhouml
and
Peng Zhou
authored
MLE-20782 update dependency and notice file for helm 2.0.1 release (#307)
* MLE-20782 update dependency and notice file for helm 2.0.1 release * upgrade default MarkLogic Image Version * fix unit test error caused by openssl version upgrade --------- Co-authored-by: Peng Zhou <[email protected]>
1 parent 7247927 commit 498b62c

File tree

6 files changed

+184
-109
lines changed

6 files changed

+184
-109
lines changed

‎NOTICE.txt

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,6 @@ Third Party Components
3434

3535
The following software may be included in this project (last updated July 24, 2024):
3636

37-
Curl v8.8.0
38-
39-
https://curl.se/download/
40-
41-
COPYRIGHT AND PERMISSION NOTICE
42-
43-
Copyright (c) 1996 - 2024, Daniel Stenberg, <[email protected]>, and many
44-
contributors, see the THANKS file. All rights reserved.
45-
46-
Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
47-
48-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
49-
50-
Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
51-
5237
gjson v1.14.3 (MIT)
5338

5439
https://pkg.go.dev/github.com/tidwall/gjson
@@ -57,15 +42,6 @@ The MIT License (MIT)
5742
Copyright (c) 2016 Josh Baker
5843
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
5944

60-
go-http-digest-auth-client v0.6.0 (BSD-2-Clause)
61-
62-
https://pkg.go.dev/github.com/xinsnake/go-http-digest-auth-client
63-
64-
Copyright (c) 2016, Xinyun Zhou All rights reserved.
65-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
66-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
67-
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
68-
6945
Haproxy helm charts vhaproxy-1.18.0 (Apache-2.0)
7046

7147
https://github.com/haproxytech/helm-charts
@@ -104,14 +80,14 @@ The above copyright notice and this permission notice shall be included in all c
10480
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
10581

10682

107-
terratest v0.46.11 (Apache-2.0)
83+
terratest v0.48.2 (Apache-2.0)
10884

10985
https://pkg.go.dev/github.com/gruntwork-io/terratest
11086

11187
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
11288

11389

114-
testify v1.8.4 (MIT)
90+
testify v1.10.0 (MIT)
11591

11692
https://pkg.go.dev/github.com/stretchr/testify
11793

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
137137
| `image.repository` | Repository for MarkLogic image | `progressofficial/marklogic-db` |
138138
| `image.tag` | Image tag for MarkLogic image | `11.3.0-ubi-rootless` |
139139
| `image.pullPolicy` | Image pull policy for MarkLogic image | `IfNotPresent` |
140-
| `initContainers.utilContainer.image` | Image for copyCerts and volume permission change for root to rootless upgrade InitContainer | `redhat/ubi9:9.4` |
140+
| `initContainers.utilContainer.image` | Image for copyCerts and volume permission change for root to rootless upgrade InitContainer | `redhat/ubi9:9.5` |
141141
| `initContainers.utilContainer.pullPolicy` | Pull policy for copyCerts and volume permission change for root to rootless upgrade InitContainer | `IfNotPresent` |
142142
| `imagePullSecrets` | Registry secret names as an array | `[]` |
143143
| `hugepages.enabled` | Parameter to enable Hugepage on MarkLogic | `false` |
@@ -197,7 +197,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
197197
| `readinessProbe.failureThreshold` | Failure threshold for readiness probe | `3` |
198198
| `readinessProbe.successThreshold` | Success threshold for readiness probe | `1` |
199199
| `logCollection.enabled` | Parameter to enable cluster wide log collection of Marklogic server logs | `false` |
200-
| `logCollection.image` | Image repository and tag for fluent-bit container | `fluent/fluent-bit:3.1.1` |
200+
| `logCollection.image` | Image repository and tag for fluent-bit container | `fluent/fluent-bit:3.2.9` |
201201
| `logCollection.resources.requests.cpu` | The requested cpu resource for the fluent-bit container | `100m` |
202202
| `logCollection.resources.requests.memory` | The requested memory resource for the fluent-bit container | `128Mi` |
203203
| `logCollection.resources.limits.cpu` | The cpu resource limit for the fluent-bit container | `100m` |

‎charts/templates/configmap-scripts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ data:
6464
cp -f /tmp/ca-cert-secret/* /run/secrets/marklogic-certs/;
6565
cert_paths=$(find /tmp/server-cert-secrets/tls_*.crt)
6666
for cert_path in $cert_paths; do
67-
cert_cn=$(openssl x509 -noout -subject -in $cert_path | sed -n 's/.*CN = \([^,]*\).*/\1/p')
67+
cert_cn=$(openssl x509 -noout -subject -in $cert_path | sed -n 's/.*CN\s*=\s*\([^,]*\).*/\1/p')
6868
log "Info: [copy-certs] FQDN for the certificate: $cert_cn"
6969
if [[ "$host_FQDN" == "$cert_cn" ]]; then
7070
log "Info: [copy-certs] found certificate for the server"

‎charts/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ rootToRootlessUpgrade: false
4545
## Marklogic image parameters
4646
image:
4747
repository: progressofficial/marklogic-db
48-
tag: 11.3.0-ubi-rootless
48+
tag: 11.3.1-ubi-rootless-2.1.2
4949
pullPolicy: IfNotPresent
5050

5151
## Init container image parameters
5252
initContainers:
5353
utilContainer:
54-
image: "redhat/ubi9:9.4"
54+
image: "redhat/ubi9:9.5"
5555
pullPolicy: IfNotPresent
5656

5757
## Configure the imagePullSecrets to pull the image from private repository that requires credential
@@ -317,7 +317,7 @@ readinessProbe:
317317
## And export them to a logging backend specified in the outputs section below
318318
logCollection:
319319
enabled: false
320-
# image: fluent/fluent-bit:3.1.1
320+
# image: fluent/fluent-bit:3.2.9
321321
# resources:
322322
# requests:
323323
# cpu: "100m"

‎go.mod

Lines changed: 58 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module github.com/marklogic/marklogic-kubernetes
22

3-
go 1.22.9
3+
go 1.23.5
44

55
require (
66
github.com/docker/docker v24.0.7+incompatible
7-
github.com/gruntwork-io/terratest v0.46.11
7+
github.com/gruntwork-io/terratest v0.48.2
88
github.com/imroc/req/v3 v3.48.0
9-
github.com/stretchr/testify v1.9.0
9+
github.com/stretchr/testify v1.10.0
1010
github.com/tidwall/gjson v1.14.3
1111
k8s.io/api v0.29.1
1212
)
1313

1414
require (
15-
github.com/BurntSushi/toml v1.3.2 // indirect
15+
github.com/BurntSushi/toml v1.4.0 // indirect
1616
github.com/Microsoft/go-winio v0.4.14 // indirect
1717
github.com/andybalholm/brotli v1.1.0 // indirect
1818
github.com/cloudflare/circl v1.4.0 // indirect
@@ -46,7 +46,7 @@ require (
4646
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
4747
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
4848
github.com/opencontainers/go-digest v1.0.0 // indirect
49-
github.com/opencontainers/image-spec v1.0.2 // indirect
49+
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
5050
github.com/pkg/errors v0.9.1 // indirect
5151
github.com/quic-go/qpack v0.5.1 // indirect
5252
github.com/quic-go/quic-go v0.47.0 // indirect
@@ -58,28 +58,68 @@ require (
5858
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
5959
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
6060
golang.org/x/mod v0.21.0 // indirect
61-
golang.org/x/sync v0.8.0 // indirect
61+
golang.org/x/sync v0.10.0 // indirect
6262
golang.org/x/tools v0.25.0 // indirect
6363
)
6464

6565
require (
66-
github.com/aws/aws-sdk-go v1.50.8 // indirect
66+
filippo.io/edwards25519 v1.1.0 // indirect
67+
github.com/aws/aws-sdk-go-v2 v1.32.5 // indirect
68+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
69+
github.com/aws/aws-sdk-go-v2/config v1.28.5 // indirect
70+
github.com/aws/aws-sdk-go-v2/credentials v1.17.46 // indirect
71+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.20 // indirect
72+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.41 // indirect
73+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
74+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
75+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
76+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 // indirect
77+
github.com/aws/aws-sdk-go-v2/service/acm v1.30.6 // indirect
78+
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.0 // indirect
79+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.44.0 // indirect
80+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.37.1 // indirect
81+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.193.0 // indirect
82+
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.6 // indirect
83+
github.com/aws/aws-sdk-go-v2/service/ecs v1.52.0 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/iam v1.38.1 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 // indirect
88+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
89+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 // indirect
90+
github.com/aws/aws-sdk-go-v2/service/kms v1.37.6 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/lambda v1.69.0 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/rds v1.91.0 // indirect
93+
github.com/aws/aws-sdk-go-v2/service/route53 v1.46.2 // indirect
94+
github.com/aws/aws-sdk-go-v2/service/s3 v1.69.0 // indirect
95+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.6 // indirect
96+
github.com/aws/aws-sdk-go-v2/service/sns v1.33.6 // indirect
97+
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.1 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.0 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.6 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.5 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
102+
github.com/aws/smithy-go v1.22.1 // indirect
67103
github.com/boombuler/barcode v1.0.1 // indirect
68-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
104+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
69105
github.com/davecgh/go-spew v1.1.1 // indirect
70106
github.com/ghodss/yaml v1.0.0 // indirect
71107
github.com/go-errors/errors v1.5.1 // indirect
72108
github.com/go-logr/logr v1.4.2 // indirect
73-
github.com/go-sql-driver/mysql v1.7.1 // indirect
109+
github.com/go-sql-driver/mysql v1.8.1 // indirect
74110
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
75111
github.com/gogo/protobuf v1.3.2 // indirect
76-
github.com/golang/protobuf v1.5.3 // indirect
112+
github.com/golang/protobuf v1.5.4 // indirect
77113
github.com/google/gofuzz v1.2.0 // indirect
78114
github.com/google/uuid v1.6.0 // indirect
79115
github.com/gruntwork-io/go-commons v0.17.1 // indirect
80116
github.com/hashicorp/errwrap v1.1.0 // indirect
81117
github.com/hashicorp/go-multierror v1.1.1 // indirect
82118
github.com/imdario/mergo v0.3.16 // indirect
119+
github.com/jackc/pgpassfile v1.0.0 // indirect
120+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
121+
github.com/jackc/pgx/v5 v5.7.1 // indirect
122+
github.com/jackc/puddle/v2 v2.2.2 // indirect
83123
github.com/jmespath/go-jmespath v0.4.0 // indirect
84124
github.com/json-iterator/go v1.1.12 // indirect
85125
github.com/mattn/go-zglob v0.0.4 // indirect
@@ -94,15 +134,14 @@ require (
94134
github.com/tidwall/match v1.1.1 // indirect
95135
github.com/tidwall/pretty v1.2.0 // indirect
96136
go.uber.org/mock v0.4.0 // indirect
97-
golang.org/x/crypto v0.27.0 // indirect
98-
golang.org/x/net v0.29.0 // indirect
99-
golang.org/x/oauth2 v0.16.0 // indirect
100-
golang.org/x/sys v0.25.0 // indirect
101-
golang.org/x/term v0.24.0 // indirect
102-
golang.org/x/text v0.18.0 // indirect
103-
golang.org/x/time v0.5.0 // indirect
104-
google.golang.org/appengine v1.6.8 // indirect
105-
google.golang.org/protobuf v1.34.1 // indirect
137+
golang.org/x/crypto v0.32.0 // indirect
138+
golang.org/x/net v0.34.0 // indirect
139+
golang.org/x/oauth2 v0.24.0 // indirect
140+
golang.org/x/sys v0.29.0 // indirect
141+
golang.org/x/term v0.28.0 // indirect
142+
golang.org/x/text v0.21.0 // indirect
143+
golang.org/x/time v0.8.0 // indirect
144+
google.golang.org/protobuf v1.35.1 // indirect
106145
gopkg.in/inf.v0 v0.9.1 // indirect
107146
gopkg.in/yaml.v2 v2.4.0 // indirect
108147
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)