Skip to content

Use unique cluster alias as identifier rather than redundant eksID #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −18
Open

Use unique cluster alias as identifier rather than redundant eksID #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion provisioner/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ type EKSClusterDetails struct {

func (a *awsAdapter) GetEKSClusterDetails(cluster *api.Cluster) (*EKSClusterDetails, error) {
resp, err := a.eksClient.DescribeCluster(&eks.DescribeClusterInput{
Name: aws.String(eksID(cluster.ID)),
Name: aws.String(cluster.Alias),
})
if err != nil {
return nil, err
Expand Down
6 changes: 0 additions & 6 deletions provisioner/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ func renderTemplate(context *templateContext, file string) (string, error) {
"azID": azID,
"azCount": azCount,
"split": split,
"eksID": eksID,
"mountUnitName": mountUnitName,
"accountID": accountID,
"portRanges": portRanges,
Expand Down Expand Up @@ -281,11 +280,6 @@ func list(args ...interface{}) []interface{} {
return args
}

func eksID(id string) string {
parts := strings.Split(id, ":")
return parts[len(parts)-1]
}

// accountID returns just the ID part of an account
func accountID(account string) (string, error) {
items := strings.Split(account, ":")
Expand Down
9 changes: 0 additions & 9 deletions provisioner/template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,6 @@ func TestAccountIDFailsOnInvalid(t *testing.T) {
require.Error(t, err)
}

func TestEKSID(t *testing.T) {
result, err := renderSingle(
t,
`{{ eksID "aws:000000:eu-north-1:kube-1" }}`,
"")
require.NoError(t, err)
require.EqualValues(t, "kube-1", result)
}

func TestParsePortRanges(t *testing.T) {
testTemplate := `{{- if index .Values.data.portRanges -}}
{{- range $index, $element := portRanges .Values.data.portRanges -}}
Expand Down
4 changes: 2 additions & 2 deletions provisioner/zalando_eks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (z *ZalandoEKSProvisioner) Provision(
return fmt.Errorf("failed to setup AWS Adapter: %v", err)
}

eksTokenSource := eks.NewTokenSource(awsAdapter.session, eksID(cluster.ID))
eksTokenSource := eks.NewTokenSource(awsAdapter.session, cluster.Alias)

logger.Infof(
"clusterpy: Prepare for provisioning EKS cluster %s (%s)..",
Expand Down Expand Up @@ -127,7 +127,7 @@ func (z *ZalandoEKSProvisioner) Decommission(
}

cluster.APIServerURL = cluster.ConfigItems[KeyEKSEndpoint]
tokenSource := eks.NewTokenSource(awsAdapter.session, eksID(cluster.ID))
tokenSource := eks.NewTokenSource(awsAdapter.session, cluster.Alias)

return z.decommission(
ctx,
Expand Down