Skip to content

Commit

Permalink
feat(config): support for multiple files listed in the KUBECONFIG env…
Browse files Browse the repository at this point in the history
… var (6295)

use kubeconfigs listed in KUBECONFIG env var (#6240)
* update token in file listed in KUBECONFIG env var (#6240)
* only parse configs once (#6240)
* update file with auth info when merging authinfos
* parametrized KubeConfigUtilsTest for #hasAuthInfoNamed
* expose Config#getFileWithCurrentContext & #getFileWithContext to consumers

Signed-off-by: Andre Dietisheim <adietish@redhat.com>
---
review(config): support for multiple files listed in the KUBECONFIG env var

Signed-off-by: Marc Nuri <marc@marcnuri.com>

Co-authored-by: Marc Nuri <marc@marcnuri.com>
  • Loading branch information
adietish and manusa authored Nov 8, 2024
1 parent d569bf2 commit 0a8d711
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* Fix #6281: use GitHub binary repo for Kube API Tests
* Fix #6282: Allow annotated types with Pattern, Min, and Max with Lists and Maps and CRD generation
* Fix #5480: Move `io.fabric8:zjsonpatch` to KubernetesClient project
* Fix #6240: Support for multiple files listed in the KUBECONFIG env var

#### Dependency Upgrade
* Fix #2632: Bumped OkHttp from 3.12.12 to 4.12.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public static String coalesce(String... items) {
* Utility method to generate UUIDs.
* This is taken from Spring Framework's <a href=
* "https://github.com/spring-projects/spring-framework/blob/a4db0e7448287028d228d46fe7b4df202150958a/spring-core/src/main/java/org/springframework/util/SimpleIdGenerator.java#L35">SimpleIdGenerator</a>
*
*
* @return generated UUID
*/
public static UUID generateId() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class ConfigTest {
.filePath(ConfigTest.class.getResource("/test-kubeconfig-exec-args-with-spaces"));

private static final String TEST_KUBECONFIG_NO_CURRENT_CONTEXT_FILE = Utils
.filePath(ConfigTest.class.getResource("/test-kubeconfig-nocurrentctxt.yml"));
.filePath(ConfigTest.class.getResource("/test-kubeconfig-nocurrentctxt"));

private static final String TEST_KUBECONFIG_EXEC_FILE_CERT_AUTH = Utils
.filePath(ConfigTest.class.getResource("/test-kubeconfig-exec-cert-auth"));
Expand Down

0 comments on commit 0a8d711

Please sign in to comment.