|
1 | 1 | /* |
2 | | - * Copyright 2013-2023 the original author or authors. |
| 2 | + * Copyright 2013-2025 the original author or authors. |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
@@ -38,24 +38,12 @@ public static boolean hasConfigServerInstanceProvider() { |
38 | 38 | return !ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null); |
39 | 39 | } |
40 | 40 |
|
41 | | - public static KubernetesDiscoveryProperties createKubernetesDiscoveryProperties(Binder binder, |
42 | | - BindHandler bindHandler) { |
43 | | - return binder |
44 | | - .bind(KubernetesDiscoveryProperties.PREFIX, Bindable.of(KubernetesDiscoveryProperties.class), bindHandler) |
45 | | - .orElseGet(() -> KubernetesDiscoveryProperties.DEFAULT); |
46 | | - } |
47 | | - |
48 | 41 | public static KubernetesDiscoveryProperties createKubernetesDiscoveryProperties(BootstrapContext bootstrapContext) { |
49 | 42 | PropertyResolver propertyResolver = getPropertyResolver(bootstrapContext); |
50 | 43 | return propertyResolver.resolveConfigurationProperties(KubernetesDiscoveryProperties.PREFIX, |
51 | 44 | KubernetesDiscoveryProperties.class, () -> KubernetesDiscoveryProperties.DEFAULT); |
52 | 45 | } |
53 | 46 |
|
54 | | - public static KubernetesClientProperties createKubernetesClientProperties(Binder binder, BindHandler bindHandler) { |
55 | | - return binder.bindOrCreate(KubernetesClientProperties.PREFIX, Bindable.of(KubernetesClientProperties.class)) |
56 | | - .withNamespace(new KubernetesNamespaceProvider(binder, bindHandler).getNamespace()); |
57 | | - } |
58 | | - |
59 | 47 | public static KubernetesClientProperties createKubernetesClientProperties(BootstrapContext bootstrapContext) { |
60 | 48 | PropertyResolver propertyResolver = getPropertyResolver(bootstrapContext); |
61 | 49 | return getPropertyResolver(bootstrapContext) |
|
0 commit comments