Skip to content

Commit

Permalink
CHANGELOG, ec2config: update AMI type
Browse files Browse the repository at this point in the history
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
  • Loading branch information
gyuho committed Oct 13, 2021
1 parent 408858d commit 4dadb7b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG/CHANGELOG-1.6.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@

<hr>

## [v1.6.4](https://github.com/aws/aws-k8s-tester/releases/tag/v1.6.4) (2021-10-13)

See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.6.3...v1.6.4).

### `eksconfig`

- Support [Windows node group](https://github.com/aws/aws-k8s-tester/pull/241).

### Go

- Compile with [*Go 1.17.2*](https://golang.org/doc/devel/release.html#go1.17).


<hr>


## [v1.6.3](https://github.com/aws/aws-k8s-tester/releases/tag/v1.6.3) (2021-10-06)

See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.6.2...v1.6.3).
Expand Down
3 changes: 3 additions & 0 deletions ec2config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ const (
// AMITypeAL2X8664GPU is the AMI type for Amazon Linux 2 AMI with GPU.
AMITypeAL2X8664GPU = "AL2_x86_64_GPU"

// AMITypeOther is defined for all other AMI types.
AMITypeOther = "OTHER"

AMITypeWindowsServerCore2019X8664 = "WINDOWS_SERVER_CORE_2019_x86_64"

// DefaultNodeInstanceTypeCPUARM is the default EC2 instance type for CPU worker node.
Expand Down
2 changes: 2 additions & 0 deletions ec2config/validate-defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ func (cfg *Config) validateASGs() error {
if cur.RemoteAccessUserName != "ec2-user" {
return fmt.Errorf("AMIType %q but unexpected RemoteAccessUserName %q", cur.AMIType, cur.RemoteAccessUserName)
}
case AMITypeOther:
default:
return fmt.Errorf("unknown ASGs[%q].AMIType %q", k, cur.AMIType)
}
Expand All @@ -370,6 +371,7 @@ func (cfg *Config) validateASGs() error {
if cur.InstanceType == "" {
cur.InstanceType = DefaultNodeInstanceTypeGPU
}
case AMITypeOther:
default:
return fmt.Errorf("unknown ASGs[%q].AMIType %q", k, cur.AMIType)
}
Expand Down

0 comments on commit 4dadb7b

Please sign in to comment.