Skip to content

Commit 1cbdfae

Browse files
pengzhoumlPeng Zhou
andauthored
MLE-4172 Update default image version for Helm Chart 1.1.0 release (#181)
* MLE-4172 update default image version for helm 1.1.0 release * MLE-4169 update go library before Helm 1.1.0 release * fix linting issue * fix template test * MLE-4172 update the haproxy docker image to 2.9.4 * MLE-12200 test jenkins updates * Revert "fix linting issue" This reverts commit ad57e57. * revert change for jenkinsfile * update the Chart version for 1.1.0 * update the go version to 1.21 --------- Co-authored-by: Peng Zhou <[email protected]>
1 parent 7eda5c7 commit 1cbdfae

File tree

6 files changed

+220
-229
lines changed

6 files changed

+220
-229
lines changed

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.0.2"
11+
appVersion: "11.1.0"
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: 1.0.2
20+
version: 1.1.0

charts/charts/haproxy/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name: haproxy
1717
description: A Helm chart for HAProxy on Kubernetes
1818
type: application
1919
version: 1.18.0
20-
appVersion: 2.6.9
20+
appVersion: 2.9.4
2121
kubeVersion: ">=1.17.0-0"
2222
keywords:
2323
- haproxy
@@ -31,7 +31,7 @@ maintainers:
3131
engine: gotpl
3232
annotations:
3333
artifacthub.io/changes: |
34-
- Update base image to HAProxy 2.6.9
34+
- Update base image to HAProxy 2.9.4
3535
- Update HPA API version (#172)
3636
- Fix HPA spec (#173)
3737
- Ensure api version capabilities of PodDisruptionBudget (#175)

charts/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ image:
3434
## Init container image parameters
3535
initContainers:
3636
configureGroup:
37-
image: "curlimages/curl:8.4.0"
37+
image: "curlimages/curl:8.6.0"
3838
pullPolicy: IfNotPresent
3939
copyCerts:
4040
image: "redhat/ubi9:9.3"
@@ -303,7 +303,7 @@ startupProbe:
303303
## And export them to a logging backend specified in the outputs section below
304304
logCollection:
305305
enabled: false
306-
image: fluent/fluent-bit:2.1.10
306+
image: fluent/fluent-bit:2.2.2
307307
resources:
308308
requests:
309309
cpu: "100m"

go.mod

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

3-
go 1.21.1
3+
go 1.21
44

55
require (
6-
github.com/gruntwork-io/terratest v0.44.1
7-
github.com/stretchr/testify v1.8.1
6+
github.com/gruntwork-io/terratest v0.46.11
7+
github.com/stretchr/testify v1.8.4
88
github.com/tidwall/gjson v1.14.3
99
github.com/xinsnake/go-http-digest-auth-client v0.6.0
10-
k8s.io/api v0.27.2
10+
k8s.io/api v0.29.1
1111
)
1212

1313
require (
14+
github.com/BurntSushi/toml v1.3.2 // indirect
1415
github.com/andybalholm/brotli v1.0.5 // indirect
1516
github.com/cloudflare/circl v1.3.3 // indirect
16-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
17+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
1718
github.com/gaukas/godicttls v0.0.4 // indirect
18-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
19-
github.com/go-openapi/jsonreference v0.20.1 // indirect
20-
github.com/go-openapi/swag v0.22.3 // indirect
19+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
20+
github.com/go-openapi/jsonreference v0.20.4 // indirect
21+
github.com/go-openapi/swag v0.22.9 // indirect
2122
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
2223
github.com/golang/mock v1.6.0 // indirect
23-
github.com/google/gnostic v0.5.7-v3refs // indirect
24+
github.com/gonvenience/bunt v1.3.5 // indirect
25+
github.com/gonvenience/neat v1.3.12 // indirect
26+
github.com/gonvenience/term v1.0.2 // indirect
27+
github.com/gonvenience/text v1.0.7 // indirect
28+
github.com/gonvenience/wrap v1.2.0 // indirect
29+
github.com/gonvenience/ytbx v1.4.4 // indirect
30+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
2431
github.com/google/pprof v0.0.0-20230901174712-0191c66da455 // indirect
32+
github.com/homeport/dyff v1.6.0 // indirect
2533
github.com/josharian/intern v1.0.0 // indirect
2634
github.com/klauspost/compress v1.16.7 // indirect
35+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
2736
github.com/mailru/easyjson v0.7.7 // indirect
37+
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
38+
github.com/mattn/go-isatty v0.0.20 // indirect
39+
github.com/mitchellh/go-ps v1.0.0 // indirect
40+
github.com/mitchellh/hashstructure v1.1.0 // indirect
2841
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
29-
github.com/onsi/ginkgo/v2 v2.12.0 // indirect
42+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
43+
github.com/onsi/ginkgo/v2 v2.13.0 // indirect
3044
github.com/quic-go/qpack v0.4.0 // indirect
3145
github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
3246
github.com/quic-go/quic-go v0.38.1 // indirect
3347
github.com/refraction-networking/utls v1.5.3 // indirect
34-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
35-
golang.org/x/mod v0.12.0 // indirect
36-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
48+
github.com/sergi/go-diff v1.3.1 // indirect
49+
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
50+
github.com/urfave/cli/v2 v2.27.1 // indirect
51+
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
52+
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
53+
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
54+
golang.org/x/mod v0.14.0 // indirect
55+
golang.org/x/sync v0.6.0 // indirect
56+
golang.org/x/tools v0.17.0 // indirect
3757
)
3858

3959
require (
40-
github.com/aws/aws-sdk-go v1.44.122 // indirect
41-
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
42-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
60+
github.com/aws/aws-sdk-go v1.50.8 // indirect
61+
github.com/boombuler/barcode v1.0.1 // indirect
62+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
4363
github.com/davecgh/go-spew v1.1.1 // indirect
4464
github.com/ghodss/yaml v1.0.0 // indirect
45-
github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
46-
github.com/go-logr/logr v1.2.4 // indirect
47-
github.com/go-sql-driver/mysql v1.4.1 // indirect
65+
github.com/go-errors/errors v1.5.1 // indirect
66+
github.com/go-logr/logr v1.4.1 // indirect
67+
github.com/go-sql-driver/mysql v1.7.1 // indirect
4868
github.com/gogo/protobuf v1.3.2 // indirect
4969
github.com/golang/protobuf v1.5.3 // indirect
50-
github.com/google/go-cmp v0.5.9 // indirect
51-
github.com/google/gofuzz v1.1.0 // indirect
52-
github.com/google/uuid v1.3.0 // indirect
53-
github.com/gruntwork-io/go-commons v0.8.0 // indirect
70+
github.com/google/gofuzz v1.2.0 // indirect
71+
github.com/google/uuid v1.6.0 // indirect
72+
github.com/gruntwork-io/go-commons v0.17.1 // indirect
5473
github.com/hashicorp/errwrap v1.1.0 // indirect
5574
github.com/hashicorp/go-multierror v1.1.1 // indirect
56-
github.com/imdario/mergo v0.3.12 // indirect
75+
github.com/imdario/mergo v0.3.16 // indirect
5776
github.com/imroc/req/v3 v3.42.0
5877
github.com/jmespath/go-jmespath v0.4.0 // indirect
5978
github.com/json-iterator/go v1.1.12 // indirect
60-
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
79+
github.com/mattn/go-zglob v0.0.4 // indirect
6180
github.com/mitchellh/go-homedir v1.1.0 // indirect
6281
github.com/moby/spdystream v0.2.0 // indirect
6382
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6483
github.com/modern-go/reflect2 v1.0.2 // indirect
6584
github.com/pmezard/go-difflib v1.0.0 // indirect
66-
github.com/pquerna/otp v1.2.0 // indirect
85+
github.com/pquerna/otp v1.4.0 // indirect
6786
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6887
github.com/spf13/pflag v1.0.5 // indirect
6988
github.com/tidwall/match v1.1.1 // indirect
7089
github.com/tidwall/pretty v1.2.0 // indirect
71-
github.com/urfave/cli v1.22.2 // indirect
72-
golang.org/x/crypto v0.12.0 // indirect
73-
golang.org/x/net v0.14.0 // indirect
74-
golang.org/x/oauth2 v0.1.0 // indirect
75-
golang.org/x/sys v0.12.0 // indirect
76-
golang.org/x/term v0.11.0 // indirect
77-
golang.org/x/text v0.13.0 // indirect
78-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
79-
google.golang.org/appengine v1.6.7 // indirect
80-
google.golang.org/protobuf v1.31.0 // indirect
90+
golang.org/x/crypto v0.18.0 // indirect
91+
golang.org/x/net v0.20.0 // indirect
92+
golang.org/x/oauth2 v0.16.0 // indirect
93+
golang.org/x/sys v0.16.0 // indirect
94+
golang.org/x/term v0.16.0 // indirect
95+
golang.org/x/text v0.14.0 // indirect
96+
golang.org/x/time v0.5.0 // indirect
97+
google.golang.org/appengine v1.6.8 // indirect
98+
google.golang.org/protobuf v1.32.0 // indirect
8199
gopkg.in/inf.v0 v0.9.1 // indirect
82100
gopkg.in/yaml.v2 v2.4.0 // indirect
83101
gopkg.in/yaml.v3 v3.0.1 // indirect
84-
k8s.io/apimachinery v0.27.2 // indirect
85-
k8s.io/client-go v0.27.2 // indirect
86-
k8s.io/klog/v2 v2.90.1 // indirect
87-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
88-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
102+
k8s.io/apimachinery v0.29.1 // indirect
103+
k8s.io/client-go v0.29.1 // indirect
104+
k8s.io/klog/v2 v2.120.1 // indirect
105+
k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec // indirect
106+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
89107
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
90-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
91-
sigs.k8s.io/yaml v1.3.0 // indirect
108+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109+
sigs.k8s.io/yaml v1.4.0 // indirect
92110
)

0 commit comments

Comments
 (0)