Skip to content

Commit 924224b

Browse files
chore: update go modules and version (#480)
* chore: update go modules and version * chore: update client-go
1 parent 833c00c commit 924224b

File tree

392 files changed

+180
-814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

392 files changed

+180
-814
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup Go
1414
uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.23'
16+
go-version: '1.25'
1717
cache-dependency-path: ./go.mod
1818
- name: Set up environment
1919
run: echo "GOVERSION=$(go version)" >> $GITHUB_ENV

.github/workflows/docker-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
goversion:
21-
- 1.23
21+
- 1.25
2222
steps:
2323
-
2424
name: Checkout PR

.github/workflows/lagoon-core-docker-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
goversion:
14-
- 1.23
14+
- 1.25
1515
steps:
1616
-
1717
name: Checkout Branch or Tag

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install Go
2121
uses: actions/setup-go@v4
2222
with:
23-
go-version: "1.23"
23+
go-version: "1.25"
2424
- name: Install ccv
2525
run: >
2626
curl -sSL https://github.com/smlx/ccv/releases/download/v0.3.2/ccv_0.3.2_linux_amd64.tar.gz
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install Go
5050
uses: actions/setup-go@v4
5151
with:
52-
go-version: "^1.23"
52+
go-version: "^1.25"
5353
- name: Set up environment
5454
run: echo "GOVERSION=$(go version)" >> $GITHUB_ENV
5555
- name: Run GoReleaser

.github/workflows/tag-to-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install Go
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: "1.23"
19+
go-version: "1.25"
2020
- name: Set up environment
2121
run: echo "GOVERSION=$(go version)" >> $GITHUB_ENV
2222
- name: Run GoReleaser

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Setup Go
1010
uses: actions/setup-go@v5
1111
with:
12-
go-version: '1.23'
12+
go-version: '1.25'
1313
cache-dependency-path: ./go.mod
1414
- name: Run Tests
1515
run: make test

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG UPSTREAM_TAG
33
ARG GO_VER
44
FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} AS commons
55

6-
FROM golang:${GO_VER:-1.23}-alpine3.20 AS golang
6+
FROM golang:${GO_VER:-1.25}-alpine3.22 AS golang
77

88
RUN apk add --no-cache git
99
RUN go install github.com/a8m/envsubst/cmd/envsubst@v1.4.2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION=$(shell echo $(shell git describe --abbrev=0 --tags)+$(shell git rev-parse --short=8 HEAD))
22
BUILD=$(shell date +%FT%T%z)
3-
GO_VER=1.23
3+
GO_VER=1.25
44
GOOS=linux
55
GOARCH=amd64
66
PKG=github.com/uselagoon/build-deploy-tool

go.mod

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
module github.com/uselagoon/build-deploy-tool
22

3-
go 1.23.0
4-
5-
toolchain go1.23.3
3+
go 1.25.0
64

75
require (
8-
dario.cat/mergo v1.0.1
6+
dario.cat/mergo v1.0.2
97
github.com/PaesslerAG/gval v1.2.4
108
github.com/alessio/shellescape v1.4.1
11-
github.com/amazeeio/dbaas-operator v0.3.0
9+
github.com/amazeeio/dbaas-operator v0.4.0
1210
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
1311
github.com/compose-spec/compose-go v1.2.7
1412
github.com/cxmcc/unixsums v0.0.0-20131125091133-89564297d82f
1513
github.com/deckarep/golang-set/v2 v2.8.0
1614
github.com/distribution/reference v0.6.0
1715
github.com/docker/cli v27.5.1+incompatible
1816
github.com/drone/envsubst v1.0.3
19-
github.com/google/go-cmp v0.6.0
17+
github.com/google/go-cmp v0.7.0
2018
github.com/hashicorp/go-retryablehttp v0.7.7
21-
github.com/k8up-io/k8up/v2 v2.11.3
19+
github.com/k8up-io/k8up/v2 v2.13.1
2220
github.com/robfig/cron/v3 v3.0.1
23-
github.com/spf13/cobra v1.8.1
21+
github.com/spf13/cobra v1.10.0
2422
github.com/uselagoon/machinery v0.0.34
2523
github.com/vshn/k8up v1.99.99
2624
gopkg.in/yaml.v2 v2.4.0
2725
gopkg.in/yaml.v3 v3.0.1
28-
k8s.io/api v0.32.1
29-
k8s.io/apimachinery v0.32.1
30-
k8s.io/client-go v0.32.1
31-
sigs.k8s.io/controller-runtime v0.20.0
32-
sigs.k8s.io/yaml v1.4.0
26+
k8s.io/api v0.35.1
27+
k8s.io/apimachinery v0.35.1
28+
k8s.io/client-go v0.35.1
29+
sigs.k8s.io/controller-runtime v0.23.1
30+
sigs.k8s.io/yaml v1.6.0
3331
)
3432

