Skip to content

Commit 3b7ad28

Browse files
committed
Update go and some minor dependencies
1 parent d6e9ac0 commit 3b7ad28

File tree

175 files changed

+33649
-7909
lines changed

Some content is hidden

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

175 files changed

+33649
-7909
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@master
1111
- uses: actions/setup-go@v3
1212
with:
13-
go-version: '1.18.1'
13+
go-version: "1.24.2"
1414
- run: |
1515
go test ./...
1616
build:
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@master
2121
- uses: actions/setup-go@v3
2222
with:
23-
go-version: '1.18.1'
23+
go-version: "1.24.2"
2424
- run: |
2525
go build -mod=vendor -o operator github.com/movetokube/postgres-operator/cmd/manager
26-
file operator
26+
file operator

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ unit-test:
1212
unit-test-coverage: unit-test
1313
go tool cover -html coverage.out
1414
linux-docker:
15-
@docker run -ti -v $(PWD):/work golang:1.13.15-stretch /bin/bash
15+
@docker run -ti -v $(PWD):/work golang:1.24-bookworm /bin/bash
1616
linux-build:
1717
@GOBIN=/work/bin GO111MODULE=on GOOS=linux GOARC=x86_64 go build --mod=vendor -o operator github.com/movetokube/postgres-operator/cmd/manager
1818
docker-build:
19-
docker run -ti -v $(PWD):/work -w /work golang:1.13.15-stretch make linux-build
19+
docker run -ti -v $(PWD):/work -w /work golang:1.24-bookworm make linux-build

build/Dockerfile.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM --platform=${BUILDPLATFORM} golang:1.18-stretch AS build
2+
FROM --platform=${BUILDPLATFORM} golang:1.24-bookworm AS build
33

44
ARG TARGETPLATFORM
55
ARG BUILDPLATFORM
@@ -32,4 +32,4 @@ RUN /usr/local/bin/user_setup
3232

3333
ENTRYPOINT ["/usr/local/bin/entrypoint"]
3434

35-
USER ${USER_UID}
35+
USER ${USER_UID}

go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.18
44

55
require (
66
github.com/go-logr/logr v0.1.0
7-
github.com/go-openapi/spec v0.19.4
8-
github.com/golang/mock v1.3.1
9-
github.com/lib/pq v1.3.0
7+
github.com/go-openapi/spec v0.21.0
8+
github.com/golang/mock v1.6.0
9+
github.com/lib/pq v1.10.9
1010
github.com/onsi/ginkgo v1.12.0
1111
github.com/onsi/gomega v1.9.0
1212
github.com/operator-framework/operator-sdk v0.18.0
13-
github.com/spf13/pflag v1.0.5
13+
github.com/spf13/pflag v1.0.6
1414
k8s.io/api v0.18.2
1515
k8s.io/apimachinery v0.18.2
1616
k8s.io/client-go v12.0.0+incompatible
@@ -25,8 +25,6 @@ require (
2525
github.com/Azure/go-autorest/autorest/date v0.2.0 // indirect
2626
github.com/Azure/go-autorest/logger v0.1.0 // indirect
2727
github.com/Azure/go-autorest/tracing v0.5.0 // indirect
28-
github.com/PuerkitoBio/purell v1.1.1 // indirect
29-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3028
github.com/beorn7/perks v1.0.1 // indirect
3129
github.com/cespare/xxhash/v2 v2.1.1 // indirect
3230
github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc // indirect
@@ -35,9 +33,9 @@ require (
3533
github.com/emicklei/go-restful v2.11.1+incompatible // indirect
3634
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
3735
github.com/go-logr/zapr v0.1.1 // indirect
38-
github.com/go-openapi/jsonpointer v0.19.3 // indirect
39-
github.com/go-openapi/jsonreference v0.19.3 // indirect
40-
github.com/go-openapi/swag v0.19.5 // indirect
36+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
37+
github.com/go-openapi/jsonreference v0.21.0 // indirect
38+
github.com/go-openapi/swag v0.23.1 // indirect
4139
github.com/gogo/protobuf v1.3.1 // indirect
4240
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
4341
github.com/golang/protobuf v1.3.2 // indirect
@@ -49,8 +47,9 @@ require (
4947
github.com/hashicorp/golang-lru v0.5.3 // indirect
5048
github.com/hpcloud/tail v1.0.0 // indirect
5149
github.com/imdario/mergo v0.3.8 // indirect
50+
github.com/josharian/intern v1.0.0 // indirect
5251
github.com/json-iterator/go v1.1.9 // indirect
53-
github.com/mailru/easyjson v0.7.0 // indirect
52+
github.com/mailru/easyjson v0.9.0 // indirect
5453
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
5554
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5655
github.com/modern-go/reflect2 v1.0.1 // indirect
@@ -63,18 +62,19 @@ require (
6362
go.uber.org/multierr v1.5.0 // indirect
6463
go.uber.org/zap v1.14.1 // indirect
6564
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 // indirect
66-
golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
65+
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
6766
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
6867
golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect
69-
golang.org/x/text v0.3.2 // indirect
68+
golang.org/x/text v0.3.3 // indirect
7069
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
71-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
70+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7271
gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
7372
google.golang.org/appengine v1.6.5 // indirect
7473
gopkg.in/fsnotify.v1 v1.4.7 // indirect
7574
gopkg.in/inf.v0 v0.9.1 // indirect
7675
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7776
gopkg.in/yaml.v2 v2.2.8 // indirect
77+
gopkg.in/yaml.v3 v3.0.1 // indirect
7878
k8s.io/klog v1.0.0 // indirect
7979
k8s.io/kube-state-metrics v1.7.2 // indirect
8080
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // indirect

0 commit comments

Comments
 (0)