Add go:build tags matching existing +build tags

As of go1.17 both tags are expected to exist simultaneously. Added tags in all cluster autoscaler files. Added verify-gomod.sh exceptions for non-compliant autogenerated VPA files.
kubernetes · Jan 12, 2022 · d2dfa2d · d2dfa2d
1 parent e6b56b3
commit d2dfa2d
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 0 deletions.
diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go b/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go b/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
@@ -1,3 +1,4 @@
+//go:build alicloud
 // +build alicloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_all.go b/cluster-autoscaler/cloudprovider/builder/builder_all.go
@@ -1,3 +1,4 @@
+//go:build !gce && !aws && !azure && !kubemark && !alicloud && !magnum && !digitalocean && !clusterapi && !huaweicloud && !ionoscloud && !linode && !hetzner && !bizflycloud && !brightbox && !packet
 // +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi,!huaweicloud,!ionoscloud,!linode,!hetzner,!bizflycloud,!brightbox,!packet
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_aws.go b/cluster-autoscaler/cloudprovider/builder/builder_aws.go
@@ -1,3 +1,4 @@
+//go:build aws
 // +build aws
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_azure.go b/cluster-autoscaler/cloudprovider/builder/builder_azure.go
@@ -1,3 +1,4 @@
+//go:build azure
 // +build azure
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go b/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
@@ -1,3 +1,4 @@
+//go:build baiducloud
 // +build baiducloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go b/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
@@ -1,3 +1,4 @@
+//go:build bizflycloud
 // +build bizflycloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go b/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
@@ -1,3 +1,4 @@
+//go:build brightbox
 // +build brightbox
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go b/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
@@ -1,3 +1,4 @@
+//go:build cloudstack
 // +build cloudstack
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go b/cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go
@@ -1,3 +1,4 @@
+//go:build clusterapi
 // +build clusterapi
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go b/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
@@ -1,3 +1,4 @@
+//go:build digitalocean
 // +build digitalocean
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go b/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go
@@ -1,3 +1,4 @@
+//go:build exoscale
 // +build exoscale
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_gce.go b/cluster-autoscaler/cloudprovider/builder/builder_gce.go
@@ -1,3 +1,4 @@
+//go:build gce
 // +build gce
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go b/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go
@@ -1,3 +1,4 @@
+//go:build hetzner
 // +build hetzner
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go b/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go
@@ -1,3 +1,4 @@
+//go:build huaweicloud
 // +build huaweicloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go
@@ -1,3 +1,4 @@
+//go:build ionoscloud
 // +build ionoscloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go b/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go
@@ -1,3 +1,4 @@
+//go:build kubemark
 // +build kubemark
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_linode.go b/cluster-autoscaler/cloudprovider/builder/builder_linode.go
@@ -1,3 +1,4 @@
+//go:build linode
 // +build linode
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_magnum.go b/cluster-autoscaler/cloudprovider/builder/builder_magnum.go
@@ -1,3 +1,4 @@
+//go:build magnum
 // +build magnum
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
@@ -1,3 +1,4 @@
+//go:build exoscale
 // +build exoscale
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_packet.go b/cluster-autoscaler/cloudprovider/builder/builder_packet.go
@@ -1,3 +1,4 @@
+//go:build packet
 // +build packet
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go b/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go b/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh
@@ -34,6 +34,7 @@ find_files() {
         -o -wholename '*/third_party/*' \
         -o -wholename '*/Godeps/*' \
         -o -wholename '*/vendor/*' \
+        -o -wholename '*/zz_generated.deepcopy.go' \
         -o -wholename './cluster-autoscaler/cloudprovider/magnum/gophercloud/*' \
         -o -wholename './cluster-autoscaler/cloudprovider/digitalocean/godo/*' \
         -o -wholename './cluster-autoscaler/cloudprovider/bizflycloud/gobizfly/*' \