diff --git a/.editorconfig b/.editorconfig index b16bc11..b478879 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,7 +11,7 @@ trim_trailing_whitespace = true tab_width = 2 indent_size = 2 -[*.java] +[{*.java,*.js}] indent_size = 4 ij_continuation_indent_size = 4 diff --git a/src/main/java/tk/antoine/roux/infrastructure/BackofficeProperties.java b/src/main/java/tk/antoine/roux/infrastructure/BackofficeProperties.java index 346f272..2daef7a 100644 --- a/src/main/java/tk/antoine/roux/infrastructure/BackofficeProperties.java +++ b/src/main/java/tk/antoine/roux/infrastructure/BackofficeProperties.java @@ -8,6 +8,6 @@ public record BackofficeProperties(String apiPrefix, Kubernetes kubernetes) { public record Kubernetes(Api api) { } - public record Api(String kubeconfig) { + public record Api(String kubeconfig, String context) { } } diff --git a/src/main/java/tk/antoine/roux/infrastructure/out/KubernetesClientConfiguration.java b/src/main/java/tk/antoine/roux/infrastructure/out/KubernetesClientConfiguration.java index 7b189af..4ff0af6 100644 --- a/src/main/java/tk/antoine/roux/infrastructure/out/KubernetesClientConfiguration.java +++ b/src/main/java/tk/antoine/roux/infrastructure/out/KubernetesClientConfiguration.java @@ -30,6 +30,7 @@ public class KubernetesClientConfiguration { @Profile("dev") public ApiClient devClient(BackofficeProperties backofficeProperties) throws IOException { String kubeConfigPath = backofficeProperties.kubernetes().api().kubeconfig(); + String context = backofficeProperties.kubernetes().api().context(); File kubeConfigFile = new File(kubeConfigPath); try (BufferedReader kubeConfigReader = new BufferedReader( @@ -38,6 +39,7 @@ public class KubernetesClientConfiguration { KubeConfig kubeConfig = KubeConfig.loadKubeConfig(kubeConfigReader); kubeConfig.setFile(kubeConfigFile); + kubeConfig.setContext(context); return ClientBuilder.kubeconfig(kubeConfig).setPingInterval(Duration.ofSeconds(2)).build(); }