Skip to content

Commit 34dc4b0

Browse files
committed
BUILD/MEDIUM: Go: update version to Go 1.17
The go command now understands //go:build lines and prefers them over // +build lines
1 parent 472acc2 commit 34dc4b0

35 files changed

+89
-35
lines changed

crs/api/core/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/tests/e2e/basic-auth/basic_auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package basicauth
1818

deploy/tests/e2e/basic-auth/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package basicauth
1818

deploy/tests/e2e/canary-deployment/percentage_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package canarydeployment
1818

deploy/tests/e2e/canary-deployment/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package canarydeployment
1818

deploy/tests/e2e/config-snippet/backend_cfg_snippet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package configsnippet
1818

deploy/tests/e2e/config-snippet/frontend_cfg_snippet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package configsnippet
1818

deploy/tests/e2e/config-snippet/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package configsnippet
1818

deploy/tests/e2e/endpoints/http_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package endpoints
1818

deploy/tests/e2e/endpoints/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package endpoints
1818

deploy/tests/e2e/endpoints/tcp_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package endpoints
1818

deploy/tests/e2e/global-config/maxconn_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package globalconfig
1818

deploy/tests/e2e/global-config/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package globalconfig
1818

deploy/tests/e2e/https/offload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package https
1818

deploy/tests/e2e/https/passthrough.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package https
1818

deploy/tests/e2e/https/redirect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package https
1818

deploy/tests/e2e/https/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package https
1818

deploy/tests/e2e/ingress-match/ingress_match_path_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package ingressmatch
1818

deploy/tests/e2e/ingress-match/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package ingressmatch
1818

deploy/tests/e2e/ingressclass/ingressClass_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package ingressclass
1818

deploy/tests/e2e/ingressclass/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package ingressclass
1818

deploy/tests/e2e/proxy-protocol/send_proxy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package proxyprotocol
1818

deploy/tests/e2e/proxy-protocol/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package proxyprotocol
1818

deploy/tests/e2e/rate-limiting/http_rate_limiting_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package ratelimiting
1818

deploy/tests/e2e/rate-limiting/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package ratelimiting
1818

deploy/tests/e2e/service-discovery/port_discovery.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package servicediscovery
1818

deploy/tests/e2e/service-discovery/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package servicediscovery
1818

deploy/tests/e2e/set-header/set_header_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package setheader
1818

deploy/tests/e2e/set-header/set_host_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package setheader
1818

deploy/tests/e2e/set-header/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package setheader
1818

deploy/tests/e2e/source-ip/source_ip_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package sourceip
1818

deploy/tests/e2e/source-ip/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_parallel
15+
//go:build e2e_parallel
1616

1717
package sourceip
1818

deploy/tests/e2e/tls-auth/client_auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package tlsauth
1818

deploy/tests/e2e/tls-auth/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// +build e2e_sequential
15+
//go:build e2e_sequential
1616

1717
package tlsauth
1818

go.mod

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/haproxytech/kubernetes-ingress
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/go-test/deep v1.0.7
@@ -13,3 +13,58 @@ require (
1313
k8s.io/apimachinery v0.22.2
1414
k8s.io/client-go v0.22.2
1515
)
16+
17+
require (
18+
github.com/PuerkitoBio/purell v1.1.1 // indirect
19+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
20+
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
21+
github.com/davecgh/go-spew v1.1.1 // indirect
22+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
23+
github.com/go-logr/logr v0.4.0 // indirect
24+
github.com/go-openapi/analysis v0.19.10 // indirect
25+
github.com/go-openapi/errors v0.19.4 // indirect
26+
github.com/go-openapi/jsonpointer v0.19.3 // indirect
27+
github.com/go-openapi/jsonreference v0.19.3 // indirect
28+
github.com/go-openapi/loads v0.19.5 // indirect
29+
github.com/go-openapi/runtime v0.19.15 // indirect
30+
github.com/go-openapi/spec v0.19.7 // indirect
31+
github.com/go-openapi/strfmt v0.19.5 // indirect
32+
github.com/go-openapi/swag v0.19.7 // indirect
33+
github.com/go-openapi/validate v0.19.3 // indirect
34+
github.com/go-stack/stack v1.8.0 // indirect
35+
github.com/gofrs/flock v0.8.1 // indirect
36+
github.com/gogo/protobuf v1.3.2 // indirect
37+
github.com/golang/protobuf v1.5.2 // indirect
38+
github.com/google/go-cmp v0.5.5 // indirect
39+
github.com/google/gofuzz v1.1.0 // indirect
40+
github.com/google/uuid v1.1.2 // indirect
41+
github.com/googleapis/gnostic v0.5.5 // indirect
42+
github.com/haproxytech/go-logger v1.0.0 // indirect
43+
github.com/imdario/mergo v0.3.5 // indirect
44+
github.com/json-iterator/go v1.1.11 // indirect
45+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
46+
github.com/mailru/easyjson v0.7.1 // indirect
47+
github.com/mitchellh/mapstructure v1.2.2 // indirect
48+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
49+
github.com/modern-go/reflect2 v1.0.1 // indirect
50+
github.com/pkg/errors v0.9.1 // indirect
51+
github.com/pmezard/go-difflib v1.0.0 // indirect
52+
github.com/spf13/pflag v1.0.5 // indirect
53+
go.mongodb.org/mongo-driver v1.5.1 // indirect
54+
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
55+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
56+
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
57+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
58+
golang.org/x/text v0.3.6 // indirect
59+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
60+
google.golang.org/appengine v1.6.5 // indirect
61+
google.golang.org/protobuf v1.26.0 // indirect
62+
gopkg.in/inf.v0 v0.9.1 // indirect
63+
gopkg.in/yaml.v2 v2.4.0 // indirect
64+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
65+
k8s.io/klog/v2 v2.9.0 // indirect
66+
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
67+
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
68+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
69+
sigs.k8s.io/yaml v1.2.0 // indirect
70+
)

0 commit comments

Comments
 (0)