From d25e82c42a509ee67618602d8ec8fadb162e80ef Mon Sep 17 00:00:00 2001 From: miwr Date: Mon, 14 Apr 2025 12:58:22 +0200 Subject: [PATCH] k8 added --- k8/configmap.yaml | 17 +++++++ k8/deployment.yaml | 48 +++++++++++++++++++ .../de/telekom/silly_game/GameController.java | 1 - .../telekom/silly_game/InviteController.java | 1 - .../java/de/telekom/silly_game/WebConfig.java | 20 ++++++++ src/main/resources/application.properties | 4 +- 6 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 k8/configmap.yaml create mode 100644 k8/deployment.yaml create mode 100644 src/main/java/de/telekom/silly_game/WebConfig.java diff --git a/k8/configmap.yaml b/k8/configmap.yaml new file mode 100644 index 0000000..427817f --- /dev/null +++ b/k8/configmap.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: silly-game-config + namespace: silly-game +data: + game-config.properties: | + spring.application.name=silly-game + + spring.mail.host=mailhog.mailhog.svc.cluster.local + spring.mail.port=1025 + spring.mail.username= + spring.mail.password= + spring.mail.properties.mail.smtp.auth=false + spring.mail.properties.mail.smtp.starttls.enable=false + + cors.allowed-origin=http://silly-game-service.silly-game.svc.cluster.local \ No newline at end of file diff --git a/k8/deployment.yaml b/k8/deployment.yaml new file mode 100644 index 0000000..71e0b66 --- /dev/null +++ b/k8/deployment.yaml @@ -0,0 +1,48 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: silly-game + +--- + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: silly-game-deployment + namespace: silly-game +spec: + replicas: 1 + selector: + matchLabels: + app: silly-game + template: + metadata: + labels: + app: silly-game + spec: + containers: + - name: silly-game + image: mygit-silly-game-backend:main + ports: + - containerPort: 8080 + volumeMounts: + - name: config-volume + mountPath: /config + volumes: + - name: config-volume + configMap: + name: silly-game-config + +--- + +apiVersion: v1 +kind: Service +metadata: + name: silly-game-service + namespace: silly-game +spec: + selector: + app: silly-game + ports: + - port: 80 + targetPort: 8080 \ No newline at end of file diff --git a/src/main/java/de/telekom/silly_game/GameController.java b/src/main/java/de/telekom/silly_game/GameController.java index af31676..62700a4 100644 --- a/src/main/java/de/telekom/silly_game/GameController.java +++ b/src/main/java/de/telekom/silly_game/GameController.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @RestController -@CrossOrigin(origins = "http://localhost:4200") @RequestMapping("/game") public class GameController { diff --git a/src/main/java/de/telekom/silly_game/InviteController.java b/src/main/java/de/telekom/silly_game/InviteController.java index 5079bf7..0deda30 100644 --- a/src/main/java/de/telekom/silly_game/InviteController.java +++ b/src/main/java/de/telekom/silly_game/InviteController.java @@ -11,7 +11,6 @@ import java.util.Map; @RestController @RequestMapping("/api") -@CrossOrigin(origins = "http://localhost:4200") public class InviteController { @PostMapping("/invite") diff --git a/src/main/java/de/telekom/silly_game/WebConfig.java b/src/main/java/de/telekom/silly_game/WebConfig.java new file mode 100644 index 0000000..0036b51 --- /dev/null +++ b/src/main/java/de/telekom/silly_game/WebConfig.java @@ -0,0 +1,20 @@ +package de.telekom.silly_game; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Value("${cors.allowed-origin}") + private String allowedOrigin; + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins(allowedOrigin) + .allowedMethods("*"); + } +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f86ecaf..56daaad 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,4 +5,6 @@ spring.mail.port=1025 spring.mail.username= spring.mail.password= spring.mail.properties.mail.smtp.auth=false -spring.mail.properties.mail.smtp.starttls.enable=false \ No newline at end of file +spring.mail.properties.mail.smtp.starttls.enable=false + +cors.allowed-origin=http://localhost:4200 \ No newline at end of file