Merge branch '3.1.x'

This commit is contained in:
Ryan Baxter
2024-12-09 08:36:45 -05:00

View File

@@ -57,19 +57,15 @@ abstract class Fabric8DiscoveryBase {
util = new Util(K3S);
}
protected static KubernetesClient client() {
String kubeConfigYaml = K3S.getKubeConfigYaml();
Config config = Config.fromKubeconfig(kubeConfigYaml);
return new KubernetesClientBuilder().withConfig(config).build();
}
@TestConfiguration
static class TestConfig {
@Bean
@Primary
KubernetesClient kubernetesClient() {
return client();
String kubeConfigYaml = K3S.getKubeConfigYaml();
Config config = Config.fromKubeconfig(kubeConfigYaml);
return new KubernetesClientBuilder().withConfig(config).build();
}
}