Skip to content

Commit 23f4fdb

Browse files
FxKuFxKu
authored
update go and dependencies (zalando#2554)
1 parent 3fb3b34 commit 23f4fdb

File tree

15 files changed

+206
-532
lines changed

15 files changed

+206
-532
lines changed

‎.github/workflows/publish_ghcr_image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v2
2525
with:
26-
go-version: "^1.19.8"
26+
go-version: "^1.21.7"
2727

2828
- name: Run unit tests
2929
run: make deps mocks test

‎.github/workflows/run_e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v1
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.19.8"
17+
go-version: "^1.21.7"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Code generation

‎.github/workflows/run_tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.19.8"
17+
go-version: "^1.21.7"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Compile
2121
run: make linux
2222
- name: Run unit tests
2323
run: go test -race -covermode atomic -coverprofile=coverage.out ./...
2424
- name: Convert coverage to lcov
25-
uses: jandelgado/[email protected].8
25+
uses: jandelgado/[email protected].9
2626
- name: Coveralls
2727
uses: coverallsapp/github-action@master
2828
with:

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2023 Zalando SE
3+
Copyright (c) 2024 Zalando SE
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ docker: ${DOCKERDIR}/${DOCKERFILE}
6969
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" .
7070

7171
indocker-race:
72-
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.19.8 bash -c "make linux"
72+
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.21.7 bash -c "make linux"
7373

7474
push:
7575
docker push "$(IMAGE):$(TAG)$(CDP_TAG)"
@@ -78,7 +78,7 @@ mocks:
7878
GO111MODULE=on go generate ./...
7979

8080
tools:
81-
GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.25.9
81+
GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.28.7
8282
GO111MODULE=on go install github.com/golang/mock/[email protected]
8383
GO111MODULE=on go mod tidy
8484

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ production for over five years.
5757

5858
| Release | Postgres versions | K8s versions | Golang |
5959
| :-------- | :---------------: | :---------------: | :-----: |
60-
| v1.10.* | 10 → 15 | 1.21+ | 1.19.8 |
61-
| v1.9.0 | 10 → 15 | 1.21+ | 1.18.9 |
60+
| v1.11.* | 11 → 16 | 1.21 → 1.28 | 1.21.7 |
61+
| v1.10.* | 10 → 15 | 1.21 → 1.28 | 1.19.8 |
62+
| v1.9.0 | 10 → 15 | 1.21 → 1.28 | 1.18.9 |
6263
| v1.8.* | 9.5 → 14 | 1.20 → 1.24 | 1.17.4 |
6364
| v1.7.1 | 9.5 → 14 | 1.20 → 1.24 | 1.16.9 |
6465

‎delivery.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline:
1818
- desc: 'Install go'
1919
cmd: |
2020
cd /tmp
21-
wget -q https://storage.googleapis.com/golang/go1.19.8.linux-amd64.tar.gz -O go.tar.gz
21+
wget -q https://storage.googleapis.com/golang/go1.21.7.linux-amd64.tar.gz -O go.tar.gz
2222
tar -xf go.tar.gz
2323
mv go /usr/local
2424
ln -s /usr/local/go/bin/go /usr/bin/go

‎docker/build_operator.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apt-get install -y wget
1313

1414
(
1515
cd /tmp
16-
wget -q "https://storage.googleapis.com/golang/go1.19.8.linux-${arch}.tar.gz" -O go.tar.gz
16+
wget -q "https://storage.googleapis.com/golang/go1.21.7.linux-${arch}.tar.gz" -O go.tar.gz
1717
tar -xf go.tar.gz
1818
mv go /usr/local
1919
ln -s /usr/local/go/bin/go /usr/bin/go

‎go.mod

+23-24
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,38 @@ require (
1010
github.com/pkg/errors v0.9.1
1111
github.com/r3labs/diff v1.1.0
1212
github.com/sirupsen/logrus v1.9.0
13-
github.com/stretchr/testify v1.8.0
13+
github.com/stretchr/testify v1.8.2
1414
golang.org/x/crypto v0.18.0
1515
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
1616
gopkg.in/yaml.v2 v2.4.0
17-
k8s.io/api v0.25.9
17+
k8s.io/api v0.28.7
1818
k8s.io/apiextensions-apiserver v0.25.9
19-
k8s.io/apimachinery v0.25.9
20-
k8s.io/client-go v0.25.9
19+
k8s.io/apimachinery v0.28.7
20+
k8s.io/client-go v0.28.7
2121
k8s.io/code-generator v0.25.9
2222
)
2323

2424
require (
25-
github.com/PuerkitoBio/purell v1.1.1 // indirect
26-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2725
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
26+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2927
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
30-
github.com/go-logr/logr v1.2.3 // indirect
31-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
32-
github.com/go-openapi/jsonreference v0.19.5 // indirect
33-
github.com/go-openapi/swag v0.19.14 // indirect
28+
github.com/go-logr/logr v1.2.4 // indirect
29+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
30+
github.com/go-openapi/jsonreference v0.20.2 // indirect
31+
github.com/go-openapi/swag v0.22.3 // indirect
3432
github.com/gogo/protobuf v1.3.2 // indirect
3533
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
36-
github.com/golang/protobuf v1.5.2 // indirect
37-
github.com/google/gnostic v0.5.7-v3refs // indirect
38-
github.com/google/go-cmp v0.5.8 // indirect
39-
github.com/google/gofuzz v1.1.0 // indirect
34+
github.com/golang/protobuf v1.5.3 // indirect
35+
github.com/google/gnostic-models v0.6.8 // indirect
36+
github.com/google/go-cmp v0.5.9 // indirect
37+
github.com/google/gofuzz v1.2.0 // indirect
38+
github.com/google/uuid v1.3.0 // indirect
4039
github.com/imdario/mergo v0.3.6 // indirect
4140
github.com/jmespath/go-jmespath v0.4.0 // indirect
4241
github.com/josharian/intern v1.0.0 // indirect
4342
github.com/json-iterator/go v1.1.12 // indirect
4443
github.com/kr/text v0.2.0 // indirect
45-
github.com/mailru/easyjson v0.7.6 // indirect
44+
github.com/mailru/easyjson v0.7.7 // indirect
4645
github.com/moby/spdystream v0.2.0 // indirect
4746
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4847
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -51,21 +50,21 @@ require (
5150
github.com/spf13/pflag v1.0.5 // indirect
5251
golang.org/x/mod v0.14.0 // indirect
5352
golang.org/x/net v0.20.0 // indirect
54-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
53+
golang.org/x/oauth2 v0.8.0 // indirect
5554
golang.org/x/sys v0.16.0 // indirect
5655
golang.org/x/term v0.16.0 // indirect
5756
golang.org/x/text v0.14.0 // indirect
58-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
57+
golang.org/x/time v0.3.0 // indirect
5958
golang.org/x/tools v0.17.0 // indirect
6059
google.golang.org/appengine v1.6.7 // indirect
61-
google.golang.org/protobuf v1.28.0 // indirect
60+
google.golang.org/protobuf v1.31.0 // indirect
6261
gopkg.in/inf.v0 v0.9.1 // indirect
6362
gopkg.in/yaml.v3 v3.0.1 // indirect
6463
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
65-
k8s.io/klog/v2 v2.70.1 // indirect
66-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
67-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
68-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
64+
k8s.io/klog/v2 v2.100.1 // indirect
65+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
66+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
67+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6968
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
70-
sigs.k8s.io/yaml v1.2.0 // indirect
69+
sigs.k8s.io/yaml v1.3.0 // indirect
7170
)

0 commit comments

Comments
 (0)