Merge branch '2.1.x'

This commit is contained in:
Ryan Baxter
2022-08-16 15:51:44 -04:00
6 changed files with 22 additions and 15 deletions

View File

@@ -50,8 +50,8 @@
|spring.cloud.kubernetes.config.enable-api | `+++true+++` |
|spring.cloud.kubernetes.config.enabled | `+++true+++` | Enable the ConfigMap property source locator.
|spring.cloud.kubernetes.config.fail-fast | `+++false+++` |
|spring.cloud.kubernetes.config.include-profile-specific-sources | `+++true+++` |
|spring.cloud.kubernetes.config.labels | |
|spring.cloud.kubernetes.config.include-profile-specific-sources | `+++true+++` |
|spring.cloud.kubernetes.config.labels | |
|spring.cloud.kubernetes.config.name | |
|spring.cloud.kubernetes.config.namespace | |
|spring.cloud.kubernetes.config.paths | |
@@ -77,7 +77,8 @@
|spring.cloud.kubernetes.discovery.order | |
|spring.cloud.kubernetes.discovery.primary-port-name | | If set then the port with a given name is used as primary when multiple ports are defined for a service.
|spring.cloud.kubernetes.discovery.service-labels | | If set, then only the services matching these labels will be fetched from the Kubernetes API server.
|spring.cloud.kubernetes.discovery.wait-cache-ready | `+++true+++` |
|spring.cloud.kubernetes.discovery.wait-cache-ready | `+++true+++` |
|spring.cloud.kubernetes.enabled | `+++true+++` | Whether to enable Kubernetes integration.
|spring.cloud.kubernetes.leader.auto-startup | `+++true+++` | Should leader election be started automatically on startup. Default: true
|spring.cloud.kubernetes.leader.config-map-name | `+++leaders+++` | Kubernetes ConfigMap where leaders information will be stored. Default: leaders
|spring.cloud.kubernetes.leader.enabled | `+++true+++` | Should leader election be enabled. Default: true
@@ -115,4 +116,4 @@
|spring.cloud.kubernetes.secrets.sources | |
|spring.cloud.kubernetes.secrets.use-name-as-prefix | `+++false+++` |
|===
|===