Skip to content

Commit 43dfae4

Browse files
committed
Merge branch 'master' into sidecar-patch
2 parents 0bd3d21 + d012192 commit 43dfae4

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the sidecar-injector binary
2-
FROM golang:1.22 AS builder
2+
FROM golang:1.26 AS builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
module github.com/morvencao/kube-sidecar-injector
22

3-
go 1.22.0
4-
5-
toolchain go1.22.2
3+
go 1.26
64

75
require (
8-
gopkg.in/yaml.v2 v2.4.0
96
k8s.io/api v0.30.0
107
k8s.io/apimachinery v0.30.0
118
k8s.io/client-go v0.30.0
129
)
1310

11+
require gopkg.in/yaml.v2 v2.4.0 // indirect
12+
1413
require (
1514
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
1615
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -41,7 +40,7 @@ require (
4140
google.golang.org/protobuf v1.34.0 // indirect
4241
gopkg.in/inf.v0 v0.9.1 // indirect
4342
gopkg.in/yaml.v3 v3.0.1 // indirect
44-
k8s.io/klog/v2 v2.120.1 // indirect
43+
k8s.io/klog/v2 v2.120.1
4544
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
4645
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
4746
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)