WIP no IDE errors

Author: bryan-cox

.golangci.yml

@@ -169,8 +169,8 @@ linters:
           alias: crclient
         - pkg: k8s.io/apimachinery/pkg/types
           alias: apimachinerytypes
-        - pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
-          alias: expclusterv1
+        - pkg: "sigs.k8s.io/cluster-api/api/core/v1beta1"
+          alias: clusterv1
       no-unaliased: false
     nolintlint:
       require-specific: true

api/v1beta1/awscluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 const (

api/v1beta1/awsclustertemplate_types.go

@@ -19,8 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-)
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")
 
 // AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.
 type AWSClusterTemplateSpec struct {

api/v1beta1/awsmachine_types.go

@@ -19,8 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-)
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")
 
 const (
 	// MachineFinalizer allows ReconcileAWSMachine to clean up AWS resources associated with AWSMachine before

api/v1beta1/awsmachinetemplate_types.go

@@ -20,8 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-)
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")
 
 // AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
 type AWSMachineTemplateStatus struct {

api/v1beta1/conditions_consts.go

@@ -16,8 +16,7 @@ limitations under the License.
 
 package v1beta1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-
+import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 const (
 	// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.
 	// A possible scenario, where retrieval is unsuccessful, is when SourcePrincipal is not authorized for assume role.

api/v1beta1/tags.go

@@ -24,8 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-)
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")
 
 // Tags defines a map of tags.
 type Tags map[string]string

api/v1beta1/types.go

@@ -19,8 +19,7 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-)
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")
 
 // AWSResourceReference is a reference to a specific AWS resource by ID or filters.
 // Only one of ID or Filters may be specified. Specifying more than one will result in