Skip to content

Commit ed9b424

Browse files
committed
Update SNAPSHOT to 1.1.7.RELEASE
1 parent 22aa32b commit ed9b424

File tree

38 files changed

+85
-40
lines changed

38 files changed

+85
-40
lines changed

README.adoc

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,10 @@ You can specify multiple (exact) file paths in `spring.cloud.kubernetes.config.p
448448

449449
NOTE: You have to provide the full exact path to each property file, because directories are not being recursively parsed.
450450

451+
NOTE: If you use `spring.cloud.kubernetes.config.paths` or `spring.cloud.kubernetes.secrets.path` the automatic reload
452+
functionality will not work. You will need to make a `POST` request to the `/actuator/refresh` endpoint or
453+
restart/redeploy the application.
454+
451455
.Properties:
452456
[options="header,footer"]
453457
|===
@@ -870,10 +874,47 @@ The Kubernetes health indicator (which is part of the core module) exposes the f
870874
* Pod name, IP address, namespace, service account, node name, and its IP address
871875
* A flag that indicates whether the Spring Boot application is internal or external to Kubernetes
872876

877+
== Info Contributor
878+
879+
Spring Cloud Kubernetes includes an `InfoContributor` which adds Pod information to
880+
Spring Boot's `/info` Acturator endpoint.
881+
882+
You can disable this `InfoContributor` by setting `management.info.kubernetes.enabled`
883+
to `false` in `bootstrap.[properties | yaml]`.
884+
873885
== Leader Election
874886

875887
<TBD>
876888

889+
== LoadBalancer for Kubernetes
890+
This project includes Spring Cloud Load Balancer for load balancing based on Kubernetes Endpoints and provides implementation of load balancer based on Kubernetes Service.
891+
To include it to your project add the following dependency.
892+
====
893+
[source,xml]
894+
----
895+
<dependency>
896+
<groupId>org.springframework.cloud</groupId>
897+
<artifactId>spring-cloud-starter-kubernetes-loadbalancer</artifactId>
898+
</dependency>
899+
----
900+
====
901+
902+
To enable load balancing based on Kubernetes Service name use the following property. Then load balancer would try to call application using address, for example `service-a.default.svc.cluster.local`
903+
====
904+
[source]
905+
----
906+
spring.cloud.kubernetes.loadbalancer.mode=SERVICE
907+
----
908+
====
909+
910+
To enabled load balancing across all namespaces use the following property. Property from `spring-cloud-kubernetes-discovery` module is respected.
911+
====
912+
[source]
913+
----
914+
spring.cloud.kubernetes.discovery.all-namespaces=true
915+
----
916+
====
917+
877918
== Security Configurations Inside Kubernetes
878919

879920

docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.cloud</groupId>
1010
<artifactId>spring-cloud-kubernetes</artifactId>
11-
<version>1.1.7.BUILD-SNAPSHOT</version>
11+
<version>1.1.7.RELEASE</version>
1212
</parent>
1313
<packaging>pom</packaging>
1414
<name>Spring Cloud Kubernetes Docs</name>

docs/src/main/asciidoc/_configprops.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
|spring.cloud.kubernetes.discovery.service-labels | | If set, then only the services matching these labels will be fetched from the Kubernetes API server.
6565
|spring.cloud.kubernetes.discovery.service-name | unknown | The service name of the local instance.
6666
|spring.cloud.kubernetes.enabled | true | Whether to enable Kubernetes integration.
67+
|spring.cloud.kubernetes.loadbalancer.cluster-domain | cluster.local | cluster domain.
68+
|spring.cloud.kubernetes.loadbalancer.enabled | true | Load balancer enabled,default true.
69+
|spring.cloud.kubernetes.loadbalancer.mode | | {@link KubernetesLoadBalancerMode} setting load balancer server list with ip of pod or service name. default value is POD.
70+
|spring.cloud.kubernetes.loadbalancer.port-name | http | service port name.
6771
|spring.cloud.kubernetes.reload.enabled | false | Enables the Kubernetes configuration reload on change.
6872
|spring.cloud.kubernetes.reload.max-wait-for-restart | 2s | If Restart or Shutdown strategies are used, Spring Cloud Kubernetes waits a random amount of time before restarting. This is done in order to avoid having all instances of the same application restart at the same time. This property configures the maximum of amount of wait time from the moment the signal is received that a restart is needed until the moment the restart is actually triggered
6973
|spring.cloud.kubernetes.reload.mode | | Sets the detection mode for Kubernetes configuration reload.

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<groupId>org.springframework.cloud</groupId>
3232
<artifactId>spring-cloud-kubernetes</artifactId>
33-
<version>1.1.7.BUILD-SNAPSHOT</version>
33+
<version>1.1.7.RELEASE</version>
3434
<packaging>pom</packaging>
3535
<name>Spring Cloud Kubernetes</name>
3636

@@ -63,9 +63,9 @@
6363

6464
<properties>
6565
<!-- Dependency Versions -->
66-
<spring-cloud-commons.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-commons.version>
67-
<spring-cloud-netflix.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-netflix.version>
68-
<spring-cloud-config.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-config.version>
66+
<spring-cloud-commons.version>2.2.6.RELEASE</spring-cloud-commons.version>
67+
<spring-cloud-netflix.version>2.2.6.RELEASE</spring-cloud-netflix.version>
68+
<spring-cloud-config.version>2.2.6.RELEASE</spring-cloud-config.version>
6969

7070
<!-- Maven Plugin Versions -->
7171
<maven-compiler-plugin.version>3.5</maven-compiler-plugin.version>

spring-cloud-kubernetes-config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.cloud</groupId>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-kubernetes-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<parent>
2424
<artifactId>spring-cloud-dependencies-parent</artifactId>
2525
<groupId>org.springframework.cloud</groupId>
26-
<version>2.3.2.BUILD-SNAPSHOT</version>
26+
<version>2.3.1.RELEASE</version>
2727
<relativePath/>
2828
</parent>
2929
<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
30-
<version>1.1.7.BUILD-SNAPSHOT</version>
30+
<version>1.1.7.RELEASE</version>
3131
<packaging>pom</packaging>
3232
<name>Spring Cloud Kubernetes :: Dependencies</name>
3333
<description>Spring Cloud Kubernetes Dependencies</description>

spring-cloud-kubernetes-discovery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.cloud</groupId>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.springframework.cloud</groupId>
2525
<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
26-
<version>1.1.7.BUILD-SNAPSHOT</version>
26+
<version>1.1.7.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>greeting-service</artifactId>

spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.springframework.cloud</groupId>
2525
<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
26-
<version>1.1.7.BUILD-SNAPSHOT</version>
26+
<version>1.1.7.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>name-service</artifactId>

spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>spring-cloud-kubernetes-examples</artifactId>
2525
<groupId>org.springframework.cloud</groupId>
26-
<version>1.1.7.BUILD-SNAPSHOT</version>
26+
<version>1.1.7.RELEASE</version>
2727
</parent>
2828

2929
<groupId>org.springframework.cloud</groupId>

spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-examples</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-kubernetes-examples</artifactId>
9-
<version>1.1.7.BUILD-SNAPSHOT</version>
9+
<version>1.1.7.RELEASE</version>
1010
</parent>
1111

1212
<artifactId>kubernetes-leader-election-example</artifactId>

spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>kubernetes-loadbalancer-example</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>kubernetes-loadbalancer-example</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-examples</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>kubernetes-loadbalancer-example</artifactId>

spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes-examples</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes-examples</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-kubernetes-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
2525
<groupId>org.springframework.cloud</groupId>
26-
<version>1.1.7.BUILD-SNAPSHOT</version>
26+
<version>1.1.7.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>spring-cloud-kubernetes-examples</artifactId>

spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<artifactId>discovery-client</artifactId>

spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<artifactId>discovery-service-a</artifactId>

spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<artifactId>discovery-service-b</artifactId>

spring-cloud-kubernetes-integration-tests/discovery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent</name>

spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<artifactId>tests</artifactId>

spring-cloud-kubernetes-integration-tests/istio/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Istio</name>

spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-kubernetes</artifactId>
9-
<version>1.1.7.BUILD-SNAPSHOT</version>
9+
<version>1.1.7.RELEASE</version>
1010
</parent>
1111

1212
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>

spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap</name>

spring-cloud-kubernetes-integration-tests/simple-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>1.1.7.BUILD-SNAPSHOT</version>
10+
<version>1.1.7.RELEASE</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Core</name>

spring-cloud-kubernetes-istio/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-leader/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.cloud</groupId>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727

2828
<artifactId>spring-cloud-kubernetes-leader</artifactId>

spring-cloud-kubernetes-loadbalancer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes</artifactId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-ribbon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-starter-kubernetes-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-starter-kubernetes-config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>1.1.7.BUILD-SNAPSHOT</version>
25+
<version>1.1.7.RELEASE</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-starter-kubernetes-loadbalancer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>1.1.7.BUILD-SNAPSHOT</version>
8+
<version>1.1.7.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)