Skip to content

Merge changes back to develop #315

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 12 commits into from
Closed

Merge changes back to develop #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
863d50f
Merge pull request #294 from marklogic/MLE-17900/Update-README
rwinieski Nov 25, 2024
4cc6f35
Merge pull request #296 from marklogic/release/2.0.0-readme-update
pengzhouml Nov 27, 2024
2fc77a1
Merge pull request #310 from marklogic/develop
pengzhouml Apr 4, 2025
6d6b51c
MLE-20917 update notice file for Helm 2.0.1 Release (#309)
pengzhouml Apr 4, 2025
e0cb821
update the license because of name change
Apr 7, 2025
4038439
MLE-20917 update docker version for security vulnerabilities fix
Apr 8, 2025
09cca44
Merge pull request #312 from marklogic/bugfix/MLE-20917-update-docker…
rwinieski Apr 10, 2025
3ca0eda
Change the Chart version to 2.1.0
Apr 14, 2025
833b8f8
update notice file
Apr 14, 2025
d3ca61e
update copyright infomation for license
Apr 14, 2025
93542e2
adjust modification copyright
Apr 14, 2025
c35dca1
Merge pull request #314 from marklogic/release/2.1.0
pengzhouml Apr 14, 2025
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 LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2022-2025 MarkLogic Corporation.
Copyright © 2022-2025 Progress Software Corporation and/or one of its subsidiaries or affiliates. All rights reserved.

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

Expand Down
184 changes: 92 additions & 92 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

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.1.0
2 changes: 1 addition & 1 deletion charts/charts/haproxy/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

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

Expand Down
2 changes: 1 addition & 1 deletion charts/charts/haproxy/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

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

Expand Down
2 changes: 1 addition & 1 deletion charts/charts/haproxy/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

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

Expand Down
2 changes: 1 addition & 1 deletion charts/charts/haproxy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Modifications copyright © 2022-2025 MarkLogic Corporation.
# Modifications copyright © 2022-2025 Progress Software Corporation and/or one of its subsidiaries or affiliates.
# This file is modified from the original file to support the MarkLogic Kubernetes Helm Chart.

## Default values for HAProxy
Expand Down
53 changes: 32 additions & 21 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/docker/docker v28.0.4+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,9 +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/docker/distribution v2.8.2+incompatible // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
Expand All @@ -30,10 +29,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 +43,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/sync v0.10.0 // indirect
golang.org/x/tools v0.25.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.11.0 // indirect
golang.org/x/tools v0.28.0 // indirect
)

require (
Expand Down Expand Up @@ -101,11 +100,15 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/boombuler/barcode v1.0.1 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-sql-driver/mysql v1.8.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -124,6 +127,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mattn/go-zglob v0.0.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -133,15 +137,22 @@ 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
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.uber.org/mock v0.5.0 // indirect
golang.org/x/crypto v0.33.0 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.8.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading