Skip to content

Commit 17d09c9

Browse files
pengzhoumlPeng Zhou
pengzhouml
and
Peng Zhou
authored
MLE-20917 update notice file for Helm 2.0.1 Release (#309)
* update the Chart version to 2.0.1 and MarkLogic Version to 11.3.1 * update Notice and README for Helm 2.0.1 Release * update in Notice File * update latest Notice file * update go version to 1.23.6 for security vulverabilities * update version for vulerabilities --------- Co-authored-by: Peng Zhou <[email protected]>
1 parent 71cd1bd commit 17d09c9

File tree

5 files changed

+58
-53
lines changed

5 files changed

+58
-53
lines changed

‎NOTICE.txt

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MarkLogic® Kubernetes Helm Chart
22

3-
Copyright © 2022-2025 MarkLogic Corporation. MarkLogic and MarkLogic logo are trademarks or registered trademarks of MarkLogic Corporation in the United States and other countries. All other trademarks are the property of their respective owners.
3+
Copyright © 2022-2025 Progress Federal Solutions, Inc. MarkLogic and MarkLogic logo are trademarks or registered trademarks of Progress Federal Solutions, Inc. in the United States and other countries. All other trademarks are the property of their respective owners.
44

55
This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at
66

@@ -15,24 +15,27 @@ The MarkLogic® Kubernetes Helm Chart container image utilizes the RedHat UBI co
1515
This document provides notices information for the third-party components used by MarkLogic® Kubernetes Helm Chart.
1616

1717
Third Party Components
18-
19-
Curl v8.8.0 (MIT)
20-
gjson v1.14.3 (MIT)
21-
go-http-digest-auth-client v0.6.0 (BSD-2-Clause)
18+
docker v24.0.7 (Apache-2.0)
19+
gjson v1.14.3 (MIT)
2220
haproxy helm charts vhaproxy-1.18.0 (Apache-2.0)
23-
K8s.io/api v0.29.1 (Apache-2.0)
24-
MarkLogic® Docker Container Image v2.0 (Apache-2.0)
25-
req v3.48.0 (MIT)
26-
terratest v0.46.11 (Apache-2.0)
27-
testify v1.8.4 (MIT)
21+
K8s.io/api v0.29.1 (Apache-2.0)
22+
MarkLogic® Docker Container Image v2.1.2 (Apache-2.0)
23+
req v3.50.0 (MIT)
24+
terratest v0.48.2 (Apache-2.0)
25+
testify v1.10.4 (MIT)
2826

2927
Common Licenses
3028

3129
Apache License 2.0 (Apache-2.0)
3230

3331
-------------------------------------------------------------------------
3432

35-
The following software may be included in this project (last updated July 24, 2024):
33+
The following software may be included in this project (last updated Apr 03, 2025):
34+
35+
docker v24.0.7 (Apache-2.0)
36+
https://pkg.go.dev/github.com/docker/[email protected]+incompatible
37+
38+
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
3639

3740
gjson v1.14.3 (MIT)
3841

@@ -56,7 +59,7 @@ K8s.io/api v0.29.1 (Apache-2.0)
5659
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
5760

5861

59-
MarkLogic® Docker Container Image v2.0 (Apache-2.0)
62+
MarkLogic® Docker Container Image v2.1.2 (Apache-2.0)
6063

6164
https://github.com/marklogic/marklogic-docker
6265

@@ -65,7 +68,7 @@ MarkLogic® Docker Container Image v2.0 (Apache-2.0)
6568
See its NOTICE.txt file here https://github.com/marklogic/marklogic-docker/blob/master/NOTICE.txt
6669

6770

68-
req v3.48.0 (MIT)
71+
req v3.50.0 (MIT)
6972

7073
https://pkg.go.dev/github.com/imroc/req/v3
7174

@@ -87,7 +90,7 @@ terratest v0.48.2 (Apache-2.0)
8790
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
8891

8992

90-
testify v1.10.0 (MIT)
93+
testify v1.10.4 (MIT)
9194

9295
https://pkg.go.dev/github.com/stretchr/testify
9396

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
135135
| `group.enableXdqpSsl` | SSL encryption for XDQP | `true` |
136136
| `bootstrapHostName` | Host name of MarkLogic bootstrap host (to join a cluster) | `""` |
137137
| `image.repository` | Repository for MarkLogic image | `progressofficial/marklogic-db` |
138-
| `image.tag` | Image tag for MarkLogic image | `11.3.0-ubi-rootless` |
138+
| `image.tag` | Image tag for MarkLogic image | `11.3.1-ubi-rootless-2.1.2` |
139139
| `image.pullPolicy` | Image pull policy for MarkLogic image | `IfNotPresent` |
140140
| `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` |

‎charts/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
version: "1.18.0"
99
name: marklogic
1010
description: MarkLogic Server is a multi-model database that has both NoSQL and trusted enterprise data management capabilities.
11-
appVersion: "11.2.0"
11+
appVersion: "11.3.1"
1212
type: application
1313
keywords:
1414
- marklogic
@@ -17,4 +17,4 @@ keywords:
1717
sources:
1818
- https://github.com/marklogic/marklogic-kubernetes
1919
- https://www.marklogic.com/
20-
version: 2.0.0
20+
version: 2.0.1

‎go.mod

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

3-
go 1.23.5
3+
go 1.23.6
44

55
require (
66
github.com/docker/docker v24.0.7+incompatible
77
github.com/gruntwork-io/terratest v0.48.2
8-
github.com/imroc/req/v3 v3.48.0
8+
github.com/imroc/req/v3 v3.50.0
99
github.com/stretchr/testify v1.10.0
1010
github.com/tidwall/gjson v1.14.3
1111
k8s.io/api v0.29.1
@@ -14,8 +14,8 @@ require (
1414
require (
1515
github.com/BurntSushi/toml v1.4.0 // indirect
1616
github.com/Microsoft/go-winio v0.4.14 // indirect
17-
github.com/andybalholm/brotli v1.1.0 // indirect
18-
github.com/cloudflare/circl v1.4.0 // indirect
17+
github.com/andybalholm/brotli v1.1.1 // indirect
18+
github.com/cloudflare/circl v1.5.0 // indirect
1919
github.com/docker/distribution v2.8.2+incompatible // indirect
2020
github.com/docker/go-connections v0.5.0 // indirect
2121
github.com/docker/go-units v0.5.0 // indirect
@@ -30,10 +30,10 @@ require (
3030
github.com/gonvenience/wrap v1.2.0 // indirect
3131
github.com/gonvenience/ytbx v1.4.4 // indirect
3232
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
33-
github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
33+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
3434
github.com/homeport/dyff v1.6.0 // indirect
3535
github.com/josharian/intern v1.0.0 // indirect
36-
github.com/klauspost/compress v1.17.9 // indirect
36+
github.com/klauspost/compress v1.17.11 // indirect
3737
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
3838
github.com/mailru/easyjson v0.7.7 // indirect
3939
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
@@ -44,22 +44,22 @@ require (
4444
github.com/morikuni/aec v1.0.0 // indirect
4545
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4646
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
47-
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
47+
github.com/onsi/ginkgo/v2 v2.22.0 // indirect
4848
github.com/opencontainers/go-digest v1.0.0 // indirect
4949
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
52-
github.com/quic-go/quic-go v0.47.0 // indirect
52+
github.com/quic-go/quic-go v0.48.2 // indirect
5353
github.com/refraction-networking/utls v1.6.7 // indirect
5454
github.com/sergi/go-diff v1.3.1 // indirect
5555
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
5656
github.com/urfave/cli/v2 v2.27.1 // indirect
5757
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
5858
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
59-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
60-
golang.org/x/mod v0.21.0 // indirect
59+
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
60+
golang.org/x/mod v0.22.0 // indirect
6161
golang.org/x/sync v0.10.0 // indirect
62-
golang.org/x/tools v0.25.0 // indirect
62+
golang.org/x/tools v0.28.0 // indirect
6363
)
6464

6565
require (
@@ -133,7 +133,7 @@ require (
133133
github.com/spf13/pflag v1.0.5 // indirect
134134
github.com/tidwall/match v1.1.1 // indirect
135135
github.com/tidwall/pretty v1.2.0 // indirect
136-
go.uber.org/mock v0.4.0 // indirect
136+
go.uber.org/mock v0.5.0 // indirect
137137
golang.org/x/crypto v0.32.0 // indirect
138138
golang.org/x/net v0.34.0 // indirect
139139
golang.org/x/oauth2 v0.24.0 // indirect

0 commit comments

Comments
 (0)