From 715300e4b8e6831e358376bc3bdd01d86f05ac29 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Wed, 27 Apr 2016 19:58:18 +0300 Subject: [PATCH] Tests that use the kubernetes mock should be configured to trust certificates. --- readme.md | 8 ++++++-- .../spring/cloud/kubernetes/config/test/CoreTest.groovy | 3 ++- .../spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 648bd286..1f47640e 100644 --- a/readme.md +++ b/readme.md @@ -6,10 +6,13 @@ Spring Cloud integration with Kubernetes ### Features - Auto configuration for the Kubernetes client +- Externalize configuration to ConfigMap - DiscoveryClient implementation for Kubernetes - Health Indicator for Pods -- Automatic activation of the "Kubernetes" profile when running inside Kubernetes. -- Ribbon discovery in Kubernetes. +- Automatic activation of the "Kubernetes" profile when running inside Kubernetes +- Ribbon discovery in Kubernetes +- Zipkin discovery in Kubernetes +- ConfigMap / Archaius Bridge ### Building @@ -29,3 +32,4 @@ The project provides a "starter" module, so you just need to add the following d x.y.z +## Configuring the diff --git a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy b/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy index 8daf8d79..8acd46f5 100644 --- a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy +++ b/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy @@ -33,6 +33,7 @@ import spock.lang.Specification [ "spring.application.name=testapp", "spring.cloud.kubernetes.client.namespace=testns", + "spring.cloud.kubernetes.client.trustCerts=true", "spring.cloud.kubernetes.config.namespace=testns" ]) @EnableConfigurationProperties @@ -79,9 +80,9 @@ class CoreTest extends Specification { expect: config.getMasterUrl().equals(mockClient.getConfiguration().getMasterUrl()); config.getNamespace().equals("testns"); + config.trustCerts } - def "Kubernetes client bean should be present"() { expect: client != null diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy index 145071ed..9216e809 100644 --- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy +++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy @@ -37,6 +37,7 @@ import spock.lang.Specification [ "spring.application.name=testapp", "spring.cloud.kubernetes.client.namespace=testns", + "spring.cloud.kubernetes.client.trustCerts=true", "spring.cloud.kubernetes.config.namespace=testns" ]) @RibbonClient(name = "testapp", configuration = KubernetesRibbonClientConfiguration.class)