diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0b89b12..ad4eb54 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,30 +4,22 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -70,25 +62,28 @@
- {
- "keyToString": {
- "Application.CourseCompositeServiceApplication.executor": "Run",
- "Application.CourseServiceApplication.executor": "Run",
- "Application.GatewayServiceApplication.executor": "Run",
- "Application.ReviewServiceApplication.executor": "Run",
- "Maven.course-service [compile].executor": "Run",
- "Maven.course-service [package].executor": "Run",
- "Maven.util [install].executor": "Run",
- "Maven.util [package].executor": "Run",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.git.unshallow": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "git-widget-placeholder": "revamp",
- "kotlin-language-version-configured": "true",
- "last_opened_file_path": "/Users/maersk-mtc-79/Nasir/Personal/Codebase/microservices-example/spring-boot-update/spring-boot-based-microservices/microservices/review-service",
- "settings.editor.selected.configurable": "terminal"
+
+}]]>
@@ -249,7 +244,15 @@
1741325074203
-
+
+
+ 1741363113389
+
+
+
+ 1741363113389
+
+
@@ -271,7 +274,8 @@
-
+
+
diff --git a/Tiltfile b/Tiltfile
index 35e4bb1..18c2012 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -1,11 +1,23 @@
+# Define and build infrastructure services
+k8s_yaml([
+ "kubernetes/infrastructure/keycloak/keycloak.yml",
+ "kubernetes/infrastructure/postgres/postgres.yml",
+ "kubernetes/infrastructure/mongodb/mongodb.yml"
+])
+
+# Define infrastructure resources
+k8s_resource("keycloak", labels=["infra"], auto_init=True)
+k8s_resource("course-postgres", labels=["infra"], auto_init=True)
+k8s_resource("review-mongodb", labels=["infra"], auto_init=True)
+
# Define and build course-service
docker_build(
"course-service",
context="./microservices/course-service",
dockerfile="./microservices/course-service/Dockerfile",
live_update=[
- sync("./microservices/course-service/src", "/application/src"), # Sync only Java files
- run("mvn package -DskipTests", trigger=["/application/src"]), # Rebuild JAR when code changes
+ sync("./microservices/course-service/src", "/application/src"),
+ run("mvn package -DskipTests", trigger=["/application/src"]),
]
)
k8s_yaml([
@@ -14,8 +26,8 @@ k8s_yaml([
])
k8s_resource(
"course-service",
- port_forwards="9001:9001", # Maps host port 9001 to container port 9001
- labels=["services"] # Optional: Group in Tilt UI
+ port_forwards="9001:9001",
+ labels=["services"]
)
# Define and build review-service
@@ -24,8 +36,8 @@ docker_build(
context="./microservices/review-service",
dockerfile="./microservices/review-service/Dockerfile",
live_update=[
- sync("./microservices/review-service/src", "/application/src"), # Sync only Java files
- run("mvn package -DskipTests", trigger=["/application/src"]), # Rebuild JAR when code changes
+ sync("./microservices/review-service/src", "/application/src"),
+ run("mvn package -DskipTests", trigger=["/application/src"]),
]
)
k8s_yaml([
@@ -38,14 +50,14 @@ k8s_resource(
labels=["services"]
)
-# Define and build course-aggregate-service
+# Define and build course-composite-service
docker_build(
"course-composite-service",
context="./microservices/course-composite-service",
dockerfile="./microservices/course-composite-service/Dockerfile",
live_update=[
- sync("./microservices/course-composite-service/src", "/application/src"), # Sync only Java files
- run("mvn package -DskipTests", trigger=["/application/src"]), # Rebuild JAR when code changes
+ sync("./microservices/course-composite-service/src", "/application/src"),
+ run("mvn package -DskipTests", trigger=["/application/src"]),
]
)
k8s_yaml([
@@ -58,15 +70,14 @@ k8s_resource(
labels=["services"]
)
-
# Define and build gateway-service
docker_build(
"gateway-service",
context="./spring-cloud/gateway-service",
dockerfile="./spring-cloud/gateway-service/Dockerfile",
live_update=[
- sync("./spring-cloud/gateway-service/src", "/application/src"), # Sync only Java files
- run("mvn package -DskipTests", trigger=["/application/src"]), # Rebuild JAR when code changes
+ sync("./spring-cloud/gateway-service/src", "/application/src"),
+ run("mvn package -DskipTests", trigger=["/application/src"]),
]
)
k8s_yaml([
@@ -74,9 +85,7 @@ k8s_yaml([
"spring-cloud/gateway-service/kubernetes/service.yml",
"spring-cloud/gateway-service/kubernetes/ingress.yml"
])
-
k8s_resource(
"gateway-service",
-# port_forwards="9000:9000", # Maps host port 9000 to container port 9000
- labels=["services"] # Optional: Group in Tilt UI
+ labels=["services"]
)
\ No newline at end of file
diff --git a/docker/docker-compose-infra.yml b/docker/docker-compose-infra.yml
index 8a5daba..24e4724 100644
--- a/docker/docker-compose-infra.yml
+++ b/docker/docker-compose-infra.yml
@@ -42,7 +42,6 @@ services:
command: [ "start-dev" ]
networks:
- shared-network
-
networks:
shared-network:
name: shared-network
\ No newline at end of file
diff --git a/kubernetes/infra/keycloak/course-management-realm.json b/kubernetes/infrastructure/keycloak/course-management-realm.json
similarity index 100%
rename from kubernetes/infra/keycloak/course-management-realm.json
rename to kubernetes/infrastructure/keycloak/course-management-realm.json
diff --git a/kubernetes/infra/keycloak/keycloak.yml b/kubernetes/infrastructure/keycloak/keycloak.yml
similarity index 100%
rename from kubernetes/infra/keycloak/keycloak.yml
rename to kubernetes/infrastructure/keycloak/keycloak.yml
diff --git a/kubernetes/infra/mongodb/mongo.yml b/kubernetes/infrastructure/mongodb/mongodb.yml
similarity index 100%
rename from kubernetes/infra/mongodb/mongo.yml
rename to kubernetes/infrastructure/mongodb/mongodb.yml
diff --git a/kubernetes/infra/postgres/postgres.yml b/kubernetes/infrastructure/postgres/postgres.yml
similarity index 100%
rename from kubernetes/infra/postgres/postgres.yml
rename to kubernetes/infrastructure/postgres/postgres.yml