Skip to content

Sync change from develop to release 2.0.1 branch #311

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

Merged
merged 1 commit into from
Apr 7, 2025
Merged

Sync change from develop to release 2.0.1 branch #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MarkLogic® Kubernetes Helm Chart

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.
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.

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

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

Third Party Components

Curl v8.8.0 (MIT)
gjson v1.14.3 (MIT)
go-http-digest-auth-client v0.6.0 (BSD-2-Clause)
docker v24.0.7 (Apache-2.0)
gjson v1.14.3 (MIT)
haproxy helm charts vhaproxy-1.18.0 (Apache-2.0)
K8s.io/api v0.29.1 (Apache-2.0)
MarkLogic® Docker Container Image v2.0 (Apache-2.0)
req v3.48.0 (MIT)
terratest v0.46.11 (Apache-2.0)
testify v1.8.4 (MIT)
K8s.io/api v0.29.1 (Apache-2.0)
MarkLogic® Docker Container Image v2.1.2 (Apache-2.0)
req v3.50.0 (MIT)
terratest v0.48.2 (Apache-2.0)
testify v1.10.4 (MIT)

Common Licenses

Apache License 2.0 (Apache-2.0)

-------------------------------------------------------------------------

The following software may be included in this project (last updated July 24, 2024):
The following software may be included in this project (last updated Apr 03, 2025):

docker v24.0.7 (Apache-2.0)
https://pkg.go.dev/github.com/docker/[email protected]+incompatible

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

gjson v1.14.3 (MIT)

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


MarkLogic® Docker Container Image v2.0 (Apache-2.0)
MarkLogic® Docker Container Image v2.1.2 (Apache-2.0)

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

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


req v3.48.0 (MIT)
req v3.50.0 (MIT)

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

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


testify v1.10.0 (MIT)
testify v1.10.4 (MIT)

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

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
| `group.enableXdqpSsl` | SSL encryption for XDQP | `true` |
| `bootstrapHostName` | Host name of MarkLogic bootstrap host (to join a cluster) | `""` |
| `image.repository` | Repository for MarkLogic image | `progressofficial/marklogic-db` |
| `image.tag` | Image tag for MarkLogic image | `11.3.0-ubi-rootless` |
| `image.tag` | Image tag for MarkLogic image | `11.3.1-ubi-rootless-2.1.2` |
| `image.pullPolicy` | Image pull policy for MarkLogic image | `IfNotPresent` |
| `initContainers.utilContainer.image` | Image for copyCerts and volume permission change for root to rootless upgrade InitContainer | `redhat/ubi9:9.5` |
| `initContainers.utilContainer.pullPolicy` | Pull policy for copyCerts and volume permission change for root to rootless upgrade InitContainer | `IfNotPresent` |
Expand Down
4 changes: 2 additions & 2 deletions charts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
version: "1.18.0"
name: marklogic
description: MarkLogic Server is a multi-model database that has both NoSQL and trusted enterprise data management capabilities.
appVersion: "11.2.0"
appVersion: "11.3.1"
type: application
keywords:
- marklogic
Expand All @@ -17,4 +17,4 @@ keywords:
sources:
- https://github.com/marklogic/marklogic-kubernetes
- https://www.marklogic.com/
version: 2.0.0
version: 2.0.1
24 changes: 12 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/marklogic/marklogic-kubernetes

go 1.23.5
go 1.23.6

require (
github.com/docker/docker v24.0.7+incompatible
github.com/gruntwork-io/terratest v0.48.2
github.com/imroc/req/v3 v3.48.0
github.com/imroc/req/v3 v3.50.0
github.com/stretchr/testify v1.10.0
github.com/tidwall/gjson v1.14.3
k8s.io/api v0.29.1
Expand All @@ -14,8 +14,8 @@ require (
require (
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/Microsoft/go-winio v0.4.14 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/cloudflare/circl v1.4.0 // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand All @@ -30,10 +30,10 @@ require (
github.com/gonvenience/wrap v1.2.0 // indirect
github.com/gonvenience/ytbx v1.4.4 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/homeport/dyff v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
Expand All @@ -44,22 +44,22 @@ require (
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
github.com/onsi/ginkgo/v2 v2.22.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/quic-go/qpack v0.5.1 // indirect
github.com/quic-go/quic-go v0.47.0 // indirect
github.com/quic-go/quic-go v0.48.2 // indirect
github.com/refraction-networking/utls v1.6.7 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/urfave/cli/v2 v2.27.1 // indirect
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/tools v0.25.0 // indirect
golang.org/x/tools v0.28.0 // indirect
)

require (
Expand Down Expand Up @@ -133,7 +133,7 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/mock v0.5.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
Expand Down
Loading