Skip to content

Commit

Permalink
Reference issue in all outstanding TODOs (#28, #156, #157, #158)
Browse files Browse the repository at this point in the history
  • Loading branch information
errordeveloper committed Sep 4, 2018
1 parent 64b1e41 commit 8baf89e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions pkg/cfn/builder/nodegroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ func (n *nodeGroupResourceSet) AddAllResources() error {
n.rs.newStringParameter(ParamClusterStackName, "")
n.rs.newNumberParameter(ParamNodeGroupID, "")

// TODO: imporve validation of parameter set overall, probably in another package
// TODO: validate custom AMI (check it's present) and instance type
// TODO: https://github.com/weaveworks/eksctl/issues/28
// - imporve validation of parameter set overall, probably in another package
// - validate custom AMI (check it's present) and instance type
if n.spec.NodeAMI == "" {
n.spec.NodeAMI = regionalAMIs[n.spec.Region]
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/nodebootstrap/assets.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/nodebootstrap/assets/get_metadata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -o nounset
# we could use the following, but we still need jq to get region and instance ID:
# aws --output text --region us-west-2 ec2 describe-tags --filters Name=resource-type,Values=instance Name=resource-id,Values=i-017e37452ee14d8d7 --query "Tags[?Key=='eksctl.cluster.k8s.io/v1alpha1/cluster-name'].Value"

# TODO: experiment with a more static version, we can pass region and cluster name and generate whole `metadata.env` if we wanted to
# TODO: avoid having to do all this – https://github.com/weaveworks/eksctl/issues/157

instanceInfo="$(curl --silent http://169.254.169.254/latest/dynamic/instance-identity/document)"

Expand Down
4 changes: 2 additions & 2 deletions pkg/nodebootstrap/userdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ func setKubeletParams(config *cloudconfig.CloudConfig, spec *api.ClusterConfig)
if spec.MaxPodsPerNode == 0 {
spec.MaxPodsPerNode = maxPodsPerNodeType[spec.NodeType]
}
// TODO: investigate if we can use componentconfig, or at least switch to kubelet config file
// TODO: use componentconfig or kubelet config file – https://github.com/weaveworks/eksctl/issues/156
kubeletParams := []string{
fmt.Sprintf("MAX_PODS=%d", spec.MaxPodsPerNode),
// TODO: this will need to change when we provide options for using different VPCs and CIDRs
// TODO: this will need to change when we provide options for using different VPCs and CIDRs – https://github.com/weaveworks/eksctl/issues/158
"CLUSTER_DNS=10.100.0.10",
}

Expand Down

0 comments on commit 8baf89e

Please sign in to comment.