Skip to content

Commit 67fc178

Browse files
committed
aws testing
1 parent 8a00d3a commit 67fc178

File tree

10 files changed

+495
-127
lines changed

10 files changed

+495
-127
lines changed

v1/kubernetes.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const (
5656
ClusterStatusPending ClusterStatus = "pending"
5757
ClusterStatusAvailable ClusterStatus = "available"
5858
ClusterStatusDeleting ClusterStatus = "deleting"
59+
ClusterStatusFailed ClusterStatus = "failed"
5960
)
6061

6162
type NodeGroup struct {
@@ -94,6 +95,7 @@ const (
9495
NodeGroupStatusPending NodeGroupStatus = "pending"
9596
NodeGroupStatusAvailable NodeGroupStatus = "available"
9697
NodeGroupStatusDeleting NodeGroupStatus = "deleting"
98+
NodeGroupStatusFailed NodeGroupStatus = "failed"
9799
)
98100

99101
type CreateClusterArgs struct {
@@ -102,7 +104,6 @@ type CreateClusterArgs struct {
102104
VPCID CloudProviderResourceID
103105
SubnetIDs []CloudProviderResourceID
104106
KubernetesVersion string
105-
Location string
106107
Tags Tags
107108
}
108109

@@ -194,9 +195,6 @@ func ValidateCreateKubernetesCluster(ctx context.Context, client CloudMaintainKu
194195
if cluster.RefID != attrs.RefID {
195196
return nil, fmt.Errorf("cluster refID does not match create args: '%s' != '%s'", cluster.RefID, attrs.RefID)
196197
}
197-
if cluster.Location != attrs.Location {
198-
return nil, fmt.Errorf("cluster location does not match create args: '%s' != '%s'", cluster.Location, attrs.Location)
199-
}
200198
if cluster.KubernetesVersion != attrs.KubernetesVersion {
201199
return nil, fmt.Errorf("cluster KubernetesVersion does not match create args: '%s' != '%s'", cluster.KubernetesVersion, attrs.KubernetesVersion)
202200
}

v1/providers/aws/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/aws/aws-sdk-go-v2/credentials"
1313
)
1414

15-
const CloudProviderID = "aws"
15+
const CloudProviderID string = "aws"
1616

1717
type AWSCredential struct {
1818
RefID string
@@ -39,7 +39,7 @@ func (c *AWSCredential) GetAPIType() v1.APIType {
3939
}
4040

4141
func (c *AWSCredential) GetCloudProviderID() v1.CloudProviderID {
42-
return CloudProviderID
42+
return v1.CloudProviderID(CloudProviderID)
4343
}
4444

4545
func (c *AWSCredential) GetTenantID() (string, error) {
@@ -84,7 +84,7 @@ func (c *AWSClient) GetAPIType() v1.APIType {
8484
}
8585

8686
func (c *AWSClient) GetCloudProviderID() v1.CloudProviderID {
87-
return CloudProviderID
87+
return v1.CloudProviderID(CloudProviderID)
8888
}
8989

9090
func (c *AWSClient) GetReferenceID() string {

0 commit comments

Comments
 (0)