[BAEL-16670] - Re-organize spring-cloud-kubernetes Project

earasoft · Dec 9, 2019 · 346a12f · 346a12f
1 parent 5be2e91
commit 346a12f
Show file tree

Hide file tree

Showing 61 changed files with 14 additions and 10 deletions.
diff --git a/spring-cloud/spring-cloud-kubernetes/README.md b/spring-cloud/spring-cloud-kubernetes/README.md
@@ -1,9 +1,9 @@
 ## Spring Cloud Kubernetes
 
-This moudle contains articles about Spring Cloud Kubernetes
+This module contains articles about Spring Cloud Kubernetes.
 
 ### Relevant Articles:
 
-- [Running Spring Boot Applications With Minikube](https://www.baeldung.com/spring-boot-minikube)
+- [Running Spring Boot Applications with Minikube](https://www.baeldung.com/spring-boot-minikube)
 - [Self-Healing Applications with Kubernetes and Spring Boot](https://www.baeldung.com/spring-boot-kubernetes-self-healing-apps)
 - [Guide to Spring Cloud Kubernetes](https://www.baeldung.com/spring-cloud-kubernetes)
diff --git a/...loud-kubernetes/client-service/.gitignore → ...ubernetes-guide/client-service/.gitignore b/...loud-kubernetes/client-service/.gitignore → ...ubernetes-guide/client-service/.gitignore
diff --git a/...loud-kubernetes/client-service/Dockerfile → ...ubernetes-guide/client-service/Dockerfile b/...loud-kubernetes/client-service/Dockerfile → ...ubernetes-guide/client-service/Dockerfile
diff --git a/...ernetes/client-service/client-config.yaml → ...s-guide/client-service/client-config.yaml b/...ernetes/client-service/client-config.yaml → ...s-guide/client-service/client-config.yaml
diff --git a/...nt-service/client-service-deployment.yaml → ...nt-service/client-service-deployment.yaml b/...nt-service/client-service-deployment.yaml → ...nt-service/client-service-deployment.yaml
diff --git a/...g-cloud-kubernetes/client-service/pom.xml → ...s/kubernetes-guide/client-service/pom.xml b/...g-cloud-kubernetes/client-service/pom.xml → ...s/kubernetes-guide/client-service/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-kubernetes</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencyManagement>

diff --git a/.../cloud/kubernetes/client/Application.java → .../cloud/kubernetes/client/Application.java b/.../cloud/kubernetes/client/Application.java → .../cloud/kubernetes/client/Application.java
diff --git a/...cloud/kubernetes/client/ClientConfig.java → ...cloud/kubernetes/client/ClientConfig.java b/...cloud/kubernetes/client/ClientConfig.java → ...cloud/kubernetes/client/ClientConfig.java
diff --git a/...d/kubernetes/client/ClientController.java → ...d/kubernetes/client/ClientController.java b/...d/kubernetes/client/ClientController.java → ...d/kubernetes/client/ClientController.java
diff --git a/...ubernetes/client/RibbonConfiguration.java → ...ubernetes/client/RibbonConfiguration.java b/...ubernetes/client/RibbonConfiguration.java → ...ubernetes/client/RibbonConfiguration.java
diff --git a/...ubernetes/client/TravelAgencyService.java → ...ubernetes/client/TravelAgencyService.java b/...ubernetes/client/TravelAgencyService.java → ...ubernetes/client/TravelAgencyService.java
diff --git a/...rvice/src/main/resources/application.yaml → ...rvice/src/main/resources/application.yaml b/...rvice/src/main/resources/application.yaml → ...rvice/src/main/resources/application.yaml
diff --git a/...nt-service/src/main/resources/logback.xml → ...nt-service/src/main/resources/logback.xml b/...nt-service/src/main/resources/logback.xml → ...nt-service/src/main/resources/logback.xml
diff --git a/.../java/org/baeldung/SpringContextTest.java → .../java/org/baeldung/SpringContextTest.java b/.../java/org/baeldung/SpringContextTest.java → .../java/org/baeldung/SpringContextTest.java
diff --git a/...ud-kubernetes/deployment-travel-client.sh → ...ernetes-guide/deployment-travel-client.sh b/...ud-kubernetes/deployment-travel-client.sh → ...ernetes-guide/deployment-travel-client.sh
diff --git a/...bernetes/travel-agency-service/Dockerfile → ...es-guide/travel-agency-service/Dockerfile b/...bernetes/travel-agency-service/Dockerfile → ...es-guide/travel-agency-service/Dockerfile
diff --git a/...avel-agency-service/mongo-deployment.yaml → ...avel-agency-service/mongo-deployment.yaml b/...avel-agency-service/mongo-deployment.yaml → ...avel-agency-service/mongo-deployment.yaml
diff --git a/...-kubernetes/travel-agency-service/pom.xml → ...netes-guide/travel-agency-service/pom.xml b/...-kubernetes/travel-agency-service/pom.xml → ...netes-guide/travel-agency-service/pom.xml
@@ -9,6 +9,7 @@
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-kubernetes</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencyManagement>

diff --git a/...ernetes/travel-agency-service/secret.yaml → ...s-guide/travel-agency-service/secret.yaml b/...ernetes/travel-agency-service/secret.yaml → ...s-guide/travel-agency-service/secret.yaml
diff --git a/.../kubernetes/travelagency/Application.java → .../kubernetes/travelagency/Application.java b/.../kubernetes/travelagency/Application.java → .../kubernetes/travelagency/Application.java
diff --git a/...cy/controller/TravelAgencyController.java → ...cy/controller/TravelAgencyController.java b/...cy/controller/TravelAgencyController.java → ...cy/controller/TravelAgencyController.java
diff --git a/...rnetes/travelagency/model/TravelDeal.java → ...rnetes/travelagency/model/TravelDeal.java b/...rnetes/travelagency/model/TravelDeal.java → ...rnetes/travelagency/model/TravelDeal.java
diff --git a/...ency/repository/TravelDealRepository.java → ...ency/repository/TravelDealRepository.java b/...ency/repository/TravelDealRepository.java → ...ency/repository/TravelDealRepository.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...ice/src/main/resources/logback-spring.xml → ...ice/src/main/resources/logback-spring.xml b/...ice/src/main/resources/logback-spring.xml → ...ice/src/main/resources/logback-spring.xml
diff --git a/...cy-service/src/main/resources/logback.xml → ...cy-service/src/main/resources/logback.xml b/...cy-service/src/main/resources/logback.xml → ...cy-service/src/main/resources/logback.xml
diff --git a/...netes/travelagency/SpringContextTest.java → ...netes/travelagency/SpringContextTest.java b/...netes/travelagency/SpringContextTest.java → ...netes/travelagency/SpringContextTest.java
diff --git a/...ncy-service/travel-agency-deployment.yaml → ...ncy-service/travel-agency-deployment.yaml b/...ncy-service/travel-agency-deployment.yaml → ...ncy-service/travel-agency-deployment.yaml
diff --git a/...-cloud-kubernetes/demo-backend/.gitignore → ...bernetes-minikube/demo-backend/.gitignore b/...-cloud-kubernetes/demo-backend/.gitignore → ...bernetes-minikube/demo-backend/.gitignore
diff --git a/...-cloud-kubernetes/demo-backend/Dockerfile → ...bernetes-minikube/demo-backend/Dockerfile b/...-cloud-kubernetes/demo-backend/Dockerfile → ...bernetes-minikube/demo-backend/Dockerfile
diff --git a/...ing-cloud-kubernetes/demo-backend/pom.xml → .../kubernetes-minikube/demo-backend/pom.xml b/...ing-cloud-kubernetes/demo-backend/pom.xml → .../kubernetes-minikube/demo-backend/pom.xml
@@ -9,6 +9,7 @@
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-kubernetes</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>

diff --git a/...backend/KubernetesBackendApplication.java → ...backend/KubernetesBackendApplication.java b/...backend/KubernetesBackendApplication.java → ...backend/KubernetesBackendApplication.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...mo-backend/src/main/resources/logback.xml → ...mo-backend/src/main/resources/logback.xml b/...mo-backend/src/main/resources/logback.xml → ...mo-backend/src/main/resources/logback.xml
diff --git a/.../java/org/baeldung/SpringContextTest.java → .../java/org/baeldung/SpringContextTest.java b/.../java/org/baeldung/SpringContextTest.java → .../java/org/baeldung/SpringContextTest.java
diff --git a/...cloud-kubernetes/demo-frontend/.gitignore → ...ernetes-minikube/demo-frontend/.gitignore b/...cloud-kubernetes/demo-frontend/.gitignore → ...ernetes-minikube/demo-frontend/.gitignore
diff --git a/...cloud-kubernetes/demo-frontend/Dockerfile → ...ernetes-minikube/demo-frontend/Dockerfile b/...cloud-kubernetes/demo-frontend/Dockerfile → ...ernetes-minikube/demo-frontend/Dockerfile
diff --git a/...ng-cloud-kubernetes/demo-frontend/pom.xml → ...kubernetes-minikube/demo-frontend/pom.xml b/...ng-cloud-kubernetes/demo-frontend/pom.xml → ...kubernetes-minikube/demo-frontend/pom.xml
@@ -9,6 +9,7 @@
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-kubernetes</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>

diff --git a/...ontend/KubernetesFrontendApplication.java → ...ontend/KubernetesFrontendApplication.java b/...ontend/KubernetesFrontendApplication.java → ...ontend/KubernetesFrontendApplication.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...o-frontend/src/main/resources/logback.xml → ...o-frontend/src/main/resources/logback.xml b/...o-frontend/src/main/resources/logback.xml → ...o-frontend/src/main/resources/logback.xml
diff --git a/.../java/org/baeldung/SpringContextTest.java → .../java/org/baeldung/SpringContextTest.java b/.../java/org/baeldung/SpringContextTest.java → .../java/org/baeldung/SpringContextTest.java
diff --git a/...ct-configurations/backend-deployment.yaml → ...ct-configurations/backend-deployment.yaml b/...ct-configurations/backend-deployment.yaml → ...ct-configurations/backend-deployment.yaml
diff --git a/...t-configurations/frontend-deployment.yaml → ...t-configurations/frontend-deployment.yaml b/...t-configurations/frontend-deployment.yaml → ...t-configurations/frontend-deployment.yaml
diff --git a/...ud-kubernetes/liveness-example/Dockerfile → ...s-selfhealing/liveness-example/Dockerfile b/...ud-kubernetes/liveness-example/Dockerfile → ...s-selfhealing/liveness-example/Dockerfile
diff --git a/...cloud-kubernetes/liveness-example/pom.xml → ...etes-selfhealing/liveness-example/pom.xml b/...cloud-kubernetes/liveness-example/pom.xml → ...etes-selfhealing/liveness-example/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-1</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
+        <relativePath>../../../../parent-boot-1</relativePath>
     </parent>
 
     <dependencies>

diff --git a/...va/com/baeldung/liveness/Application.java → ...va/com/baeldung/liveness/Application.java b/...va/com/baeldung/liveness/Application.java → ...va/com/baeldung/liveness/Application.java
diff --git a/...iveness/health/CustomHealthIndicator.java → ...iveness/health/CustomHealthIndicator.java b/...iveness/health/CustomHealthIndicator.java → ...iveness/health/CustomHealthIndicator.java
diff --git a/...esources/resources/application.properties → ...esources/resources/application.properties b/...esources/resources/application.properties → ...esources/resources/application.properties
diff --git a/.../src/main/resources/resources/logback.xml → .../src/main/resources/resources/logback.xml b/.../src/main/resources/resources/logback.xml → .../src/main/resources/resources/logback.xml
diff --git a/.../java/com/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java b/.../java/com/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
diff --git a/...ations/liveness-example-k8s-template.yaml → ...ations/liveness-example-k8s-template.yaml b/...ations/liveness-example-k8s-template.yaml → ...ations/liveness-example-k8s-template.yaml
diff --git a/...tions/readiness-example-k8s-template.yaml → ...tions/readiness-example-k8s-template.yaml b/...tions/readiness-example-k8s-template.yaml → ...tions/readiness-example-k8s-template.yaml
diff --git a/...d-kubernetes/readiness-example/Dockerfile → ...-selfhealing/readiness-example/Dockerfile b/...d-kubernetes/readiness-example/Dockerfile → ...-selfhealing/readiness-example/Dockerfile
diff --git a/...loud-kubernetes/readiness-example/pom.xml → ...tes-selfhealing/readiness-example/pom.xml b/...loud-kubernetes/readiness-example/pom.xml → ...tes-selfhealing/readiness-example/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-1</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
+        <relativePath>../../../../parent-boot-1</relativePath>
     </parent>
 
     <dependencies>

diff --git a/...a/com/baeldung/readiness/Application.java → ...a/com/baeldung/readiness/Application.java b/...a/com/baeldung/readiness/Application.java → ...a/com/baeldung/readiness/Application.java
diff --git a/...adiness/health/CustomHealthIndicator.java → ...adiness/health/CustomHealthIndicator.java b/...adiness/health/CustomHealthIndicator.java → ...adiness/health/CustomHealthIndicator.java
diff --git a/...esources/resources/application.properties → ...esources/resources/application.properties b/...esources/resources/application.properties → ...esources/resources/application.properties
diff --git a/.../src/main/resources/resources/logback.xml → .../src/main/resources/resources/logback.xml b/.../src/main/resources/resources/logback.xml → .../src/main/resources/resources/logback.xml
diff --git a/.../java/com/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java b/.../java/com/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
diff --git a/spring-cloud/spring-cloud-kubernetes/pom.xml b/spring-cloud/spring-cloud-kubernetes/pom.xml
@@ -16,12 +16,12 @@
     </parent>
 
     <modules>
-        <module>demo-frontend</module>
-        <module>demo-backend</module>
-        <module>liveness-example</module>
-        <module>readiness-example</module>
-        <module>client-service</module>
-        <module>travel-agency-service</module>
+        <module>kubernetes-minikube/demo-frontend</module>
+        <module>kubernetes-minikube/demo-backend</module>
+        <module>kubernetes-selfhealing/liveness-example</module>
+        <module>kubernetes-selfhealing/readiness-example</module>
+        <module>kubernetes-guide/client-service</module>
+        <module>kubernetes-guide/travel-agency-service</module>
     </modules>
 
 </project>