Skip to content

Commit 6839ebd

Browse files
gianlucam76gianlucam76
authored
Merge pull request #3 from gianlucam76/1.20
Move to golang v1.20
2 parents ab666e1 + 005bf3d commit 6839ebd

File tree

7 files changed

+19
-596
lines changed

7 files changed

+19
-596
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.19 as builder
2+
FROM golang:1.20 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs
6868
KIND := $(TOOLS_BIN_DIR)/kind
6969
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
7070

71+
GOLANGCI_LINT_VERSION := "v1.52.2"
7172

7273
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
7374
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -78,8 +79,8 @@ $(ENVSUBST): $(TOOLS_DIR)/go.mod # Build envsubst from tools folder.
7879
$(KUSTOMIZE): $(TOOLS_DIR)/go.mod # Build kustomize from tools folder.
7980
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(BIN_DIR)/kustomize sigs.k8s.io/kustomize/kustomize/v4
8081

81-
$(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod # Build golangci-lint from tools folder.
82-
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) github.com/golangci/golangci-lint/cmd/golangci-lint
82+
$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
83+
cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION)
8384

8485
$(SETUP_ENVTEST): $(TOOLS_DIR)/go.mod # Build setup-envtest from tools folder.
8586
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) sigs.k8s.io/controller-runtime/tools/setup-envtest

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/gianlucam76/jsonnet-controller
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/TwinProduction/go-color v1.0.0

‎hack/tools/get-golangci-lint.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
# Define the URL for downloading the golangci-lint archive
6+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(pwd)/bin "$1"

‎hack/tools/go.mod‎

Lines changed: 4 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module github.com/gianlucam76/jsonnet-controller/hack/tools
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/a8m/envsubst v1.1.0
7-
github.com/golangci/golangci-lint v1.50.1
87
github.com/onsi/ginkgo/v2 v2.9.5
98
golang.org/x/oauth2 v0.6.0
109
k8s.io/client-go v0.26.1
@@ -15,195 +14,62 @@ require (
1514
)
1615

