Skip to content

Commit 96b19d1

Browse files
kychengkycheng
authored
chore: update Go version and dependencies; add IPv6 support for SonarQube ingress OIDC deployment (#45)
- Updated Go version in Dockerfile from 1.23.7 to 1.25.2. - Modified go.mod to update various dependencies, including: - `github.com/cucumber/godog` to v0.15.1 - `k8s.io` dependencies to v0.33.5 - Other indirect dependencies to their latest versions. - Added a new YAML configuration for SonarQube ingress with IPv6 support. - Updated feature file to conditionally use the new IPv6 YAML configuration.
1 parent 804aa80 commit 96b19d1

File tree

5 files changed

+273
-239
lines changed

5 files changed

+273
-239
lines changed

‎testing/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-mirrors.alauda.cn/library/golang:1.23.7-bookworm AS builder
1+
FROM docker-mirrors.alauda.cn/library/golang:1.25.2-bookworm AS builder
22

33
WORKDIR /app
44

‎testing/features/sonarqube-ingress-oidc-deploy.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
| mkdir -p output/images |
2323
当 已导入 "sonarqube 实例" 资源
2424
"""
25-
yaml: "./testdata/sonar-oidc.yaml"
25+
yaml: <template.{{ ternary "./testdata/sonar-oidc-ipv6.yaml" "./testdata/sonar-oidc.yaml" (eq .acp.protocolStack "IPv6") }}>
2626
"""
2727
那么 "sonarqube" 可以正常访问
2828
"""

‎testing/go.mod‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,87 @@
11
module sonarqube
22

3-
go 1.23.7
4-
5-
toolchain go1.24.2
3+
go 1.25.1
64

75
require (
86
github.com/AlaudaDevops/bdd v0.0.0-20250520092225-08e5f21c96bc
9-
github.com/cucumber/godog v0.15.0
7+
github.com/cucumber/godog v0.15.1
108
github.com/go-resty/resty/v2 v2.6.0
119
github.com/playwright-community/playwright-go v0.4902.0
1210
go.uber.org/zap v1.27.0
1311
gopkg.in/yaml.v3 v3.0.1
14-
k8s.io/apimachinery v0.32.1
15-
k8s.io/client-go v0.32.1
12+
k8s.io/apimachinery v0.33.5
13+
k8s.io/client-go v0.33.5
1614
)
1715

1816
require (
19-
cel.dev/expr v0.19.1 // indirect
17+
cel.dev/expr v0.19.3 // indirect
2018
code.gitea.io/sdk/gitea v0.19.0 // indirect
2119
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
2220
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
23-
dario.cat/mergo v1.0.1 // indirect
21+
dario.cat/mergo v1.0.2 // indirect
2422
github.com/AlaudaDevops/pkg v0.13.1-0.20250517020307-0e33c480e2ce // indirect
25-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
23+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2624
github.com/Microsoft/go-winio v0.6.2 // indirect
27-
github.com/ProtonMail/go-crypto v1.1.3 // indirect
28-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
25+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
26+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2927
github.com/beorn7/perks v1.0.1 // indirect
3028
github.com/blang/semver/v4 v4.0.0 // indirect
3129
github.com/blendle/zapdriver v1.3.1 // indirect
3230
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3331
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3432
github.com/cloudevents/sdk-go/v2 v2.15.2 // indirect
35-
github.com/cloudflare/circl v1.3.7 // indirect
33+
github.com/cloudflare/circl v1.6.1 // indirect
3634
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
3735
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
3836
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
39-
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
37+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
4038
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4139
github.com/davidmz/go-pageant v1.0.2 // indirect
4240
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
43-
github.com/docker/cli v27.5.0+incompatible // indirect
41+
github.com/docker/cli v28.2.2+incompatible // indirect
4442
github.com/docker/distribution v2.8.3+incompatible // indirect
45-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
46-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
43+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
44+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4745
github.com/emirpasic/gods v1.18.1 // indirect
48-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
46+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4947
github.com/felixge/httpsnoop v1.0.4 // indirect
5048
github.com/fsnotify/fsnotify v1.8.0 // indirect
51-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
49+
github.com/fxamacker/cbor/v2 v2.7.1 // indirect
5250
github.com/go-fed/httpsig v1.1.0 // indirect
5351
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
54-
github.com/go-git/go-billy/v5 v5.6.0 // indirect
55-
github.com/go-git/go-git/v5 v5.13.0 // indirect
52+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
53+
github.com/go-git/go-git/v5 v5.13.2 // indirect
5654
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
5755
github.com/go-kit/log v0.2.1 // indirect
5856
github.com/go-logfmt/logfmt v0.5.1 // indirect
59-
github.com/go-logr/logr v1.4.2 // indirect
57+
github.com/go-logr/logr v1.4.3 // indirect
6058
github.com/go-logr/stdr v1.2.2 // indirect
6159
github.com/go-logr/zapr v1.3.0 // indirect
62-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
63-
github.com/go-openapi/jsonreference v0.21.0 // indirect
64-
github.com/go-openapi/swag v0.23.0 // indirect
65-
github.com/go-sprout/sprout v1.0.0 // indirect
60+
github.com/go-openapi/jsonpointer v0.22.0 // indirect
61+
github.com/go-openapi/jsonreference v0.21.1 // indirect
62+
github.com/go-openapi/swag v0.23.1 // indirect
63+
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
64+
github.com/go-sprout/sprout v1.0.2 // indirect
6665
github.com/go-stack/stack v1.8.1 // indirect
6766
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6867
github.com/godogx/allure v0.2.4 // indirect
6968
github.com/gofrs/uuid v4.4.0+incompatible // indirect
7069
github.com/gogo/protobuf v1.3.2 // indirect
71-
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
7270
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
7371
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7472
github.com/golang/protobuf v1.5.4 // indirect
73+
github.com/google/btree v1.1.3 // indirect
7574
github.com/google/cel-go v0.24.1 // indirect
76-
github.com/google/gnostic-models v0.6.8 // indirect
75+
github.com/google/gnostic-models v0.6.9 // indirect
7776
github.com/google/go-cmp v0.7.0 // indirect
78-
github.com/google/go-containerregistry v0.20.3 // indirect
79-
github.com/google/gofuzz v1.2.0 // indirect
80-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
77+
github.com/google/go-containerregistry v0.20.6 // indirect
78+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
8179
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8280
github.com/google/uuid v1.6.0 // indirect
83-
github.com/gorilla/websocket v1.5.1 // indirect
84-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
81+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
82+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
8583
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
86-
github.com/hashicorp/go-memdb v1.3.4 // indirect
84+
github.com/hashicorp/go-memdb v1.3.5 // indirect
8785
github.com/hashicorp/go-version v1.6.0 // indirect
8886
github.com/hashicorp/golang-lru v1.0.2 // indirect
8987
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -92,7 +90,7 @@ require (
9290
github.com/kelseyhightower/envconfig v1.4.0 // indirect
9391
github.com/kevinburke/ssh_config v1.2.0 // indirect
9492
github.com/klauspost/compress v1.18.0 // indirect
95-
github.com/mailru/easyjson v0.7.7 // indirect
93+
github.com/mailru/easyjson v0.9.0 // indirect
9694
github.com/mitchellh/copystructure v1.2.0 // indirect
9795
github.com/mitchellh/go-homedir v1.1.0 // indirect
9896
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -102,71 +100,73 @@ require (
102100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103101
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
104102
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
105-
github.com/onsi/ginkgo/v2 v2.21.0 // indirect
106-
github.com/onsi/gomega v1.35.1 // indirect
103+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
104+
github.com/onsi/gomega v1.36.3 // indirect
107105
github.com/opencontainers/go-digest v1.0.0 // indirect
108106
github.com/opencontainers/image-spec v1.1.1 // indirect
109107
github.com/openzipkin/zipkin-go v0.4.3 // indirect
110108
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
111-
github.com/pjbgf/sha1cd v0.3.0 // indirect
109+
github.com/pjbgf/sha1cd v0.3.2 // indirect
112110
github.com/pkg/errors v0.9.1 // indirect
113-
github.com/prometheus/client_golang v1.21.1 // indirect
114-
github.com/prometheus/client_model v0.6.1 // indirect
111+
github.com/prometheus/client_golang v1.22.0 // indirect
112+
github.com/prometheus/client_model v0.6.2 // indirect
115113
github.com/prometheus/common v0.62.0 // indirect
116114
github.com/prometheus/procfs v0.15.1 // indirect
117-
github.com/prometheus/statsd_exporter v0.22.7 // indirect
115+
github.com/prometheus/statsd_exporter v0.22.8 // indirect
118116
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
119117
github.com/sirupsen/logrus v1.9.3 // indirect
120-
github.com/skeema/knownhosts v1.3.0 // indirect
121-
github.com/spf13/cast v1.7.1 // indirect
122-
github.com/spf13/pflag v1.0.6 // indirect
123-
github.com/stoewer/go-strcase v1.2.0 // indirect
124-
github.com/vbatts/tar-split v0.11.6 // indirect
118+
github.com/skeema/knownhosts v1.3.1 // indirect
119+
github.com/spf13/cast v1.9.2 // indirect
120+
github.com/spf13/pflag v1.0.10 // indirect
121+
github.com/stoewer/go-strcase v1.3.1 // indirect
122+
github.com/vbatts/tar-split v0.12.1 // indirect
125123
github.com/x448/float16 v0.8.4 // indirect
126124
github.com/xanzy/ssh-agent v0.3.3 // indirect
127125
go.opencensus.io v0.24.0 // indirect
128126
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
129-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
130-
go.opentelemetry.io/otel v1.35.0 // indirect
127+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
128+
go.opentelemetry.io/otel v1.36.0 // indirect
131129
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
132130
go.opentelemetry.io/otel/exporters/zipkin v1.2.0 // indirect
133-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
134-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
135-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
131+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
132+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
133+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
136134
go.uber.org/atomic v1.10.0 // indirect
135+
go.uber.org/automaxprocs v1.6.0 // indirect
137136
go.uber.org/multierr v1.11.0 // indirect
138-
golang.org/x/crypto v0.38.0 // indirect
137+
golang.org/x/crypto v0.42.0 // indirect
139138
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
140-
golang.org/x/net v0.40.0 // indirect
141-
golang.org/x/oauth2 v0.26.0 // indirect
142-
golang.org/x/sync v0.14.0 // indirect
143-
golang.org/x/sys v0.33.0 // indirect
144-
golang.org/x/term v0.32.0 // indirect
145-
golang.org/x/text v0.25.0 // indirect
146-
golang.org/x/time v0.11.0 // indirect
147-
golang.org/x/tools v0.29.0 // indirect
139+
golang.org/x/net v0.44.0 // indirect
140+
golang.org/x/oauth2 v0.31.0 // indirect
141+
golang.org/x/sync v0.17.0 // indirect
142+
golang.org/x/sys v0.36.0 // indirect
143+
golang.org/x/term v0.35.0 // indirect
144+
golang.org/x/text v0.29.0 // indirect
145+
golang.org/x/time v0.13.0 // indirect
146+
golang.org/x/tools v0.37.0 // indirect
148147
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
149148
google.golang.org/api v0.183.0 // indirect
150-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
151-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
152-
google.golang.org/grpc v1.71.0 // indirect
153-
google.golang.org/protobuf v1.36.5 // indirect
149+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
150+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
151+
google.golang.org/grpc v1.71.3 // indirect
152+
google.golang.org/protobuf v1.36.9 // indirect
154153
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
155154
gopkg.in/inf.v0 v0.9.1 // indirect
156155
gopkg.in/warnings.v0 v0.1.2 // indirect
157156
gopkg.in/yaml.v2 v2.4.0 // indirect
158-
k8s.io/api v0.32.1 // indirect
159-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
160-
k8s.io/apiserver v0.31.0 // indirect
161-
k8s.io/component-base v0.31.2 // indirect
157+
k8s.io/api v0.33.5 // indirect
158+
k8s.io/apiextensions-apiserver v0.33.5 // indirect
159+
k8s.io/apiserver v0.33.5 // indirect
160+
k8s.io/component-base v0.33.5 // indirect
162161
k8s.io/klog/v2 v2.130.1 // indirect
163-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
164-
k8s.io/kubectl v0.31.2 // indirect
162+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
163+
k8s.io/kubectl v0.31.13 // indirect
165164
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
166165
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626 // indirect
167-
sigs.k8s.io/controller-runtime v0.19.1 // indirect
166+
sigs.k8s.io/controller-runtime v0.21.0 // indirect
168167
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
169-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
168+
sigs.k8s.io/randfill v1.0.0 // indirect
169+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
170170
sigs.k8s.io/yaml v1.4.0 // indirect
171171
yunion.io/x/pkg v0.0.0-20210218105412-13a69f60034c // indirect
172172
)

0 commit comments

Comments
 (0)