Merge pull request #6689 from cscib/BAEL-2460

Bael 2460

spring-cloud/pom.xml

@@ -32,7 +32,6 @@
         <module>spring-cloud-zuul-eureka-integration</module>
         <module>spring-cloud-contract</module>
         <module>spring-cloud-kubernetes</module>
-        <module>spring-cloud-kubernetes-2</module>
         <module>spring-cloud-archaius</module>
         <module>spring-cloud-functions</module>        
         <module>spring-cloud-vault</module>

spring-cloud/spring-cloud-kubernetes-2/pom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.spring.cloud</groupId>
-    <artifactId>spring-cloud-kubernetes-2</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>spring-cloud-kubernetes-2</name>
-    <packaging>pom</packaging>
-    	
-    <modules>
-        <module>client-service</module>
-        <module>travel-agency-service</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <properties>
-        <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
-    </properties>
-
-</project>

spring-cloud/spring-cloud-kubernetes-2/travel-agency-service/travel-agency-config.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: travel-agency-service
-data:
-  application.properties: |-
-    bean.message=Testing reload ! Message from backend is: %s <br/> Services : %s
-

spring-cloud/spring-cloud-kubernetes/client-service/pom.xml

@@ -3,12 +3,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>client-service</artifactId>
-    <name>client-service</name>
+	<name>client-service</name>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes-2</artifactId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

spring-cloud/spring-cloud-kubernetes/deployment-travel-client.sh

@@ -1,9 +1,9 @@
-### build the repository
-mvn clean  install
-
 ### set docker env
 eval $(minikube docker-env)
 
+### build the repository
+#mvn clean  install
+
 ### build the docker images on minikube
 cd travel-agency-service
 docker build -t travel-agency-service .
@@ -12,11 +12,11 @@ docker build -t client-service .
 cd ..
 
 ### secret and mongodb
-kubectl delete -f secret.yaml
+kubectl delete -f travel-agency-service/secret.yaml
-kubectl delete -f mongo-deployment.yaml
+kubectl delete -f travel-agency-service/mongo-deployment.yaml
 
-kubectl create -f secret.yaml
+kubectl create -f travel-agency-service/secret.yaml
-kubectl create -f mongo-deployment.yaml
+kubectl create -f travel-agency-service/mongo-deployment.yaml
 
 ### travel-agency-service
 kubectl delete -f travel-agency-service/travel-agency-deployment.yaml
@@ -31,4 +31,4 @@ kubectl create -f client-service/client-config.yaml
 kubectl create -f client-service/client-service-deployment.yaml
 
 # Check that the pods are running
-kubectl get pods
+kubectl get pods

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

@@ -20,6 +20,8 @@
         <module>demo-backend</module>
         <module>liveness-example</module>
         <module>readiness-example</module>
+        <module>client-service</module>
+        <module>travel-agency-service</module>
     </modules>
 
 </project>

spring-cloud/spring-cloud-kubernetes/travel-agency-service/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes-2</artifactId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>