Bump API version in e2e tests

    Co-authored-by: Ankita Swamy <[email protected]>
    Co-authored-by: Sedef Savas <[email protected]>

Author: sedefsavas

.golangci.yml

@@ -85,33 +85,25 @@ linters-settings:
         alias: utilconversion
       - pkg: k8s.io/apimachinery/pkg/conversion
         alias: apiconversion
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta2
         alias: infrav1
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha3
-        alias: expinfrav1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha4
-        alias: expinfrav1alpha4
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta1
+        alias: infrav1beta1
       - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta1
+        alias: expinfrav1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta2
         alias: expinfrav1
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1alpha4
-        alias: infrav1alpha4
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3
-        alias: infrav1alpha3
       - pkg: k8s.io/client-go/kubernetes/scheme
         alias: cgscheme
       - pkg: k8s.io/client-go/tools/record
         alias: cgrecord
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1alpha3
-        alias: eksbootstrapv1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1alpha4
-        alias: eksbootstrapv1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1beta1
+        alias: eksbootstrapv1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1beta2
         alias: eksbootstrapv1
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1alpha3
-        alias: ekscontrolplanev1alpha3
-      - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1alpha4
-        alias: ekscontrolplanev1alpha4
       - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta1
+        alias: ekscontrolplanev1beta1
+      - pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta2
         alias: ekscontrolplanev1
       - pkg: "sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/controllers"
         alias: eksbootstrapcontrollers
@@ -125,10 +117,6 @@ linters-settings:
         alias: runtimeserializer
       - pkg: "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
         alias: yamlserializer
-      - pkg:  "sigs.k8s.io/cluster-api/api/v1alpha3"
-        alias: clusterv1alpha3
-      - pkg:  "sigs.k8s.io/cluster-api/api/v1alpha4"
-        alias: clusterv1alpha4
       - pkg: "sigs.k8s.io/cluster-api/api/v1beta1"
         alias: clusterv1
       - pkg: "sigs.k8s.io/cluster-api/util/defaulting"
@@ -210,7 +198,7 @@ issues:
     - linters:
       - godot
       text: "Comment should end in a period"
-      path: "(.*)/(v1alpha3|v1alpha4|v1alpha1)/(.*)types.go"
+      path: "(.*)/(v1beta1|v1beta2)/(.*)types.go"
     - linters:
       - errcheck
       text: Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked

api/v1beta1/bastion.go

@@ -19,15 +19,10 @@ package v1beta1
 import (
 	"fmt"
 	"net"
-	"regexp"
 
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
-var (
-	sshKeyValidNameRegex = regexp.MustCompile(`^[[:graph:]]+([[:print:]]*[[:graph:]]+)*$`)
-)
-
 // Validate will validate the bastion fields.
 func (b *Bastion) Validate() []*field.Error {
 	var errs field.ErrorList
@@ -48,16 +43,3 @@ func (b *Bastion) Validate() []*field.Error {
 	}
 	return errs
 }
-
-func validateSSHKeyName(sshKeyName *string) field.ErrorList {
-	var allErrs field.ErrorList
-	switch {
-	case sshKeyName == nil:
-	// nil is accepted
-	case sshKeyName != nil && *sshKeyName == "":
-	// empty string is accepted
-	case sshKeyName != nil && !sshKeyValidNameRegex.Match([]byte(*sshKeyName)):
-		allErrs = append(allErrs, field.Invalid(field.NewPath("sshKeyName"), sshKeyName, "Name is invalid. Must be specified in ASCII and must not start or end in whitespace"))
-	}
-	return allErrs
-}

api/v1beta1/conversion.go

@@ -1,9 +1,12 @@
 /*
 Copyright 2021 The Kubernetes Authors.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
 	http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

api/v1beta1/conversion_test.go

@@ -1,9 +1,12 @@
 /*
 Copyright 2021 The Kubernetes Authors.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
 	http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

bootstrap/eks/api/v1beta2/groupversion_info.go

@@ -17,6 +17,7 @@ limitations under the License.
 // package v1beta2 contains API Schema definitions for the Amazon EKS Bootstrap v1beta2 API group
 // +kubebuilder:object:generate=true
 // +groupName=bootstrap.cluster.x-k8s.io
+
 package v1beta2
 
 import (

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml

@@ -37,7 +37,72 @@ spec:
       name: Endpoint
       priority: 1
       type: string
-    name: v1alpha3
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: AWSManagedCluster is the Schema for the awsmanagedclusters API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AWSManagedClusterSpec defines the desired state of AWSManagedCluster
+            properties:
+              controlPlaneEndpoint:
+                description: ControlPlaneEndpoint represents the endpoint used to
+                  communicate with the control plane.
+                properties:
+                  host:
+                    description: The hostname on which the API server is serving.
+                    type: string
+                  port:
+                    description: The port on which the API server is serving.
+                    format: int32
+                    type: integer
+                required:
+                - host
+                - port
+                type: object
+            type: object
+          status:
+            description: AWSManagedClusterStatus defines the observed state of AWSManagedCluster
+            properties:
+              failureDomains:
+                additionalProperties:
+                  description: FailureDomainSpec is the Schema for Cluster API failure
+                    domains. It allows controllers to understand how many failure
+                    domains a cluster can optionally span across.
+                  properties:
+                    attributes:
+                      additionalProperties:
+                        type: string
+                      description: Attributes is a free form map of attributes an
+                        infrastructure provider might use or require.
+                      type: object
+                    controlPlane:
+                      description: ControlPlane determines if this failure domain
+                        is suitable for use by control plane machines.
+                      type: boolean
+                  type: object
+                description: FailureDomains specifies a list fo available availability
+                  zones that can be used
+                type: object
+              ready:
+                description: Ready is when the AWSManagedControlPlane has a API server
+                  URL.
+                type: boolean
+            type: object
+        type: object
+    name: v1beta2
     schema:
       openAPIV3Schema:
         description: AWSManagedCluster is the Schema for the awsmanagedclusters API

config/crd/kustomization.yaml

@@ -1,7 +1,7 @@
 commonLabels:
   cluster.x-k8s.io/v1alpha3: v1alpha3
   cluster.x-k8s.io/v1alpha4: v1alpha4
-  cluster.x-k8s.io/v1beta1: v1beta1
+  cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
 
 # This kustomization.yaml is not intended to be run by itself,
 # since it depends on service name and namespace that are out of this kustomize package.

exp/api/v1beta2/awsmachinepool_webhook.go

@@ -22,10 +22,11 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+
+	"sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
 )
 
 var log = logf.Log.WithName("awsmachinepool-resource")

main.go

@@ -1,9 +1,12 @@
 /*
 Copyright 2018 The Kubernetes Authors.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
 	http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +47,7 @@ import (
 	ekscontrolplanev1beta1 "sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta1"
 	ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta2"
 	ekscontrolplanecontrollers "sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/controllers"
-	expinfrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta2"
+	expinfrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta1"
 	expinfrav1 "sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/exp/controlleridentitycreator"
 	expcontrollers "sigs.k8s.io/cluster-api-provider-aws/exp/controllers"

pkg/cloud/scope/launchtemplate.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,