Merge pull request #9632 from johngmyers/gengo

Replace custom codegen package with gengo
kubernetes · Jul 29, 2020 · 67966d5 · 67966d5
2 parents 7f7b5b1 + 8292cac
commit 67966d5
Show file tree

Hide file tree

Showing 236 changed files with 6,772 additions and 864 deletions.
diff --git a/Makefile b/Makefile
@@ -161,14 +161,8 @@ upup/models/bindata.go: ${UPUP_MODELS_BINDATA_SOURCES}
 .PHONY: codegen
 codegen: kops-gobindata
 	go install k8s.io/kops/upup/tools/generators/...
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/cloudup/awstasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/cloudup/gcetasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/cloudup/dotasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/cloudup/alitasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/cloudup/spotinsttasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/assettasks
-	PATH="${GOPATH_1ST}/bin:${PATH}" go generate k8s.io/kops/upup/pkg/fi/fitasks
+	${GOPATH_1ST}/bin/fitask --input-dirs k8s.io/kops/upup/pkg/fi/... \
+	    --go-header-file "hack/boilerplate/boilerplate.go.txt"
 
 .PHONY: protobuf
 protobuf:

diff --git a/go.mod b/go.mod
@@ -114,8 +114,10 @@ require (
 	k8s.io/client-go v0.18.1
 	k8s.io/cloud-provider-openstack v1.17.0
 	k8s.io/component-base v0.18.1
+	k8s.io/gengo v0.0.0-20200710205751-c0d492a0f3ca
 	k8s.io/helm v2.9.0+incompatible
 	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.0.0
 	k8s.io/kubectl v0.0.0
 	k8s.io/legacy-cloud-providers v0.0.0
 	k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89

diff --git a/go.sum b/go.sum
@@ -370,6 +370,8 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
@@ -1017,6 +1019,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371 h1:Cjq6sG3gnKDchzWy7ouGQklhxMtWvh4AhSNJ0qGIeo4=
 golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f h1:JcoF/bowzCDI+MXu1yLqQGNO3ibqWsWq+Sk7pOT218w=
 golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1142,6 +1145,8 @@ k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKO
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20200710205751-c0d492a0f3ca h1:/o8XeHsWWmi4lTKp3uxWAZY7Eq/v1HelCDmrKZM4SVQ=
+k8s.io/gengo v0.0.0-20200710205751-c0d492a0f3ca/go.mod h1:aG2eeomYfcUw8sE3fa7YdkjgnGtyY56TjZlaJJ0ZoWo=
 k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
 k8s.io/helm v2.9.0+incompatible h1:3EFDJoqKSUe1BpC9qP+YaHi2Oua9hFT+C24/LhX2G1g=
 k8s.io/helm v2.9.0+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
@@ -1151,6 +1156,8 @@ k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
 k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
+k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/kube-aggregator v0.18.1/go.mod h1:cXwR5+w/IZ/6tbDGFz3aEYrZctFN9R3X6u0gUcWwVzA=
 k8s.io/kube-controller-manager v0.18.1/go.mod h1:HFp15+aGPbGns4K9jD9TxJVuc9eeiylCtjgCunRV3B4=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=

diff --git a/hack/.packages b/hack/.packages
@@ -165,7 +165,6 @@ k8s.io/kops/upup/pkg/fi/cloudup/aliup
 k8s.io/kops/upup/pkg/fi/cloudup/awstasks
 k8s.io/kops/upup/pkg/fi/cloudup/awsup
 k8s.io/kops/upup/pkg/fi/cloudup/cloudformation
-k8s.io/kops/upup/pkg/fi/cloudup/dnstasks
 k8s.io/kops/upup/pkg/fi/cloudup/do
 k8s.io/kops/upup/pkg/fi/cloudup/dotasks
 k8s.io/kops/upup/pkg/fi/cloudup/gce
@@ -185,7 +184,6 @@ k8s.io/kops/upup/pkg/fi/secrets
 k8s.io/kops/upup/pkg/fi/utils
 k8s.io/kops/upup/pkg/kutil
 k8s.io/kops/upup/tools/generators/fitask
-k8s.io/kops/upup/tools/generators/pkg/codegen
 k8s.io/kops/util/pkg/architectures
 k8s.io/kops/util/pkg/env
 k8s.io/kops/util/pkg/exec

diff --git a/upup/pkg/fi/assettasks/copydockerimage.go b/upup/pkg/fi/assettasks/copydockerimage.go
@@ -25,7 +25,7 @@ import (
 
 // CopyDockerImage copies a docker image from a source registry, to a target registry,
 // typically used for highly secure clusters.
-//go:generate fitask -type=CopyDockerImage
+// +kops:fitask
 type CopyDockerImage struct {
 	Name        *string
 	SourceImage *string

diff --git a/upup/pkg/fi/assettasks/copydockerimage_fitask.go b/upup/pkg/fi/assettasks/copydockerimage_fitask.go
diff --git a/upup/pkg/fi/assettasks/copyfile.go b/upup/pkg/fi/assettasks/copyfile.go
@@ -32,7 +32,7 @@ import (
 
 // CopyFile copies an from a source file repository, to a target repository,
 // typically used for highly secure clusters.
-//go:generate fitask -type=CopyFile
+// +kops:fitask
 type CopyFile struct {
 	Name       *string
 	SourceFile *string

diff --git a/upup/pkg/fi/assettasks/copyfile_fitask.go b/upup/pkg/fi/assettasks/copyfile_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/disk.go b/upup/pkg/fi/cloudup/alitasks/disk.go
@@ -28,13 +28,13 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-// Disk represents a ALI Cloud Disk
-//go:generate fitask -type=Disk
 const (
 	DiskResource = "disk"
 	DiskType     = ecs.DiskTypeAllData
 )
 
+// Disk represents an ALI Cloud Disk.
+// +kops:fitask
 type Disk struct {
 	Lifecycle    *fi.Lifecycle
 	Name         *string

diff --git a/upup/pkg/fi/cloudup/alitasks/disk_fitask.go b/upup/pkg/fi/cloudup/alitasks/disk_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/eip_fitask.go b/upup/pkg/fi/cloudup/alitasks/eip_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/eip_natgateway_association.go b/upup/pkg/fi/cloudup/alitasks/eip_natgateway_association.go
@@ -31,7 +31,7 @@ const (
 	NatType = "Nat"
 )
 
-//go:generate fitask -type=EIP
+// +kops:fitask
 type EIP struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

diff --git a/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go b/upup/pkg/fi/cloudup/alitasks/launchconfiguration.go
@@ -36,8 +36,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=LaunchConfiguration
-
 const dateFormat = "2006-01-02T15:04Z"
 
 // defaultRetainLaunchConfigurationCount is the number of launch configurations (matching the name prefix) that we should
@@ -53,6 +51,7 @@ func RetainLaunchConfigurationCount() int {
 }
 
 // LaunchConfiguration is the specification for a launch configuration
+// +kops:fitask
 type LaunchConfiguration struct {
 	Lifecycle *fi.Lifecycle
 	ID        *string

diff --git a/upup/pkg/fi/cloudup/alitasks/launchconfiguration_fitask.go b/upup/pkg/fi/cloudup/alitasks/launchconfiguration_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancer.go b/upup/pkg/fi/cloudup/alitasks/loadbalancer.go
@@ -30,8 +30,7 @@ import (
 )
 
 // LoadBalancer represents a ALI Cloud LoadBalancer
-//go:generate fitask -type=LoadBalancer
-
+// +kops:fitask
 type LoadBalancer struct {
 	Name                *string
 	LoadbalancerId      *string

diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancer_fitask.go b/upup/pkg/fi/cloudup/alitasks/loadbalancer_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalanceracl.go b/upup/pkg/fi/cloudup/alitasks/loadbalanceracl.go
@@ -30,6 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
+// +kops:fitask
 type LoadBalancerACL struct {
 	ID                   *string
 	Name                 *string

diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalanceracl_fitask.go b/upup/pkg/fi/cloudup/alitasks/loadbalanceracl_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener.go b/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener.go
@@ -30,7 +30,7 @@ import (
 
 const ListenerRunningStatus = "running"
 
-//go:generate fitask -type=LoadBalancerListener
+// +kops:fitask
 type LoadBalancerListener struct {
 	LoadBalancer      *LoadBalancer
 	Name              *string

diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener_fitask.go b/upup/pkg/fi/cloudup/alitasks/loadbalancerlistener_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/natgateway.go b/upup/pkg/fi/cloudup/alitasks/natgateway.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=NatGateway
+// +kops:fitask
 type NatGateway struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

diff --git a/upup/pkg/fi/cloudup/alitasks/natgateway_fitask.go b/upup/pkg/fi/cloudup/alitasks/natgateway_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/rampolicy.go b/upup/pkg/fi/cloudup/alitasks/rampolicy.go
@@ -29,8 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=RAMPolicy
-
+// +kops:fitask
 type RAMPolicy struct {
 	Lifecycle      *fi.Lifecycle
 	Name           *string

diff --git a/upup/pkg/fi/cloudup/alitasks/rampolicy_fitask.go b/upup/pkg/fi/cloudup/alitasks/rampolicy_fitask.go
diff --git a/upup/pkg/fi/cloudup/alitasks/ramrole.go b/upup/pkg/fi/cloudup/alitasks/ramrole.go
@@ -29,8 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=RAMRole
-
+// +kops:fitask
 type RAMRole struct {
 	ID                       *string
 	Lifecycle                *fi.Lifecycle

diff --git a/upup/pkg/fi/cloudup/alitasks/ramrole_fitask.go b/upup/pkg/fi/cloudup/alitasks/ramrole_fitask.go