Fix storage of separate kubeconfig file (--self-contained) for EKS workload clusters (#1211)

AndiDog · web-flow · commit f1ef15944b21 · 2023-12-06T09:19:47.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 - Add support for device authentication flow in the `login` command and a new `--device-auth` flag to activate it.
 
+### Fixed
+
+- Fix storage of separate kubeconfig file (`--self-contained`) for EKS workload clusters
+
 ## [2.47.1] - 2023-11-15
 
 ### Changed
diff --git a/cmd/login/wc.go b/cmd/login/wc.go
@@ -349,7 +349,7 @@ func (r *runner) storeWCClientCertCredentials(c clientCertCredentialConfig) (str
 
 func (r *runner) storeAWSIAMCredentials(c eksClusterConfig) (string, bool, error) {
 	k8sConfigAccess := r.commonConfig.GetConfigAccess()
-	if r.loginOptions.selfContained && c.filePath != "" {
+	if r.loginOptions.selfContainedWC && c.filePath != "" {
 		return printWCAWSIamCredentials(k8sConfigAccess, r.fs, c, r.loginOptions.contextOverride)
 	}
 	return storeWCAWSIAMKubeconfig(k8sConfigAccess, c, r.loginOptions.contextOverride)

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ func (r *runner) storeWCClientCertCredentials(c clientCertCredentialConfig) (str`
`349`	`349`
`350`	`350`	`func (r *runner) storeAWSIAMCredentials(c eksClusterConfig) (string, bool, error) {`
`351`	`351`	`k8sConfigAccess := r.commonConfig.GetConfigAccess()`
`352`		`- if r.loginOptions.selfContained && c.filePath != "" {`
	`352`	`+ if r.loginOptions.selfContainedWC && c.filePath != "" {`
`353`	`353`	`return printWCAWSIamCredentials(k8sConfigAccess, r.fs, c, r.loginOptions.contextOverride)`
`354`	`354`	`}`
`355`	`355`	`return storeWCAWSIAMKubeconfig(k8sConfigAccess, c, r.loginOptions.contextOverride)`