diff --git a/README.adoc b/README.adoc index 8abb64ff..608b4b90 100644 --- a/README.adoc +++ b/README.adoc @@ -272,9 +272,6 @@ spring: In the preceding example, if `spring.cloud.kubernetes.config.namespace` had not been set, the `ConfigMap` named `c1` would be looked up in the namespace that the application runs. -See <> to get a better understanding of how the namespace -of the application is resolved. - Any matching `ConfigMap` that is found is processed as follows: @@ -497,179 +494,6 @@ spec: ---- ==== -You could run into a situation where there are multiple configs maps that have the same property names. For example: - -==== -[source,yaml] ----- -kind: ConfigMap -apiVersion: v1 -metadata: - name: config-map-one -data: - application.yml: |- - greeting: - message: Say Hello from one ----- -==== - -and - -==== -[source,yaml] ----- -kind: ConfigMap -apiVersion: v1 -metadata: - name: config-map-two -data: - application.yml: |- - greeting: - message: Say Hello from two ----- -==== - -Depending on the order in which you place these in `bootstrap.yaml|properties`, you might end up with an un-expected result (the last config map wins). For example: - -==== -[source,yaml] ----- -spring: - application: - name: cloud-k8s-app - cloud: - kubernetes: - config: - namespace: default-namespace - sources: - - name: config-map-two - - name: config-map-one ----- -==== - -will result in property `greetings.message` being `Say Hello from one`. - -There is a way to change this default configuration by specifying `useNameAsPrefix`. For example: - -==== -[source,yaml] ----- -spring: - application: - name: with-prefix - cloud: - kubernetes: - config: - useNameAsPrefix: true - namespace: default-namespace - sources: - - name: config-map-one - useNameAsPrefix: false - - name: config-map-two ----- -==== - -Such a configuration will result in two properties being generated: - - - `greetings.message` equal to `Say Hello from one`. - - - `config-map-two.greetings.message` equal to `Say Hello from two` - -Notice that `spring.cloud.kubernetes.config.useNameAsPrefix` has a _lower_ priority than `spring.cloud.kubernetes.config.sources.useNameAsPrefix`. -This allows you to set a "default" strategy for all sources, at the same time allowing to override only a few. - -If using the config map name is not an option, you can specify a different strategy, called : `explicitPrefix`. Since this is an _explicit_ prefix that -you select, it can only be supplied to the `sources` level. At the same time it has a higher priority than `useNameAsPrefix`. Let's suppose we have a third config map with these entries: - - -==== -[source,yaml] ----- -kind: ConfigMap -apiVersion: v1 -metadata: - name: config-map-three -data: - application.yml: |- - greeting: - message: Say Hello from three ----- -==== - -A configuration like the one below: - -==== -[source,yaml] ----- -spring: - application: - name: with-prefix - cloud: - kubernetes: - config: - useNameAsPrefix: true - namespace: default-namespace - sources: - - name: config-map-one - useNameAsPrefix: false - - name: config-map-two - explicitPrefix: two - - name: config-map-three ----- -==== - -will result in three properties being generated: - - - `greetings.message` equal to `Say Hello from one`. - - - `two.greetings.message` equal to `Say Hello from two`. - - - `config-map-three.greetings.message` equal to `Say Hello from three`. - -By default, besides reading the config map that is specified in the `sources` configuration, Spring will also try to read -all properties from "profile aware" sources. The easiest way to explain this is via an example. Let's suppose your application -enables a profile called "dev" and you have a configuration like the one below: - -==== -[source,yaml] ----- -spring: - application: - name: spring-k8s - cloud: - kubernetes: - config: - namespace: default-namespace - sources: - - name: config-map-one ----- -==== - -Besides reading the `config-map-one`, Spring will also try to read `config-map-one-dev`; in this particular order. Each active profile -generates such a profile aware config map. - -Though your application should not be impacted by such a config map, it can be disabled if needed: - -==== -[source,yaml] ----- -spring: - application: - name: spring-k8s - cloud: - kubernetes: - config: - includeProfileSpecificSources: false - namespace: default-namespace - sources: - - name: config-map-one - includeProfileSpecificSources: false ----- -==== - -Notice that just like before, there are two levels where you can specify this property: for all config maps or -for individual ones; the latter having a higher priority. - NOTE: You should check the security configuration section. To access config maps from inside a pod you need to have the correct Kubernetes service accounts, roles and role bindings. @@ -835,7 +659,7 @@ spring: sources: # Spring Cloud Kubernetes looks up a Secret named s1 in namespace default-namespace - name: s1 - # Spring Cloud Kubernetes looks up a Secret named default-name in namespace n2 + # Spring Cloud Kubernetes looks up a Secret named default-name in whatever namespace n2 - namespace: n2 # Spring Cloud Kubernetes looks up a Secret named s3 in namespace n3 - namespace: n3 @@ -845,8 +669,6 @@ spring: In the preceding example, if `spring.cloud.kubernetes.secrets.namespace` had not been set, the `Secret` named `s1` would be looked up in the namespace that the application runs. -See <> to get a better understanding of how the namespace -of the application is resolved. .Properties: @@ -872,45 +694,6 @@ https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-Configuration-Bi You can find an example of an application that uses secrets (though it has not been updated to use the new `spring-cloud-kubernetes` project) at https://github.com/fabric8-quickstarts/spring-boot-camel-config[spring-boot-camel-config] -[[namespace-resolution]] -=== Namespace resolution -Finding an application namespace happens on a best-effort basis. There are some steps that we iterate in order -to find it. The easiest and most common one, is to specify it in the proper configuration, for example: - -==== -[source,yaml] ----- -spring: - application: - name: app - cloud: - kubernetes: - secrets: - name: secret - namespace: default - sources: - # Spring Cloud Kubernetes looks up a Secret named 'a' in namespace 'default' - - name: a - # Spring Cloud Kubernetes looks up a Secret named 'secret' in namespace 'b' - - namespace: b - # Spring Cloud Kubernetes looks up a Secret named 'd' in namespace 'c' - - namespace: c - name: d ----- -==== - -Remember that the same can be done for config maps. If such a namespace is not specified, it will be read (in this order): - -1. from property `spring.cloud.kubernetes.client.namespace` -2. from a String residing in a file denoted by `spring.cloud.kubernetes.client.serviceAccountNamespacePath` property -3. from a String residing in `/var/run/secrets/kubernetes.io/serviceaccount/namespace` file -(kubernetes default namespace path) -4. from a designated client method call (for example fabric8's : `KubernetesClient::getNamespace`), if the client provides -such a method. This, in turn, could be configured via environment properties. For example fabric8 client can be configured via -"KUBERNETES_NAMESPACE" property; consult the client documentation for exact details. - -Failure to find a namespace from the above steps will result in an Exception being raised. - === `PropertySource` Reload WARNING: This functionality has been deprecated in the 2020.0 release. Please see @@ -1073,16 +856,13 @@ The Kubernetes health indicator (which is part of the core module) exposes the f * Pod name, IP address, namespace, service account, node name, and its IP address * A flag that indicates whether the Spring Boot application is internal or external to Kubernetes -You can disable this `HealthContributor` by setting `management.health.kubernetes.enabled` -to `false` in `application.[properties | yaml]`. - == Info Contributor Spring Cloud Kubernetes includes an `InfoContributor` which adds Pod information to Spring Boot's `/info` Acturator endpoint. You can disable this `InfoContributor` by setting `management.info.kubernetes.enabled` -to `false` in `application.[properties | yaml]`. +to `false` in `bootstrap.[properties | yaml]`. == Leader Election The Spring Cloud Kubernetes leader election mechanism implements the leader election API of Spring Integration using a Kubernetes ConfigMap. @@ -1496,9 +1276,23 @@ the `.mvn` configuration, so if you find you have to do it to make a build succeed, please raise a ticket to get the settings added to source control. -The projects that require middleware (i.e. Redis) for testing generally -require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running. +For hints on how to build the project look in `.travis.yml` if there +is one. There should be a "script" and maybe "install" command. Also +look at the "services" section to see if any services need to be +running locally (e.g. mongo or rabbit). Ignore the git-related bits +that you might find in "before_install" since they're related to setting git +credentials and you already have those. +The projects that require middleware generally include a +`docker-compose.yml`, so consider using +https://docs.docker.com/compose/[Docker Compose] to run the middeware servers +in Docker containers. See the README in the +https://github.com/spring-cloud-samples/scripts[scripts demo +repository] for specific instructions about the common cases of mongo, +rabbit and redis. + +NOTE: If all else fails, build with the command from `.travis.yml` (usually +`./mvnw install`). === Documentation @@ -1731,54 +1525,3 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. - -=== Duplicate Finder - -Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath. - -==== Duplicate Finder configuration - -Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. - -.pom.xml -[source,xml] ----- - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - ----- - -For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation]. - -You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build. - -If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project: - -[source,xml] ----- - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - org.joda.time.base.BaseDateTime - .*module-info - - - changelog.txt - - - - - - - ----- - diff --git a/docs/pom.xml b/docs/pom.xml index 12f9259e..60dd9c4c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT jar Spring Cloud Kubernetes Docs diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index a1ce0b13..924fd661 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -41,7 +41,6 @@ |spring.cloud.kubernetes.client.service-account-namespace-path | `/var/run/secrets/kubernetes.io/serviceaccount/namespace` | |spring.cloud.kubernetes.client.trust-certs | | |spring.cloud.kubernetes.client.trustCerts | `false` | Kubernetes API Trust Certificates -|spring.cloud.kubernetes.client.user-agent | `Spring-Cloud-Kubernetes-Application` | |spring.cloud.kubernetes.client.username | | Kubernetes API Username |spring.cloud.kubernetes.client.watch-reconnect-interval | | |spring.cloud.kubernetes.client.watch-reconnect-limit | | @@ -49,12 +48,10 @@ |spring.cloud.kubernetes.client.watchReconnectLimit | `-1` | Reconnect Interval limit retries |spring.cloud.kubernetes.config.enable-api | `true` | |spring.cloud.kubernetes.config.enabled | `true` | Enable the ConfigMap property source locator. -|spring.cloud.kubernetes.config.include-profile-specific-sources | `true` | |spring.cloud.kubernetes.config.name | | |spring.cloud.kubernetes.config.namespace | | |spring.cloud.kubernetes.config.paths | | |spring.cloud.kubernetes.config.sources | | -|spring.cloud.kubernetes.config.use-name-as-prefix | `false` | |spring.cloud.kubernetes.discovery.all-namespaces | `false` | If discovering all namespaces. |spring.cloud.kubernetes.discovery.cache-loading-timeout-seconds | `60` | Timeout for initializing discovery cache, will abort the application if exceeded. |spring.cloud.kubernetes.discovery.enabled | `true` | If Kubernetes Discovery is enabled. @@ -94,12 +91,11 @@ |spring.cloud.kubernetes.reload.strategy | | Sets the reload strategy for Kubernetes configuration reload on change. |spring.cloud.kubernetes.secrets.enable-api | `false` | |spring.cloud.kubernetes.secrets.enabled | `true` | Enable the Secrets property source locator. -|spring.cloud.kubernetes.secrets.include-profile-specific-sources | `true` | |spring.cloud.kubernetes.secrets.labels | | |spring.cloud.kubernetes.secrets.name | | |spring.cloud.kubernetes.secrets.namespace | | |spring.cloud.kubernetes.secrets.paths | | -|spring.cloud.kubernetes.secrets.sources | | -|spring.cloud.kubernetes.secrets.use-name-as-prefix | `false` | +|spring.cloud.kubernetes.secrets.sources | | +|spring.cloud.kubernetes.userAgent | `Spring-Cloud-Kubernetes-Application` | `User-Agent` header -|=== \ No newline at end of file +|=== diff --git a/pom.xml b/pom.xml index 98cfa4ab..04864a7d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ org.springframework.cloud spring-cloud-build - 3.0.5 + 3.0.4 spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT pom Spring Cloud Kubernetes @@ -62,10 +62,10 @@ - 3.0.5 - 3.0.6 + 3.0.4 + 3.0.5 3.0.3 - 3.0.5 + 3.0.4 3.5 diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml index eec9a21b..4579cdbc 100644 --- a/spring-cloud-kubernetes-client-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml index 7a328d8a..295033fc 100644 --- a/spring-cloud-kubernetes-client-config/pom.xml +++ b/spring-cloud-kubernetes-client-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml index b0dd9cc9..8539cba5 100644 --- a/spring-cloud-kubernetes-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-client-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml index 8afaba3e..8058e499 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml index 3e4182c1..e42958fb 100644 --- a/spring-cloud-kubernetes-commons/pom.xml +++ b/spring-cloud-kubernetes-commons/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml index 64fe6597..9f3ad7e3 100644 --- a/spring-cloud-kubernetes-controllers/pom.xml +++ b/spring-cloud-kubernetes-controllers/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 pom diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml index f80ac71f..940adb0a 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-controllers org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 4f1e5676..c8130c78 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -23,11 +23,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.5 + 3.0.5-SNAPSHOT spring-cloud-kubernetes-dependencies - 2.0.5 + 2.0.5-SNAPSHOT pom Spring Cloud Kubernetes :: Dependencies Spring Cloud Kubernetes Dependencies diff --git a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml index 8ccdfbb1..e9c67fea 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-examples org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index e0d8a6dc..0e22fd0a 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes-examples - 2.0.5 + 2.0.5-SNAPSHOT kubernetes-leader-election-example diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml index 3360b8a6..20ccdcea 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml @@ -5,7 +5,7 @@ kubernetes-loadbalancer-example org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml index e59b3c32..18fd5740 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml @@ -5,7 +5,7 @@ kubernetes-loadbalancer-example org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml index 3ad36ee7..30ee165b 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-examples org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 kubernetes-loadbalancer-example diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml index 54a1ab8c..195b92ac 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml @@ -22,7 +22,7 @@ spring-cloud-kubernetes-examples org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml index 8687d17b..1c9b6760 100644 --- a/spring-cloud-kubernetes-examples/pom.xml +++ b/spring-cloud-kubernetes-examples/pom.xml @@ -23,7 +23,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT spring-cloud-kubernetes-examples diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml index cb67aeac..d1811ab3 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml index 410fdae9..f43c5841 100644 --- a/spring-cloud-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-kubernetes-fabric8-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml index 1ddd17db..44adfaa7 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml +++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml index 41a7174f..5e9436d9 100644 --- a/spring-cloud-kubernetes-fabric8-istio/pom.xml +++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml index f78ed8a8..3d0f0e56 100644 --- a/spring-cloud-kubernetes-fabric8-leader/pom.xml +++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT spring-cloud-kubernetes-fabric8-leader diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml index 8b9f4262..346deae1 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml index c8b684ab..30f3de53 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud discovery-parent - 2.0.5 + 2.0.5-SNAPSHOT discovery-client diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml index 5c78f0c7..eddd4c3f 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud discovery-parent - 2.0.5 + 2.0.5-SNAPSHOT discovery-service-a diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml index 627d3b94..b5803f11 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud discovery-parent - 2.0.5 + 2.0.5-SNAPSHOT discovery-service-b diff --git a/spring-cloud-kubernetes-integration-tests/discovery/kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/kubernetes-client-discovery/pom.xml index e0b649f0..0df02731 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/kubernetes-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/discovery/kubernetes-client-discovery/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud discovery-parent - 2.0.5 + 2.0.5-SNAPSHOT kubernetes-client-discovery diff --git a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml index 41174a42..5688147e 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent diff --git a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml index 9e6db540..dae9ddec 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud discovery-parent - 2.0.5 + 2.0.5-SNAPSHOT tests diff --git a/spring-cloud-kubernetes-integration-tests/istio/pom.xml b/spring-cloud-kubernetes-integration-tests/istio/pom.xml index 46a3e491..744aa89d 100644 --- a/spring-cloud-kubernetes-integration-tests/istio/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/istio/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT Spring Cloud Kubernetes :: Integration Tests :: Istio diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml b/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml index b6bc4d14..71fa7865 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 0b9c1987..c60b97f2 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT spring-cloud-kubernetes-integration-tests diff --git a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml index 084426c1..1d93a33d 100644 --- a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap diff --git a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml index 4ca65c31..de43c39e 100644 --- a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT Spring Cloud Kubernetes :: Integration Tests :: Simple Core diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml index 4496f909..8b67034d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml index 004bd2d5..2a92ccd4 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java index e7d01d9f..942b87a1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java @@ -211,7 +211,8 @@ public class LoadBalancerIT { } private V1Ingress getWiremockIngress() throws Exception { - V1Ingress ingress = (V1Ingress) k8SUtils.readYamlFromClasspath("wiremock-ingress.yaml"); + V1Ingress ingress = (V1Ingress) k8SUtils + .readYamlFromClasspath("wiremock-ingress.yaml"); return ingress; } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/pom.xml index f381b218..db8417bc 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java index 34134e69..3cce10a1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java @@ -213,7 +213,8 @@ public class ReactiveDiscoveryClientIT { } private V1Ingress getWiremockIngress() throws Exception { - V1Ingress ingress = (V1Ingress) k8SUtils.readYamlFromClasspath("wiremock-ingress.yaml"); + V1Ingress ingress = (V1Ingress) k8SUtils + .readYamlFromClasspath("wiremock-ingress.yaml"); return ingress; } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml index 4f25418a..b0acad52 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index c5a1ee89..9b5a0205 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -177,7 +177,8 @@ public class ActuatorRefreshIT { } private V1Ingress getWiremockIngress() throws Exception { - V1Ingress ingress = (V1Ingress) k8SUtils.readYamlFromClasspath("wiremock-ingress.yaml"); + V1Ingress ingress = (V1Ingress) k8SUtils + .readYamlFromClasspath("wiremock-ingress.yaml"); return ingress; } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml index 61c8b436..08943c9c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index dab9ee2b..f2816972 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml index adce697f..dbae564e 100644 --- a/spring-cloud-starter-kubernetes-client-all/pom.xml +++ b/spring-cloud-starter-kubernetes-client-all/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml index 7ef67847..1137e243 100644 --- a/spring-cloud-starter-kubernetes-client-config/pom.xml +++ b/spring-cloud-starter-kubernetes-client-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml index 146aa1ac..7cfde476 100644 --- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml index 6e93086f..f55a2a89 100644 --- a/spring-cloud-starter-kubernetes-client/pom.xml +++ b/spring-cloud-starter-kubernetes-client/pom.xml @@ -21,7 +21,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml index 1441d725..67509242 100644 --- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml @@ -22,7 +22,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml index 9a99b9b8..2ce8be39 100644 --- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml @@ -22,7 +22,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml index 6700acc0..d0c7dbe6 100644 --- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml index 0d57c848..e45ad3e1 100644 --- a/spring-cloud-starter-kubernetes-fabric8/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml @@ -22,7 +22,7 @@ spring-cloud-kubernetes org.springframework.cloud - 2.0.5 + 2.0.5-SNAPSHOT 4.0.0