Switch to new fitasks marker

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

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

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

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

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

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

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

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

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

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

upup/pkg/fi/cloudup/alitasks/scalinggroup.go

@@ -30,8 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=ScalingGroup
-
+// +kops:fitask
 type ScalingGroup struct {
 	Name           *string
 	Lifecycle      *fi.Lifecycle

upup/pkg/fi/cloudup/alitasks/securitygroup.go

@@ -29,9 +29,9 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=SecurityGroup
 const SecurityResource = "securitygroup"
 
+// +kops:fitask
 type SecurityGroup struct {
 	Name            *string
 	SecurityGroupId *string

upup/pkg/fi/cloudup/alitasks/securitygrouprule.go

@@ -29,8 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=SecurityGroupRule
-
+// +kops:fitask
 type SecurityGroupRule struct {
 	Name          *string
 	IpProtocol    *string

upup/pkg/fi/cloudup/alitasks/sshkey.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=SSHKey
+// +kops:fitask
 type SSHKey struct {
 	Name               *string
 	Lifecycle          *fi.Lifecycle

upup/pkg/fi/cloudup/alitasks/vpc.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=VPC
+// +kops:fitask
 type VPC struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/alitasks/vswitch.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=VSwitch
+// +kops:fitask
 type VSwitch struct {
 	Name      *string
 	VSwitchId *string

upup/pkg/fi/cloudup/alitasks/vswitchSNAT.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=VSwitchSNAT
+// +kops:fitask
 type VSwitchSNAT struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/dhcp_options.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=DHCPOptions
+// +kops:fitask
 type DHCPOptions struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/dnsname.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=DNSName
+// +kops:fitask
 type DNSName struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/dnszone.go

@@ -34,7 +34,7 @@ import (
 )
 
 // DNSZone is a zone object in a dns provider
-//go:generate fitask -type=DNSZone
+// +kops:fitask
 type DNSZone struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/ebsvolume.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/klog"
 )
 
-//go:generate fitask -type=EBSVolume
+// +kops:fitask
 type EBSVolume struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/elastic_ip.go

@@ -29,9 +29,8 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=ElasticIP
-
 // ElasticIP manages an AWS Address (ElasticIP)
+// +kops:fitask
 type ElasticIP struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/external_load_balancer_attachment.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=ExternalLoadBalancerAttachment
+// +kops:fitask
 type ExternalLoadBalancerAttachment struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/external_target_group_attachment.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=ExternalTargetGroupAttachment
+// +kops:fitask
 type ExternalTargetGroupAttachment struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/iaminstanceprofile.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/klog"
 )
 
-//go:generate fitask -type=IAMInstanceProfile
+// +kops:fitask
 type IAMInstanceProfile struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/iaminstanceprofilerole.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=IAMInstanceProfileRole
+// +kops:fitask
 type IAMInstanceProfileRole struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/iamoidcprovider.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=IAMOIDCProvider
+// +kops:fitask
 type IAMOIDCProvider struct {
 	Lifecycle *fi.Lifecycle
 

upup/pkg/fi/cloudup/awstasks/iamrole.go

@@ -35,7 +35,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=IAMRole
+// +kops:fitask
 type IAMRole struct {
 	ID        *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=IAMRolePolicy
+// +kops:fitask
 type IAMRolePolicy struct {
 	ID        *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/internetgateway.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=InternetGateway
+// +kops:fitask
 type InternetGateway struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/load_balancer.go

@@ -36,7 +36,7 @@ import (
 
 // LoadBalancer manages an ELB.  We find the existing ELB using the Name tag.
 
-//go:generate fitask -type=LoadBalancer
+// +kops:fitask
 type LoadBalancer struct {
 	// We use the Name tag to find the existing ELB, because we are (more or less) unrestricted when
 	// it comes to tag values, but the LoadBalancerName is length limited

upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=LoadBalancerAttachment
+// +kops:fitask
 type LoadBalancerAttachment struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/natgateway.go

@@ -29,7 +29,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

upup/pkg/fi/cloudup/awstasks/route.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Route
+// +kops:fitask
 type Route struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/routetable.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=RouteTable
+// +kops:fitask
 type RouteTable struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/routetableassociation.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=RouteTableAssociation
+// +kops:fitask
 type RouteTableAssociation struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/securitygroup.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=SecurityGroup
+// +kops:fitask
 type SecurityGroup struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/securitygrouprule.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=SecurityGroupRule
+// +kops:fitask
 type SecurityGroupRule struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/sshkey.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=SSHKey
+// +kops:fitask
 type SSHKey struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/subnet.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/utils"
 )
 
-//go:generate fitask -type=Subnet
+// +kops:fitask
 type Subnet struct {
 	Name *string
 

upup/pkg/fi/cloudup/awstasks/vpc.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=VPC
+// +kops:fitask
 type VPC struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/vpc_dhcpoptions_association.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=VPCDHCPOptionsAssociation
+// +kops:fitask
 type VPCDHCPOptionsAssociation struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/awstasks/vpccidrblock.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=VPCCIDRBlock
+// +kops:fitask
 type VPCCIDRBlock struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/dotasks/droplet.go

@@ -29,9 +29,9 @@ import (
 	_ "k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Droplet
 // Droplet represents a group of droplets. In the future it
 // will be managed by the Machines API
+// +kops:fitask
 type Droplet struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/dotasks/loadbalancer.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/do"
 )
 
-//go:generate fitask -type=LoadBalancer
+// +kops:fitask
 type LoadBalancer struct {
 	Name      *string
 	ID        *string

upup/pkg/fi/cloudup/dotasks/volume.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Volume
+// +kops:fitask
 type Volume struct {
 	Name      *string
 	ID        *string

upup/pkg/fi/cloudup/gcetasks/address.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Address
+// +kops:fitask
 type Address struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/disk.go

@@ -28,7 +28,7 @@ import (
 )
 
 // Disk represents a GCE PD
-//go:generate fitask -type=Disk
+// +kops:fitask
 type Disk struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/firewallrule.go

@@ -27,7 +27,7 @@ import (
 )
 
 // FirewallRule represents a GCE firewall rules
-//go:generate fitask -type=FirewallRule
+// +kops:fitask
 type FirewallRule struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/forwardingrule.go

@@ -27,7 +27,7 @@ import (
 )
 
 // ForwardingRule represents a GCE ForwardingRule
-//go:generate fitask -type=ForwardingRule
+// +kops:fitask
 type ForwardingRule struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/instance.go

@@ -30,7 +30,7 @@ import (
 
 var scopeAliases map[string]string
 
-//go:generate fitask -type=Instance
+// +kops:fitask
 type Instance struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=InstanceGroupManager
+// +kops:fitask
 type InstanceGroupManager struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/instancetemplate.go

@@ -36,7 +36,7 @@ import (
 const InstanceTemplateNamePrefixMaxLength = 32
 
 // InstanceTemplate represents a GCE InstanceTemplate
-//go:generate fitask -type=InstanceTemplate
+// +kops:fitask
 type InstanceTemplate struct {
 	Name *string
 

upup/pkg/fi/cloudup/gcetasks/network.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Network
+// +kops:fitask
 type Network struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/storagebucketacl.go

@@ -27,7 +27,7 @@ import (
 )
 
 // StorageBucketAcl represents an ACL rule on a google cloud storage bucket
-//go:generate fitask -type=StorageBucketAcl
+// +kops:fitask
 type StorageBucketAcl struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/storagebucketiam.go

@@ -27,7 +27,7 @@ import (
 )
 
 // StorageBucketIam represents an IAM policy on a google cloud storage bucket
-//go:generate fitask -type=StorageBucketIam
+// +kops:fitask
 type StorageBucketIam struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/storageobjectacl.go

@@ -27,7 +27,7 @@ import (
 )
 
 // StorageObjectAcl represents an ACL rule on a google cloud storage object
-//go:generate fitask -type=StorageObjectAcl
+// +kops:fitask
 type StorageObjectAcl struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/subnet.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Subnet
+// +kops:fitask
 type Subnet struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/gcetasks/targetpool.go

@@ -27,7 +27,7 @@ import (
 )
 
 // TargetPool represents a GCE TargetPool
-//go:generate fitask -type=TargetPool
+// +kops:fitask
 type TargetPool struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/openstacktasks/floatingip.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/util/pkg/vfs"
 )
 
-//go:generate fitask -type=FloatingIP
+// +kops:fitask
 type FloatingIP struct {
 	Name         *string
 	ID           *string

upup/pkg/fi/cloudup/openstacktasks/instance.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=Instance
+// +kops:fitask
 type Instance struct {
 	ID               *string
 	Name             *string

upup/pkg/fi/cloudup/openstacktasks/lb.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=LB
+// +kops:fitask
 type LB struct {
 	ID            *string
 	Name          *string

upup/pkg/fi/cloudup/openstacktasks/lblistener.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=LBListener
+// +kops:fitask
 type LBListener struct {
 	ID           *string
 	Name         *string

upup/pkg/fi/cloudup/openstacktasks/lbpool.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=LBPool
+// +kops:fitask
 type LBPool struct {
 	ID           *string
 	Name         *string

upup/pkg/fi/cloudup/openstacktasks/network.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=Network
+// +kops:fitask
 type Network struct {
 	ID        *string
 	Name      *string

upup/pkg/fi/cloudup/openstacktasks/poolassociation.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/kops/util/pkg/vfs"
 )
 
-//go:generate fitask -type=PoolAssociation
+// +kops:fitask
 type PoolAssociation struct {
 	ID            *string
 	Name          *string

upup/pkg/fi/cloudup/openstacktasks/port.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=Port
+// +kops:fitask
 type Port struct {
 	ID                       *string
 	Name                     *string

upup/pkg/fi/cloudup/openstacktasks/router.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=Router
+// +kops:fitask
 type Router struct {
 	ID        *string
 	Name      *string

upup/pkg/fi/cloudup/openstacktasks/routerinterface.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=RouterInterface
+// +kops:fitask
 type RouterInterface struct {
 	ID        *string
 	Name      *string

upup/pkg/fi/cloudup/openstacktasks/securitygroup.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=SecurityGroup
+// +kops:fitask
 type SecurityGroup struct {
 	ID               *string
 	Name             *string

upup/pkg/fi/cloudup/openstacktasks/servergroup.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=ServerGroup
+// +kops:fitask
 type ServerGroup struct {
 	ID          *string
 	Name        *string

upup/pkg/fi/cloudup/openstacktasks/sshkey.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=SSHKey
+// +kops:fitask
 type SSHKey struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/openstacktasks/subnet.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=Subnet
+// +kops:fitask
 type Subnet struct {
 	ID         *string
 	Name       *string

upup/pkg/fi/cloudup/openstacktasks/volume.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
-//go:generate fitask -type=Volume
+// +kops:fitask
 type Volume struct {
 	ID               *string
 	Name             *string

upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go

@@ -39,7 +39,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/utils"
 )
 
-//go:generate fitask -type=Elastigroup
+// +kops:fitask
 type Elastigroup struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=LaunchSpec
+// +kops:fitask
 type LaunchSpec struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/cloudup/spotinsttasks/ocean.go

@@ -36,7 +36,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
-//go:generate fitask -type=Ocean
+// +kops:fitask
 type Ocean struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/fitasks/keypair.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 )
 
-//go:generate fitask -type=Keypair
+// +kops:fitask
 type Keypair struct {
 	// Name is the name of the keypair
 	Name *string

upup/pkg/fi/fitasks/managedfile.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kops/util/pkg/vfs"
 )
 
-//go:generate fitask -type=ManagedFile
+// +kops:fitask
 type ManagedFile struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/fitasks/mirrorkeystore.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/kops/util/pkg/vfs"
 )
 
-//go:generate fitask -type=MirrorKeystore
+// +kops:fitask
 type MirrorKeystore struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/fitasks/mirrorsecrets.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/kops/util/pkg/vfs"
 )
 
-//go:generate fitask -type=MirrorSecrets
+// +kops:fitask
 type MirrorSecrets struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle

upup/pkg/fi/fitasks/secret.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 )
 
-//go:generate fitask -type=Secret
+// +kops:fitask
 type Secret struct {
 	Name      *string
 	Lifecycle *fi.Lifecycle