Skip to content

Commit 097c96e

Browse files
LiyangWJasonCaoGit
LiyangW
and
JasonCaoGit
authored
Upgrade Go version to 1.23.9 in .tool-versions, Dockerfile, and go.mo… (#47)
* vuls fixed * bugs fixed * Upgrade Go version to 1.23.9 in .tool-versions, Dockerfile, and go.mod; update dependencies in go.sum. * added update to openssl in dockerfile * Upgrade Go version to 1.24.4, update dependencies in go.mod and go.sum, and change KUBEBUILDER_VERSION to 1.30.0 in Makefile. * Remove unused indirect dependencies from go.mod and go.sum, including antlr4, govalidator, backoff v4, and yaml v2. * upgrade * 1.24 * downgrad * 1.24 --------- Co-authored-by: JasonCaoGit <jason.cao@ibm.com>
1 parent c5a97e2 commit 097c96e

File tree

5 files changed

+266
-247
lines changed

5 files changed

+266
-247
lines changed

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.22.5
1+
golang 1.24.4

‎Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine AS build_deps
1+
FROM golang:1.24-alpine AS build_deps
22

33
RUN apk add --no-cache git
44

@@ -18,8 +18,10 @@ RUN CGO_ENABLED=0 go build -o webhook -ldflags '-w -extldflags "-static"' .
1818
FROM alpine:3 as final
1919

2020
RUN addgroup -g 1000 appgroup && adduser -u 1000 -G appgroup -D webhook
21-
22-
RUN apk add --no-cache ca-certificates
21+
# Ensure openssl is up to date
22+
RUN apk add --no-cache ca-certificates \
23+
&& apk -U upgrade \
24+
&& rm -rf /var/cache/apk/*
2325

2426
USER 1000
2527

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ IMAGE_TAG := "latest"
77

88
OUT := $(shell pwd)/_out
99

10-
KUBEBUILDER_VERSION=1.28.0
10+
KUBEBUILDER_VERSION=1.30.0
1111

1212
HELM_FILES := $(shell find deploy/cert-manager-ibm-cis-webhook)
1313

‎go.mod‎

Lines changed: 75 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,118 @@
11
module github.com/ibm-skills-network/cert-manager-webhook-ibm-cis
22

3-
go 1.22.0
3+
go 1.24.0
44

5-
toolchain go1.23.0
5+
toolchain go1.24.4
66

77
require (
8-
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be
9-
github.com/cert-manager/cert-manager v1.15.3
10-
k8s.io/apiextensions-apiserver v0.30.5
11-
k8s.io/client-go v0.30.5
8+
github.com/IBM-Cloud/bluemix-go v0.0.0-20250409011132-bdd4531aaa04
9+
github.com/cert-manager/cert-manager v1.18.0
10+
k8s.io/apiextensions-apiserver v0.33.1
11+
k8s.io/client-go v0.33.1
1212
)
1313

1414
require (
15-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
16-
github.com/google/gnostic-models v0.6.8 // indirect
17-
github.com/miekg/dns v1.1.59 // indirect
18-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
19-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
15+
cel.dev/expr v0.24.0 // indirect
16+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
17+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
18+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
19+
github.com/google/btree v1.1.3 // indirect
20+
github.com/google/gnostic-models v0.6.9 // indirect
21+
github.com/kylelemons/godebug v1.1.0 // indirect
22+
github.com/miekg/dns v1.1.65 // indirect
23+
github.com/x448/float16 v0.8.4 // indirect
24+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
25+
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
26+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
27+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
28+
sigs.k8s.io/randfill v1.0.0 // indirect
2029
)
2130

2231
require (
2332
github.com/NYTimes/gziphandler v1.1.1 // indirect
24-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2533
github.com/beorn7/perks v1.0.1 // indirect
2634
github.com/blang/semver/v4 v4.0.0 // indirect
27-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2835
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2936
github.com/coreos/go-semver v0.3.1 // indirect
3037
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3138
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
33-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
34-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
40+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
41+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3542
github.com/felixge/httpsnoop v1.0.4 // indirect
36-
github.com/fsnotify/fsnotify v1.7.0 // indirect
37-
github.com/go-logr/logr v1.4.2 // indirect
43+
github.com/fsnotify/fsnotify v1.9.0 // indirect
44+
github.com/go-logr/logr v1.4.3 // indirect
3845
github.com/go-logr/stdr v1.2.2 // indirect
3946
github.com/go-logr/zapr v1.3.0 // indirect
40-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
47+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4148
github.com/go-openapi/jsonreference v0.21.0 // indirect
42-
github.com/go-openapi/swag v0.23.0 // indirect
49+
github.com/go-openapi/swag v0.23.1 // indirect
4350
github.com/gogo/protobuf v1.3.2 // indirect
44-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4551
github.com/golang/protobuf v1.5.4 // indirect
46-
github.com/google/cel-go v0.17.8 // indirect
47-
github.com/google/go-cmp v0.6.0 // indirect
48-
github.com/google/gofuzz v1.2.0 // indirect
52+
github.com/google/cel-go v0.25.0 // indirect
53+
github.com/google/go-cmp v0.7.0 // indirect
4954
github.com/google/uuid v1.6.0 // indirect
5055
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
51-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
52-
github.com/imdario/mergo v0.3.16 // indirect
56+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
5357
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5458
github.com/josharian/intern v1.0.0 // indirect
5559
github.com/json-iterator/go v1.1.12 // indirect
56-
github.com/mailru/easyjson v0.7.7 // indirect
60+
github.com/mailru/easyjson v0.9.0 // indirect
5761
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5862
github.com/modern-go/reflect2 v1.0.2 // indirect
5963
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6064
github.com/pkg/errors v0.9.1 // indirect
61-
github.com/prometheus/client_golang v1.18.0 // indirect
62-
github.com/prometheus/client_model v0.6.1 // indirect
63-
github.com/prometheus/common v0.46.0 // indirect
64-
github.com/prometheus/procfs v0.15.1 // indirect
65+
github.com/prometheus/client_golang v1.22.0 // indirect
66+
github.com/prometheus/client_model v0.6.2 // indirect
67+
github.com/prometheus/common v0.64.0 // indirect
68+
github.com/prometheus/procfs v0.16.1 // indirect
6569
github.com/sirupsen/logrus v1.9.3
66-
github.com/spf13/cobra v1.8.1 // indirect
67-
github.com/spf13/pflag v1.0.5 // indirect
70+
github.com/spf13/cobra v1.9.1 // indirect
71+
github.com/spf13/pflag v1.0.6 // indirect
6872
github.com/stoewer/go-strcase v1.3.0 // indirect
69-
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
70-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
71-
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
73-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
74-
go.opentelemetry.io/otel v1.26.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
76-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
77-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
78-
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
79-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
80-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
73+
go.etcd.io/etcd/api/v3 v3.6.1 // indirect
74+
go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect
75+
go.etcd.io/etcd/client/v3 v3.6.1 // indirect
76+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
77+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
78+
go.opentelemetry.io/otel v1.36.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
82+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
84+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
8185
go.uber.org/multierr v1.11.0 // indirect
8286
go.uber.org/zap v1.27.0 // indirect
83-
golang.org/x/crypto v0.27.0 // indirect
84-
golang.org/x/mod v0.21.0 // indirect
85-
golang.org/x/net v0.29.0 // indirect
86-
golang.org/x/oauth2 v0.21.0 // indirect
87-
golang.org/x/sync v0.8.0 // indirect
88-
golang.org/x/sys v0.25.0 // indirect
89-
golang.org/x/term v0.24.0 // indirect
90-
golang.org/x/text v0.18.0 // indirect
91-
golang.org/x/time v0.5.0 // indirect
92-
golang.org/x/tools v0.25.0 // indirect
93-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
94-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
95-
google.golang.org/grpc v1.66.2 // indirect
96-
google.golang.org/protobuf v1.34.2 // indirect
87+
golang.org/x/crypto v0.39.0 // indirect
88+
golang.org/x/mod v0.25.0 // indirect
89+
golang.org/x/net v0.41.0 // indirect
90+
golang.org/x/oauth2 v0.30.0 // indirect
91+
golang.org/x/sync v0.15.0 // indirect
92+
golang.org/x/sys v0.33.0 // indirect
93+
golang.org/x/term v0.32.0 // indirect
94+
golang.org/x/text v0.26.0 // indirect
95+
golang.org/x/time v0.12.0 // indirect
96+
golang.org/x/tools v0.34.0 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
99+
google.golang.org/grpc v1.73.0 // indirect
100+
google.golang.org/protobuf v1.36.6 // indirect
97101
gopkg.in/inf.v0 v0.9.1 // indirect
98102
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
99-
gopkg.in/yaml.v2 v2.4.0 // indirect
100103
gopkg.in/yaml.v3 v3.0.1 // indirect
101-
k8s.io/api v0.30.5 // indirect
102-
k8s.io/apimachinery v0.30.5 // indirect
103-
k8s.io/apiserver v0.30.5 // indirect
104-
k8s.io/component-base v0.30.5 // indirect
104+
k8s.io/api v0.33.1 // indirect
105+
k8s.io/apimachinery v0.33.1 // indirect
106+
k8s.io/apiserver v0.33.1 // indirect
107+
k8s.io/component-base v0.33.1 // indirect
105108
k8s.io/klog/v2 v2.130.1 // indirect
106-
k8s.io/kms v0.30.5 // indirect
107-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
108-
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
109-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
110-
sigs.k8s.io/controller-runtime v0.18.5 // indirect
111-
sigs.k8s.io/gateway-api v1.1.0 // indirect
112-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
113-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109+
k8s.io/kms v0.33.1 // indirect
110+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
111+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
112+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
113+
sigs.k8s.io/controller-runtime v0.21.0 // indirect
114+
sigs.k8s.io/gateway-api v1.3.0 // indirect
115+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
116+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
114117
sigs.k8s.io/yaml v1.4.0 // indirect
115118
)

0 commit comments

Comments
 (0)