From d2dfa2d0b2e1844a25eb170f8680b8a80f10fcac Mon Sep 17 00:00:00 2001
From: Maciek Pytel <maciekpytel@google.com>
Date: Tue, 28 Dec 2021 15:06:20 +0100
Subject: [PATCH] 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.
---
 cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go   | 1 +
 .../cloudprovider/azure/azure_instance_types/gen.go              | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_alicloud.go     | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_all.go          | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_aws.go          | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_azure.go        | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go   | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go  | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_brightbox.go    | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go   | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go   | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_exoscale.go     | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_gce.go          | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_hetzner.go      | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go  | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go   | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_kubemark.go     | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_linode.go       | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_magnum.go       | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go     | 1 +
 cluster-autoscaler/cloudprovider/builder/builder_packet.go       | 1 +
 cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go      | 1 +
 cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go      | 1 +
 hack/verify-gofmt.sh                                             | 1 +
 25 files changed, 25 insertions(+)

diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
index be7d2caba310..3313d8941c13 100644
--- 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
index 55308a505136..567406262f2e 100644
--- 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
index 43e3ac2bb22e..38748c5f8ec2 100644
--- 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
index eb35be33bbeb..190f58ec344d 100644
--- 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
index 36bdbb9293cb..f1258215d9dc 100644
--- 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
index 2568fe365116..06e2d6b3a88a 100644
--- 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
index efe24073838d..61645c019dbc 100644
--- 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
index 11c05dff52d0..6d9739aa02bf 100644
--- 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
index c227fba0e5f6..2445edbb51ba 100644
--- 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
index 2c31f88e46ee..3090faf150b0 100644
--- 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
index 7366c36b44ab..bde3853def33 100644
--- 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
index a33b380a6ae1..00dcfb2125c1 100644
--- 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
index 2d1e4628d049..bd247b675fda 100644
--- 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
index 4b6a5ec5591a..d4fbc93a271f 100644
--- 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
index 8c54b01952d6..156a132c48f8 100644
--- 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
index cac58daa015c..7b7b1dc7bf82 100644
--- 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
index 1f821f465dc8..3ddfcafa5f20 100644
--- 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
index bbc0c9a9b49a..5ad33d38c357 100644
--- 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
index 8685b9b94056..cb3856a06ae8 100644
--- 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
index a64bf45cb72e..796987310e35 100644
--- 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
index a61e989b9835..680cdc55c159 100644
--- 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
index 60aeab03d2f0..403eba21d804 100644
--- 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
index 8cb0fa2dbbb5..be0925837433 100644
--- 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
index dbd094028d54..dc857e68c74c 100644
--- 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
index de1e2f459610..593c9336fe3a 100755
--- 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/*' \