From e69f69bdfe5f21a5b5550f68985f1d9671aa1ff6 Mon Sep 17 00:00:00 2001 From: sayboras Date: Tue, 30 Jun 2020 21:37:36 +1000 Subject: [PATCH] Remove un-used parameter --- pkg/ami/auto_resolver_test.go | 6 ++++-- pkg/cfn/manager/delete_tasks.go | 4 ++-- pkg/ctl/delete/iamserviceaccount.go | 2 +- pkg/ctl/delete/nodegroup.go | 2 +- pkg/eks/nodegroup.go | 4 ++-- pkg/iam/iam.go | 2 +- pkg/nodebootstrap/userdata.go | 2 +- pkg/nodebootstrap/userdata_al2.go | 2 +- pkg/nodebootstrap/userdata_ubuntu.go | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkg/ami/auto_resolver_test.go b/pkg/ami/auto_resolver_test.go index ff08d876c6..cdd72099e2 100644 --- a/pkg/ami/auto_resolver_test.go +++ b/pkg/ami/auto_resolver_test.go @@ -243,8 +243,10 @@ func addMockDescribeImages(p *mockprovider.MockProvider, expectedNamePattern str ).Return(&ec2.DescribeImagesOutput{ Images: []*ec2.Image{ { - ImageId: aws.String(amiID), - State: aws.String(amiState), + ImageId: aws.String(amiID), + State: aws.String(amiState), + CreationDate: aws.String(createdDate), + Description: aws.String(instanceFamily), }, }, }, nil) diff --git a/pkg/cfn/manager/delete_tasks.go b/pkg/cfn/manager/delete_tasks.go index f36e1db1a5..eb39d95921 100644 --- a/pkg/cfn/manager/delete_tasks.go +++ b/pkg/cfn/manager/delete_tasks.go @@ -106,7 +106,7 @@ func (c *StackCollection) NewTasksToDeleteNodeGroups(shouldDelete func(string) b func (c *StackCollection) NewTasksToDeleteOIDCProviderWithIAMServiceAccounts(oidc *iamoidc.OpenIDConnectManager, clientSetGetter kubernetes.ClientSetGetter) (*TaskTree, error) { tasks := &TaskTree{Parallel: false} - saTasks, err := c.NewTasksToDeleteIAMServiceAccounts(deleteAll, oidc, clientSetGetter, true) + saTasks, err := c.NewTasksToDeleteIAMServiceAccounts(deleteAll, clientSetGetter, true) if err != nil { return nil, err } @@ -132,7 +132,7 @@ func (c *StackCollection) NewTasksToDeleteOIDCProviderWithIAMServiceAccounts(oid } // NewTasksToDeleteIAMServiceAccounts defines tasks required to delete all of the iamserviceaccounts -func (c *StackCollection) NewTasksToDeleteIAMServiceAccounts(shouldDelete func(string) bool, oidc *iamoidc.OpenIDConnectManager, clientSetGetter kubernetes.ClientSetGetter, wait bool) (*TaskTree, error) { +func (c *StackCollection) NewTasksToDeleteIAMServiceAccounts(shouldDelete func(string) bool, clientSetGetter kubernetes.ClientSetGetter, wait bool) (*TaskTree, error) { serviceAccountStacks, err := c.DescribeIAMServiceAccountStacks() if err != nil { return nil, err diff --git a/pkg/ctl/delete/iamserviceaccount.go b/pkg/ctl/delete/iamserviceaccount.go index 5e4fbdb7c7..257f3c6723 100644 --- a/pkg/ctl/delete/iamserviceaccount.go +++ b/pkg/ctl/delete/iamserviceaccount.go @@ -116,7 +116,7 @@ func doDeleteIAMServiceAccount(cmd *cmdutils.Cmd, serviceAccount *api.ClusterIAM saSubset, _ := saFilter.MatchAll(cfg.IAM.ServiceAccounts) - tasks, err := stackManager.NewTasksToDeleteIAMServiceAccounts(saSubset.Has, oidc, kubernetes.NewCachedClientSet(clientSet), cmd.Wait) + tasks, err := stackManager.NewTasksToDeleteIAMServiceAccounts(saSubset.Has, kubernetes.NewCachedClientSet(clientSet), cmd.Wait) if err != nil { return err } diff --git a/pkg/ctl/delete/nodegroup.go b/pkg/ctl/delete/nodegroup.go index b10104d7f2..119f861d71 100644 --- a/pkg/ctl/delete/nodegroup.go +++ b/pkg/ctl/delete/nodegroup.go @@ -113,7 +113,7 @@ func doDeleteNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup, updateAuthConfigMap if updateAuthConfigMap { for _, ng := range cfg.NodeGroups { if ng.IAM == nil || ng.IAM.InstanceRoleARN == "" { - if err := ctl.GetNodeGroupIAM(stackManager, cfg, ng); err != nil { + if err := ctl.GetNodeGroupIAM(stackManager, ng); err != nil { logger.Warning("error getting instance role ARN for nodegroup %q: %v", ng.Name, err) return nil } diff --git a/pkg/eks/nodegroup.go b/pkg/eks/nodegroup.go index 9120539cde..bdbd0ae99c 100644 --- a/pkg/eks/nodegroup.go +++ b/pkg/eks/nodegroup.go @@ -251,7 +251,7 @@ func (c *ClusterProvider) WaitForNodes(clientSet kubernetes.Interface, ng KubeNo } // GetNodeGroupIAM retrieves the IAM configuration of the given nodegroup -func (c *ClusterProvider) GetNodeGroupIAM(stackManager *manager.StackCollection, spec *api.ClusterConfig, ng *api.NodeGroup) error { +func (c *ClusterProvider) GetNodeGroupIAM(stackManager *manager.StackCollection, ng *api.NodeGroup) error { stacks, err := stackManager.DescribeNodeGroupStacks() if err != nil { return err @@ -259,7 +259,7 @@ func (c *ClusterProvider) GetNodeGroupIAM(stackManager *manager.StackCollection, for _, s := range stacks { if stackManager.GetNodeGroupName(s) == ng.Name { - err := iam.UseFromNodeGroup(c.Provider, s, ng) + err := iam.UseFromNodeGroup(s, ng) // An empty InstanceRoleARN likely also points to an error if err == nil && ng.IAM.InstanceRoleARN == "" { err = errors.New("InstanceRoleARN empty") diff --git a/pkg/iam/iam.go b/pkg/iam/iam.go index e72d0c4740..23a1108c2d 100644 --- a/pkg/iam/iam.go +++ b/pkg/iam/iam.go @@ -44,7 +44,7 @@ func ImportInstanceRoleFromProfileARN(provider api.ClusterProvider, ng *api.Node // UseFromNodeGroup retrieves the IAM configuration from an existing nodegroup // based on stack outputs -func UseFromNodeGroup(provider api.ClusterProvider, stack *cfn.Stack, ng *api.NodeGroup) error { +func UseFromNodeGroup(stack *cfn.Stack, ng *api.NodeGroup) error { if ng.IAM == nil { ng.IAM = &api.NodeGroupIAM{} } diff --git a/pkg/nodebootstrap/userdata.go b/pkg/nodebootstrap/userdata.go index e4778ac06f..ca9fcb758e 100644 --- a/pkg/nodebootstrap/userdata.go +++ b/pkg/nodebootstrap/userdata.go @@ -155,7 +155,7 @@ func toCLIArgs(values map[string]string) string { return strings.Join(args, " ") } -func makeCommonKubeletEnvParams(spec *api.ClusterConfig, ng *api.NodeGroup) []string { +func makeCommonKubeletEnvParams(ng *api.NodeGroup) []string { variables := []string{ fmt.Sprintf("NODE_LABELS=%s", kvs(ng.Labels)), fmt.Sprintf("NODE_TAINTS=%s", kvs(ng.Taints)), diff --git a/pkg/nodebootstrap/userdata_al2.go b/pkg/nodebootstrap/userdata_al2.go index 9b1a4f495e..0d7470c696 100644 --- a/pkg/nodebootstrap/userdata_al2.go +++ b/pkg/nodebootstrap/userdata_al2.go @@ -31,7 +31,7 @@ func makeAmazonLinux2Config(spec *api.ClusterConfig, ng *api.NodeGroup) (configF }, configDir: { "metadata.env": {content: strings.Join(makeMetadata(spec), "\n")}, - "kubelet.env": {content: strings.Join(makeCommonKubeletEnvParams(spec, ng), "\n")}, + "kubelet.env": {content: strings.Join(makeCommonKubeletEnvParams(ng), "\n")}, "kubelet.yaml": {content: string(kubeletConfigData)}, // TODO: https://github.com/weaveworks/eksctl/issues/161 "ca.crt": {content: string(spec.Status.CertificateAuthorityData)}, diff --git a/pkg/nodebootstrap/userdata_ubuntu.go b/pkg/nodebootstrap/userdata_ubuntu.go index bb66605f78..2de5dd4a06 100644 --- a/pkg/nodebootstrap/userdata_ubuntu.go +++ b/pkg/nodebootstrap/userdata_ubuntu.go @@ -21,7 +21,7 @@ func makeUbuntu1804Config(spec *api.ClusterConfig, ng *api.NodeGroup) (configFil return nil, errors.New("invalid cluster config: missing CertificateAuthorityData") } - kubeletEnvParams := append(makeCommonKubeletEnvParams(spec, ng), + kubeletEnvParams := append(makeCommonKubeletEnvParams(ng), fmt.Sprintf("CLUSTER_DNS=%s", clusterDNS(spec, ng)), )