Skip to content

Commit 1db3283

Browse files
authored
fix: upgrade go and dependencies (#194)
1 parent db2afb7 commit 1db3283

File tree

12 files changed

+705
-516
lines changed

12 files changed

+705
-516
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2222
with:
23-
go-version: 1.22.x
23+
go-version: 1.24.x
2424
- name: Tests
2525
run: make test
2626
- name: Send go coverage report

.github/workflows/pr-build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Setup Go
5757
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5858
with:
59-
go-version: 1.22.x
59+
go-version: 1.24.x
6060
- name: fmt
6161
run: make fmt
6262
- name: vet
@@ -90,7 +90,7 @@ jobs:
9090
- name: Setup Go
9191
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
9292
with:
93-
go-version: 1.22.x
93+
go-version: 1.24.x
9494
- name: run test
9595
run: make test ENVTEST_K8S_VERSION=${{ matrix.kubernetes-version }}
9696

@@ -108,7 +108,7 @@ jobs:
108108
- name: Setup Go
109109
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
110110
with:
111-
go-version: 1.22.x
111+
go-version: 1.24.x
112112
- name: build
113113
run: make build
114114
- name: Check if working tree is dirty
@@ -153,7 +153,7 @@ jobs:
153153
- name: Setup Go
154154
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
155155
with:
156-
go-version: 1.22.x
156+
go-version: 1.24.x
157157
- name: Setup Kubernetes
158158
uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
159159
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2626
with:
27-
go-version: '1.22'
27+
go-version: 1.24.x
2828
- name: Docker Login
2929
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
3030
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ controller-gen: ## Download controller-gen locally if necessary.
139139
GOLANGCI_LINT = $(GOBIN)/golangci-lint
140140
.PHONY: golangci-lint
141141
golangci-lint: ## Download golint locally if necessary
142-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.0)
142+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.2)
143143

144144
KUSTOMIZE = $(GOBIN)/kustomize
145145
.PHONY: kustomize

api/v1beta1/swaggerhub_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ type ResourceReference struct {
159159
}
160160

161161
func SwaggerHubReconciling(realm SwaggerHub, status metav1.ConditionStatus, reason, message string) SwaggerHub {
162-
setResourceCondition(&realm, ConditionReconciling, status, reason, message, realm.ObjectMeta.Generation)
162+
setResourceCondition(&realm, ConditionReconciling, status, reason, message, realm.Generation)
163163
return realm
164164
}
165165

166166
func SwaggerHubReady(realm SwaggerHub, status metav1.ConditionStatus, reason, message string) SwaggerHub {
167-
setResourceCondition(&realm, ConditionReady, status, reason, message, realm.ObjectMeta.Generation)
167+
setResourceCondition(&realm, ConditionReady, status, reason, message, realm.Generation)
168168
return realm
169169
}
170170

api/v1beta1/swaggerspecification_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ type ServerVariable struct {
111111
}
112112

113113
func SwaggerSpecificationReconciling(realm SwaggerSpecification, status metav1.ConditionStatus, reason, message string) SwaggerSpecification {
114-
setResourceCondition(&realm, ConditionReconciling, status, reason, message, realm.ObjectMeta.Generation)
114+
setResourceCondition(&realm, ConditionReconciling, status, reason, message, realm.Generation)
115115
return realm
116116
}
117117

118118
func SwaggerSpecificationReady(realm SwaggerSpecification, status metav1.ConditionStatus, reason, message string) SwaggerSpecification {
119-
setResourceCondition(&realm, ConditionReady, status, reason, message, realm.ObjectMeta.Generation)
119+
setResourceCondition(&realm, ConditionReady, status, reason, message, realm.Generation)
120120
return realm
121121
}
122122

chart/swagger-hub-controller/crds/swagger.infra.doodle.com_swaggerhubs.yaml

Lines changed: 248 additions & 149 deletions
Large diffs are not rendered by default.

config/base/crd/bases/swagger.infra.doodle.com_swaggerhubs.yaml

Lines changed: 248 additions & 149 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 51 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,109 @@
11
module github.com/DoodleScheduling/swagger-hub-controller
22

3-
go 1.22.0
3+
go 1.24.2
44

55
require (
6-
github.com/fluxcd/pkg/runtime v0.49.1
7-
github.com/getkin/kin-openapi v0.128.0
6+
github.com/fluxcd/pkg/runtime v0.58.0
7+
github.com/getkin/kin-openapi v0.131.0
88
github.com/go-logr/logr v1.4.2
99
github.com/kylelemons/godebug v1.1.0
10-
github.com/onsi/ginkgo/v2 v2.22.2
11-
github.com/onsi/gomega v1.36.2
10+
github.com/onsi/ginkgo/v2 v2.23.3
11+
github.com/onsi/gomega v1.37.0
1212
github.com/spf13/pflag v1.0.6
1313
github.com/stretchr/testify v1.10.0
14-
k8s.io/api v0.31.3
15-
k8s.io/apimachinery v0.31.4
16-
k8s.io/client-go v0.31.3
17-
sigs.k8s.io/controller-runtime v0.19.4
14+
k8s.io/api v0.32.3
15+
k8s.io/apimachinery v0.32.3
16+
k8s.io/client-go v0.32.3
17+
sigs.k8s.io/controller-runtime v0.20.4
1818
)
1919

