eksconfig: fix "AddOnAmiSoftLockupIssue454" env parsing (#199)

gyuho · web-flow · commit 43735a996c18 · 2021-01-25T21:25:03.000-08:00
* eksconfig: fix "AddOnAmiSoftLockupIssue454" env parsing

Signed-off-by: Gyuho Lee &lt;leegyuho@amazon.com&gt;

* CHANGELOG: update

Signed-off-by: Gyuho Lee &lt;leegyuho@amazon.com&gt;
diff --git a/CHANGELOG/CHANGELOG-1.5.md b/CHANGELOG/CHANGELOG-1.5.md
@@ -1,8 +1,22 @@
 
 
+<hr>
+
+
+## [v1.5.7](https://github.com/aws/aws-k8s-tester/releases/tag/v1.5.7) (2021-01-25)
+
+See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.5.6...v1.5.7).
+### `eksconfig`
+
+- Fix ["AddOnAmiSoftLockupIssue454" parsing](https://github.com/aws/aws-k8s-tester/pull/199).
+### Go
+
+- Compile with [*Go 1.16beta1*](https://golang.org/doc/devel/release.html#go1.16).
+
 
 <hr>
 
+
 ## [v1.5.6](https://github.com/aws/aws-k8s-tester/releases/tag/v1.5.6) (2021-01-25)
 
 See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.5.5...v1.5.6).
diff --git a/eksconfig/README.md b/eksconfig/README.md
@@ -266,6 +266,9 @@ AWS_K8S_TESTER_EKS_ADD_ON_CLUSTER_VERSION_UPGRADE_ENABLE=true \
 | AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_NAMESPACE                           | read-only "false" | *eksconfig.AddOnConformance.Namespace                       | string             |
 | AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_PATH                       | read-only "false" | *eksconfig.AddOnConformance.SonobuoyPath                    | string             |
 | AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_DOWNLOAD_URL               | read-only "false" | *eksconfig.AddOnConformance.SonobuoyDownloadURL             | string             |
+| AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_E2E_REPO_CONFIG            | read-only "false" | *eksconfig.AddOnConformance.SonobuoyE2eRepoConfig           | string             |
+| AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_IMAGE                      | read-only "false" | *eksconfig.AddOnConformance.SonobuoyImage                   | string             |
+| AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SYSTEMD_LOGS_IMAGE                  | read-only "false" | *eksconfig.AddOnConformance.SystemdLogsImage                | string             |
 | AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_DELETE_TIMEOUT             | read-only "false" | *eksconfig.AddOnConformance.SonobuoyDeleteTimeout           | time.Duration      |
 | AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_DELETE_TIMEOUT_STRING      | read-only "true"  | *eksconfig.AddOnConformance.SonobuoyDeleteTimeoutString     | string             |
 | AWS_K8S_TESTER_EKS_ADD_ON_CONFORMANCE_SONOBUOY_RUN_TIMEOUT                | read-only "false" | *eksconfig.AddOnConformance.SonobuoyRunTimeout              | time.Duration      |
diff --git a/eksconfig/env.go b/eksconfig/env.go
@@ -563,9 +563,6 @@ func (cfg *Config) UpdateFromEnvs() (err error) {
 	}
 	if av, ok := vv.(*AddOnAmiSoftLockupIssue454); ok {
 		cfg.AddOnAmiSoftLockupIssue454 = av
-		if !cfg.AddOnAmiSoftLockupIssue454.Enable {
-			return fmt.Errorf("WTF %T", cfg)
-		}
 	} else {
 		return fmt.Errorf("expected *AddOnAmiSoftLockupIssue454, got %T", vv)
 	}

Original file line number	Diff line number	Diff line change
`@@ -563,9 +563,6 @@ func (cfg *Config) UpdateFromEnvs() (err error) {`
`563`	`563`	`}`
`564`	`564`	`if av, ok := vv.(*AddOnAmiSoftLockupIssue454); ok {`
`565`	`565`	`cfg.AddOnAmiSoftLockupIssue454 = av`
`566`		`- if !cfg.AddOnAmiSoftLockupIssue454.Enable {`
`567`		`- return fmt.Errorf("WTF %T", cfg)`
`568`		`- }`
`569`	`566`	`} else {`
`570`	`567`	`return fmt.Errorf("expected *AddOnAmiSoftLockupIssue454, got %T", vv)`
`571`	`568`	`}`