1716
require (
18-
4d63.com/gochecknoglobals v0.1.0 // indirect
1917
cloud.google.com/go/compute v1.14.0 // indirect
2018
cloud.google.com/go/compute/metadata v0.2.3 // indirect
21-
github.com/Abirdcfly/dupword v0.0.7 // indirect
22-
github.com/Antonboom/errname v0.1.7 // indirect
23-
github.com/Antonboom/nilnil v0.1.1 // indirect
2419
github.com/BurntSushi/toml v1.2.1 // indirect
25-
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
26-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
27-
github.com/Masterminds/semver v1.5.0 // indirect
28-
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
2920
github.com/alessio/shellescape v1.4.1 // indirect
30-
github.com/alexkohler/prealloc v1.0.0 // indirect
31-
github.com/alingse/asasalint v0.0.11 // indirect
3221
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
33-
github.com/ashanbrown/forbidigo v1.3.0 // indirect
34-
github.com/ashanbrown/makezero v1.1.1 // indirect
35-
github.com/beorn7/perks v1.0.1 // indirect
36-
github.com/bkielbasa/cyclop v1.2.0 // indirect
37-
github.com/blizzy78/varnamelen v0.8.0 // indirect
38-
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
39-
github.com/breml/bidichk v0.2.3 // indirect
40-
github.com/breml/errchkjson v0.3.0 // indirect
41-
github.com/butuzov/ireturn v0.1.1 // indirect
42-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
43-
github.com/charithe/durationcheck v0.0.9 // indirect
44-
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
45-
github.com/curioswitch/go-reassign v0.2.0 // indirect
46-
github.com/daixiang0/gci v0.8.1 // indirect
4722
github.com/davecgh/go-spew v1.1.1 // indirect
48-
github.com/denis-tingaikin/go-header v0.4.3 // indirect
49-
github.com/esimonov/ifshort v1.0.4 // indirect
50-
github.com/ettle/strcase v0.1.1 // indirect
5123
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5224
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5325
github.com/fatih/color v1.15.0 // indirect
54-
github.com/fatih/structtag v1.2.0 // indirect
55-
github.com/firefart/nonamedreturns v1.0.4 // indirect
56-
github.com/fsnotify/fsnotify v1.6.0 // indirect
57-
github.com/fzipp/gocyclo v0.6.0 // indirect
58-
github.com/go-critic/go-critic v0.6.5 // indirect
5926
github.com/go-errors/errors v1.0.1 // indirect
6027
github.com/go-logr/logr v1.2.4 // indirect
6128
github.com/go-logr/zapr v1.2.3 // indirect
6229
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6330
github.com/go-openapi/jsonreference v0.20.1 // indirect
6431
github.com/go-openapi/swag v0.22.3 // indirect
6532
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
66-
github.com/go-toolsmith/astcast v1.0.0 // indirect
67-
github.com/go-toolsmith/astcopy v1.0.2 // indirect
68-
github.com/go-toolsmith/astequal v1.0.3 // indirect
69-
github.com/go-toolsmith/astfmt v1.0.0 // indirect
70-
github.com/go-toolsmith/astp v1.0.0 // indirect
71-
github.com/go-toolsmith/strparse v1.0.0 // indirect
72-
github.com/go-toolsmith/typep v1.0.2 // indirect
73-
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
7433
github.com/gobuffalo/flect v1.0.2 // indirect
75-
github.com/gobwas/glob v0.2.3 // indirect
76-
github.com/gofrs/flock v0.8.1 // indirect
7734
github.com/gogo/protobuf v1.3.2 // indirect
7835
github.com/golang/protobuf v1.5.3 // indirect
79-
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
80-
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
81-
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
82-
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
83-
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
84-
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
85-
github.com/golangci/misspell v0.3.5 // indirect
86-
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
87-
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
8836
github.com/google/gnostic v0.6.9 // indirect
8937
github.com/google/go-cmp v0.5.9 // indirect
9038
github.com/google/gofuzz v1.2.0 // indirect
9139
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
9240
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
9341
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
94-
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
95-
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
96-
github.com/gostaticanalysis/comment v1.4.2 // indirect
97-
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
98-
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
99-
github.com/hashicorp/errwrap v1.0.0 // indirect
100-
github.com/hashicorp/go-multierror v1.1.1 // indirect
101-
github.com/hashicorp/go-version v1.6.0 // indirect
102-
github.com/hashicorp/hcl v1.0.0 // indirect
103-
github.com/hexops/gotextdiff v1.0.3 // indirect
42+
github.com/google/uuid v1.3.0 // indirect
10443
github.com/imdario/mergo v0.3.13 // indirect
10544
github.com/inconshreveable/mousetrap v1.1.0 // indirect
106-
github.com/jgautheron/goconst v1.5.1 // indirect
107-
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
108-
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
10945
github.com/josharian/intern v1.0.0 // indirect
11046
github.com/json-iterator/go v1.1.12 // indirect
111-
github.com/julz/importas v0.1.0 // indirect
112-
github.com/kisielk/errcheck v1.6.2 // indirect
113-
github.com/kisielk/gotool v1.0.0 // indirect
114-
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
115-
github.com/kulti/thelper v0.6.3 // indirect
116-
github.com/kunwardeep/paralleltest v1.0.6 // indirect
117-
github.com/kyoh86/exportloopref v0.1.8 // indirect
118-
github.com/ldez/gomoddirectives v0.2.3 // indirect
119-
github.com/ldez/tagliatelle v0.3.1 // indirect
120-
github.com/leonklingele/grouper v1.1.0 // indirect
121-
github.com/lufeee/execinquery v1.2.1 // indirect
122-
github.com/magiconair/properties v1.8.7 // indirect
47+
github.com/kr/pretty v0.3.0 // indirect
12348
github.com/mailru/easyjson v0.7.7 // indirect
124-
github.com/maratori/testableexamples v1.0.0 // indirect
125-
github.com/maratori/testpackage v1.1.0 // indirect
126-
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
12749
github.com/mattn/go-colorable v0.1.13 // indirect
12850
github.com/mattn/go-isatty v0.0.17 // indirect
12951
github.com/mattn/go-runewidth v0.0.14 // indirect
130-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
131-
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
132-
github.com/mgechev/revive v1.2.4 // indirect
133-
github.com/mitchellh/go-homedir v1.1.0 // indirect
13452
github.com/mitchellh/mapstructure v1.5.0 // indirect
13553
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
13654
github.com/modern-go/reflect2 v1.0.2 // indirect
13755
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
138-
github.com/moricho/tparallel v0.2.1 // indirect
139-
github.com/nakabonne/nestif v0.3.1 // indirect
140-
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
141-
github.com/nishanths/exhaustive v0.8.3 // indirect
142-
github.com/nishanths/predeclared v0.2.2 // indirect
14356
github.com/olekukonko/tablewriter v0.0.5 // indirect
14457
github.com/pelletier/go-toml v1.9.5 // indirect
145-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
146-
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
14758
github.com/pkg/errors v0.9.1 // indirect
148-
github.com/pmezard/go-difflib v1.0.0 // indirect
149-
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
150-
github.com/prometheus/client_golang v1.14.0 // indirect
151-
github.com/prometheus/client_model v0.3.0 // indirect
152-
github.com/prometheus/common v0.37.0 // indirect
153-
github.com/prometheus/procfs v0.8.0 // indirect
154-
github.com/quasilyte/go-ruleguard v0.3.18 // indirect
155-
github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
156-
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
157-
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
15859
github.com/rivo/uniseg v0.4.2 // indirect
159-
github.com/ryancurrah/gomodguard v1.2.4 // indirect
160-
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
161-
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
162-
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
163-
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
164-
github.com/securego/gosec/v2 v2.13.1 // indirect
60+
github.com/rogpeppe/go-internal v1.9.0 // indirect
16561
github.com/sergi/go-diff v1.2.0 // indirect
166-
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
167-
github.com/sirupsen/logrus v1.9.0 // indirect
168-
github.com/sivchari/containedctx v1.0.2 // indirect
169-
github.com/sivchari/nosnakecase v1.7.0 // indirect
170-
github.com/sivchari/tenv v1.7.0 // indirect
171-
github.com/sonatard/noctx v0.0.1 // indirect
172-
github.com/sourcegraph/go-diff v0.6.1 // indirect
17362
github.com/spf13/afero v1.9.3 // indirect
174-
github.com/spf13/cast v1.5.0 // indirect
17563
github.com/spf13/cobra v1.7.0 // indirect
176-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
17764
github.com/spf13/pflag v1.0.5 // indirect
178-
github.com/spf13/viper v1.15.0 // indirect
179-
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
180-
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
181-
github.com/stretchr/objx v0.5.0 // indirect
182-
github.com/stretchr/testify v1.8.1 // indirect
183-
github.com/subosito/gotenv v1.4.2 // indirect
184-
github.com/tdakkota/asciicheck v0.1.1 // indirect
185-
github.com/tetafro/godot v1.4.11 // indirect
186-
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
187-
github.com/timonwong/loggercheck v0.9.3 // indirect
188-
github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect
189-
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
190-
github.com/ultraware/funlen v0.0.3 // indirect
191-
github.com/ultraware/whitespace v0.0.5 // indirect
192-
github.com/uudashr/gocognit v1.0.6 // indirect
19365
github.com/xlab/treeprint v1.1.0 // indirect
194-
github.com/yagipy/maintidx v1.0.0 // indirect
195-
github.com/yeya24/promlinter v0.2.0 // indirect
196-
gitlab.com/bosi/decorder v0.2.3 // indirect
19766
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
19867
go.uber.org/atomic v1.9.0 // indirect
19968
go.uber.org/goleak v1.2.0 // indirect
20069
go.uber.org/multierr v1.8.0 // indirect
20170
go.uber.org/zap v1.24.0 // indirect
202-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
203-
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
20471
golang.org/x/mod v0.10.0 // indirect
20572
golang.org/x/net v0.10.0 // indirect
206-
golang.org/x/sync v0.2.0 // indirect
20773
golang.org/x/sys v0.8.0 // indirect
20874
golang.org/x/term v0.8.0 // indirect
20975
golang.org/x/text v0.9.0 // indirect
@@ -212,20 +78,14 @@ require (
21278
google.golang.org/appengine v1.6.7 // indirect
21379
google.golang.org/protobuf v1.28.1 // indirect
21480
gopkg.in/inf.v0 v0.9.1 // indirect
215-
gopkg.in/ini.v1 v1.67.0 // indirect
21681
gopkg.in/yaml.v2 v2.4.0 // indirect
21782
gopkg.in/yaml.v3 v3.0.1 // indirect
218-
honnef.co/go/tools v0.3.3 // indirect
21983
k8s.io/api v0.26.1 // indirect
22084
k8s.io/apiextensions-apiserver v0.26.1 // indirect
22185
k8s.io/apimachinery v0.26.1 // indirect
22286
k8s.io/klog/v2 v2.90.1 // indirect
22387
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
22488
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
225-
mvdan.cc/gofumpt v0.4.0 // indirect
226-
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
227-
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
228-
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
22989
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
23090
sigs.k8s.io/kustomize/api v0.12.1 // indirect
23191
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect

0 commit comments

Comments
 (0)