2020
require (
21-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
21+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2222
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2323
github.com/beorn7/perks v1.0.1 // indirect
2424
github.com/blang/semver/v4 v4.0.0 // indirect
2525
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/chai2010/gettext-go v1.0.3 // indirect
2727
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2929
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
30-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
30+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3131
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
32-
github.com/fluxcd/cli-utils v0.36.0-flux.9 // indirect
33-
github.com/fluxcd/pkg/apis/meta v1.6.1 // indirect
34-
github.com/fsnotify/fsnotify v1.7.0 // indirect
35-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
32+
github.com/fluxcd/cli-utils v0.36.0-flux.12 // indirect
33+
github.com/fluxcd/pkg/apis/meta v1.10.0 // indirect
34+
github.com/fsnotify/fsnotify v1.9.0 // indirect
35+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
3636
github.com/go-errors/errors v1.5.1 // indirect
3737
github.com/go-logr/zapr v1.3.0 // indirect
38-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
38+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3939
github.com/go-openapi/jsonreference v0.21.0 // indirect
40-
github.com/go-openapi/swag v0.23.0 // indirect
40+
github.com/go-openapi/swag v0.23.1 // indirect
4141
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4443
github.com/golang/protobuf v1.5.4 // indirect
4544
github.com/google/btree v1.1.3 // indirect
46-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
47-
github.com/google/go-cmp v0.6.0 // indirect
45+
github.com/google/gnostic-models v0.6.9 // indirect
46+
github.com/google/go-cmp v0.7.0 // indirect
4847
github.com/google/gofuzz v1.2.0 // indirect
49-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
48+
github.com/google/pprof v0.0.0-20250128161936-077ca0a936bf // indirect
5049
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5150
github.com/google/uuid v1.6.0 // indirect
5251
github.com/gorilla/websocket v1.5.3 // indirect
5352
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
54-
github.com/imdario/mergo v0.3.16 // indirect
5553
github.com/inconshreveable/mousetrap v1.1.0 // indirect
56-
github.com/invopop/yaml v0.3.1 // indirect
5754
github.com/josharian/intern v1.0.0 // indirect
5855
github.com/json-iterator/go v1.1.12 // indirect
59-
github.com/klauspost/compress v1.17.9 // indirect
6056
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
61-
github.com/mailru/easyjson v0.7.7 // indirect
57+
github.com/mailru/easyjson v0.9.0 // indirect
6258
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6359
github.com/moby/spdystream v0.5.0 // indirect
64-
github.com/moby/term v0.5.0 // indirect
60+
github.com/moby/term v0.5.2 // indirect
6561
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6662
github.com/modern-go/reflect2 v1.0.2 // indirect
6763
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
6864
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6965
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7066
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
67+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
68+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
7169
github.com/perimeterx/marshmallow v1.1.5 // indirect
7270
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7371
github.com/pkg/errors v0.9.1 // indirect
7472
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
75-
github.com/prometheus/client_golang v1.20.3 // indirect
76-
github.com/prometheus/client_model v0.6.1 // indirect
77-
github.com/prometheus/common v0.55.0 // indirect
78-
github.com/prometheus/procfs v0.15.1 // indirect
73+
github.com/prometheus/client_golang v1.22.0 // indirect
74+
github.com/prometheus/client_model v0.6.2 // indirect
75+
github.com/prometheus/common v0.63.0 // indirect
76+
github.com/prometheus/procfs v0.16.0 // indirect
7977
github.com/russross/blackfriday/v2 v2.1.0 // indirect
80-
github.com/spf13/cobra v1.8.1 // indirect
78+
github.com/spf13/cobra v1.9.1 // indirect
8179
github.com/x448/float16 v0.8.4 // indirect
8280
github.com/xlab/treeprint v1.2.0 // indirect
83-
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
8481
go.uber.org/multierr v1.11.0 // indirect
8582
go.uber.org/zap v1.27.0 // indirect
86-
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
87-
golang.org/x/net v0.33.0 // indirect
88-
golang.org/x/oauth2 v0.22.0 // indirect
89-
golang.org/x/sync v0.10.0 // indirect
90-
golang.org/x/sys v0.28.0 // indirect
91-
golang.org/x/term v0.27.0 // indirect
92-
golang.org/x/text v0.21.0 // indirect
93-
golang.org/x/time v0.6.0 // indirect
94-
golang.org/x/tools v0.28.0 // indirect
95-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
96-
google.golang.org/protobuf v1.36.1 // indirect
83+
golang.org/x/net v0.39.0 // indirect
84+
golang.org/x/oauth2 v0.29.0 // indirect
85+
golang.org/x/sync v0.13.0 // indirect
86+
golang.org/x/sys v0.32.0 // indirect
87+
golang.org/x/term v0.31.0 // indirect
88+
golang.org/x/text v0.24.0 // indirect
89+
golang.org/x/time v0.11.0 // indirect
90+
golang.org/x/tools v0.32.0 // indirect
91+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
92+
google.golang.org/protobuf v1.36.6 // indirect
9793
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9894
gopkg.in/inf.v0 v0.9.1 // indirect
99-
gopkg.in/yaml.v2 v2.4.0 // indirect
10095
gopkg.in/yaml.v3 v3.0.1 // indirect
101-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
102-
k8s.io/cli-runtime v0.31.1 // indirect
103-
k8s.io/component-base v0.31.1 // indirect
96+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
97+
k8s.io/cli-runtime v0.32.3 // indirect
98+
k8s.io/component-base v0.32.3 // indirect
10499
k8s.io/klog/v2 v2.130.1 // indirect
105-
k8s.io/kube-openapi v0.0.0-20240822171749-76de80e0abd9 // indirect
106-
k8s.io/kubectl v0.31.1 // indirect
107-
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
108-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
110-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
111-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
100+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
101+
k8s.io/kubectl v0.32.3 // indirect
102+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
103+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
104+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
105+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
106+
sigs.k8s.io/randfill v1.0.0 // indirect
107+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
112108
sigs.k8s.io/yaml v1.4.0 // indirect
113109
)

0 commit comments

Comments
 (0)