3533
require (
@@ -38,19 +36,16 @@ require (
3836
github.com/docker/docker-credential-helpers v0.8.2 // indirect
3937
github.com/docker/go-connections v0.5.0 // indirect
4038
github.com/docker/go-units v0.5.0 // indirect
41-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
42-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
43-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
44-
github.com/go-logr/logr v1.4.2 // indirect
39+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
40+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
41+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
42+
github.com/go-logr/logr v1.4.3 // indirect
4543
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4644
github.com/go-openapi/jsonreference v0.21.0 // indirect
4745
github.com/go-openapi/swag v0.23.0 // indirect
48-
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/golang/protobuf v1.5.4 // indirect
50-
github.com/google/gnostic-models v0.6.9 // indirect
51-
github.com/google/gofuzz v1.2.0 // indirect
46+
github.com/google/gnostic-models v0.7.0 // indirect
5247
github.com/google/uuid v1.6.0 // indirect
53-
github.com/gorilla/websocket v1.5.3 // indirect
48+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5449
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5550
github.com/imdario/mergo v1.0.1 // indirect
5651
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -61,35 +56,37 @@ require (
6156
github.com/mitchellh/mapstructure v1.5.0 // indirect
6257
github.com/moby/spdystream v0.5.0 // indirect
6358
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
64-
github.com/modern-go/reflect2 v1.0.2 // indirect
59+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6560
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6661
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6762
github.com/opencontainers/go-digest v1.0.0 // indirect
6863
github.com/pkg/errors v0.9.1 // indirect
6964
github.com/sergi/go-diff v1.1.0 // indirect
7065
github.com/shopspring/decimal v1.4.0 // indirect
7166
github.com/sirupsen/logrus v1.9.3 // indirect
72-
github.com/spf13/pflag v1.0.5 // indirect
67+
github.com/spf13/pflag v1.0.9 // indirect
7368
github.com/x448/float16 v0.8.4 // indirect
7469
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
7570
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
7671
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
77-
golang.org/x/net v0.34.0 // indirect
78-
golang.org/x/oauth2 v0.25.0 // indirect
79-
golang.org/x/sync v0.10.0 // indirect
80-
golang.org/x/sys v0.29.0 // indirect
81-
golang.org/x/term v0.28.0 // indirect
82-
golang.org/x/text v0.21.0 // indirect
72+
go.yaml.in/yaml/v2 v2.4.3 // indirect
73+
go.yaml.in/yaml/v3 v3.0.4 // indirect
74+
golang.org/x/net v0.47.0 // indirect
75+
golang.org/x/oauth2 v0.30.0 // indirect
76+
golang.org/x/sync v0.18.0 // indirect
77+
golang.org/x/sys v0.38.0 // indirect
78+
golang.org/x/term v0.37.0 // indirect
79+
golang.org/x/text v0.31.0 // indirect
8380
golang.org/x/time v0.9.0 // indirect
84-
golang.org/x/tools v0.29.0 // indirect
85-
google.golang.org/protobuf v1.36.3 // indirect
86-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
81+
google.golang.org/protobuf v1.36.8 // indirect
82+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
8783
gopkg.in/inf.v0 v0.9.1 // indirect
8884
k8s.io/klog/v2 v2.130.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
90-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
91-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
92-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
85+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
86+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
87+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
88+
sigs.k8s.io/randfill v1.0.0 // indirect
89+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
9390
)
9491

9592
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

0 commit comments

Comments
 (0)