From a623f8523863add47ba1d9744e658a9c455051db Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 15 Apr 2025 15:21:48 +0200 Subject: [PATCH 01/10] silly game --- ...illy-game.yaml => silly-game-backend.yaml} | 2 +- .../silly-game-frontend.yaml | 25 +++++++++++ .../silly-game/configmap.yaml | 17 -------- .../silly-game/deployment.yaml | 41 ------------------- 4 files changed, 26 insertions(+), 59 deletions(-) rename template/stacks/ref-implementation/{silly-game.yaml => silly-game-backend.yaml} (95%) create mode 100644 template/stacks/ref-implementation/silly-game-frontend.yaml delete mode 100644 template/stacks/ref-implementation/silly-game/configmap.yaml delete mode 100644 template/stacks/ref-implementation/silly-game/deployment.yaml diff --git a/template/stacks/ref-implementation/silly-game.yaml b/template/stacks/ref-implementation/silly-game-backend.yaml similarity index 95% rename from template/stacks/ref-implementation/silly-game.yaml rename to template/stacks/ref-implementation/silly-game-backend.yaml index 22391af..9a89dc6 100644 --- a/template/stacks/ref-implementation/silly-game.yaml +++ b/template/stacks/ref-implementation/silly-game-backend.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: silly-game - namespace: silly-game + namespace: argocd labels: env: dev finalizers: diff --git a/template/stacks/ref-implementation/silly-game-frontend.yaml b/template/stacks/ref-implementation/silly-game-frontend.yaml new file mode 100644 index 0000000..65dfa37 --- /dev/null +++ b/template/stacks/ref-implementation/silly-game-frontend.yaml @@ -0,0 +1,25 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: silly-game + namespace: argocd + labels: + env: dev + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/michals-silly-game-frontend + targetRevision: HEAD + path: "k8" + destination: + name: in-cluster + namespace: silly-game + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: + selfHeal: true + retry: + limit: -1 diff --git a/template/stacks/ref-implementation/silly-game/configmap.yaml b/template/stacks/ref-implementation/silly-game/configmap.yaml deleted file mode 100644 index 9926ee7..0000000 --- a/template/stacks/ref-implementation/silly-game/configmap.yaml +++ /dev/null @@ -1,17 +0,0 @@ -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/template/stacks/ref-implementation/silly-game/deployment.yaml b/template/stacks/ref-implementation/silly-game/deployment.yaml deleted file mode 100644 index 14450c5..0000000 --- a/template/stacks/ref-implementation/silly-game/deployment.yaml +++ /dev/null @@ -1,41 +0,0 @@ -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: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/michals-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 From d95ea8de9e703fabc746cfea574a4c72223e1965 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 16 Apr 2025 10:45:03 +0200 Subject: [PATCH 02/10] name fixed --- template/stacks/ref-implementation/silly-game-backend.yaml | 2 +- template/stacks/ref-implementation/silly-game-frontend.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/silly-game-backend.yaml b/template/stacks/ref-implementation/silly-game-backend.yaml index 9a89dc6..95bf1de 100644 --- a/template/stacks/ref-implementation/silly-game-backend.yaml +++ b/template/stacks/ref-implementation/silly-game-backend.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: silly-game + name: silly-game-backend namespace: argocd labels: env: dev diff --git a/template/stacks/ref-implementation/silly-game-frontend.yaml b/template/stacks/ref-implementation/silly-game-frontend.yaml index 65dfa37..dafc9e3 100644 --- a/template/stacks/ref-implementation/silly-game-frontend.yaml +++ b/template/stacks/ref-implementation/silly-game-frontend.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: silly-game + name: silly-game-frontend namespace: argocd labels: env: dev From def30cded8e93345c004bf73514d98b740a280ac Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 16 Apr 2025 12:00:55 +0200 Subject: [PATCH 03/10] ingress added --- .../stacks/core/ingress-apps/silly-game.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 template/stacks/core/ingress-apps/silly-game.yaml diff --git a/template/stacks/core/ingress-apps/silly-game.yaml b/template/stacks/core/ingress-apps/silly-game.yaml new file mode 100644 index 0000000..fb22f72 --- /dev/null +++ b/template/stacks/core/ingress-apps/silly-game.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: silly-game-ingress + namespace: silly-game +spec: + ingressClassName: nginx + rules: + - host: {{{ .Env.DOMAIN }}} + http: + paths: + - backend: + service: + name: silly-game-frontend + port: + number: 80 + path: /silly-game + pathType: Prefix From 025efc732fa00e049df06bbedb59d526b5bf096e Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 16 Apr 2025 12:11:11 +0200 Subject: [PATCH 04/10] name: silly-game-frontend-service --- template/stacks/core/ingress-apps/silly-game.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/ingress-apps/silly-game.yaml b/template/stacks/core/ingress-apps/silly-game.yaml index fb22f72..e283c92 100644 --- a/template/stacks/core/ingress-apps/silly-game.yaml +++ b/template/stacks/core/ingress-apps/silly-game.yaml @@ -11,7 +11,7 @@ spec: paths: - backend: service: - name: silly-game-frontend + name: silly-game-frontend-service port: number: 80 path: /silly-game From 4e135403f10c991101fd63c479f54543204b4239 Mon Sep 17 00:00:00 2001 From: miwr Date: Wed, 16 Apr 2025 16:09:30 +0200 Subject: [PATCH 05/10] ingress --- template/stacks/core/ingress-apps/silly-game.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/template/stacks/core/ingress-apps/silly-game.yaml b/template/stacks/core/ingress-apps/silly-game.yaml index e283c92..02e6563 100644 --- a/template/stacks/core/ingress-apps/silly-game.yaml +++ b/template/stacks/core/ingress-apps/silly-game.yaml @@ -9,10 +9,17 @@ spec: - host: {{{ .Env.DOMAIN }}} http: paths: - - backend: + - frontend: service: name: silly-game-frontend-service port: number: 80 path: /silly-game pathType: Prefix + - backend: + service: + name: silly-game-backend-service + port: + number: 8080 + path: /silly-game-api + pathType: Prefix From 964ecdbdb28c7ad2f5465859047e998c2db06020 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 17 Apr 2025 10:20:58 +0200 Subject: [PATCH 06/10] ingress fixed --- .../stacks/core/ingress-apps/silly-game.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/template/stacks/core/ingress-apps/silly-game.yaml b/template/stacks/core/ingress-apps/silly-game.yaml index 02e6563..f14b91f 100644 --- a/template/stacks/core/ingress-apps/silly-game.yaml +++ b/template/stacks/core/ingress-apps/silly-game.yaml @@ -8,18 +8,18 @@ spec: rules: - host: {{{ .Env.DOMAIN }}} http: - paths: - - frontend: - service: - name: silly-game-frontend-service - port: - number: 80 - path: /silly-game - pathType: Prefix - - backend: - service: - name: silly-game-backend-service - port: - number: 8080 - path: /silly-game-api - pathType: Prefix + paths: + - path: /silly-game + pathType: Prefix + backend: + service: + name: silly-game-frontend-service + port: + number: 80 + - path: /silly-game-api + pathType: Prefix + backend: + service: + name: silly-game-backend-service + port: + number: 8080 From 7fac795f11e2e839d87762d3721563a5bc7a97bb Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 17 Apr 2025 10:39:45 +0200 Subject: [PATCH 07/10] 80 instead of 8080 --- template/stacks/core/ingress-apps/silly-game.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/ingress-apps/silly-game.yaml b/template/stacks/core/ingress-apps/silly-game.yaml index f14b91f..bce5ec1 100644 --- a/template/stacks/core/ingress-apps/silly-game.yaml +++ b/template/stacks/core/ingress-apps/silly-game.yaml @@ -22,4 +22,4 @@ spec: service: name: silly-game-backend-service port: - number: 8080 + number: 80 From c964431c7f88cf4eb77afa324752ae86c1fb4c5c Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 17 Apr 2025 10:52:12 +0200 Subject: [PATCH 08/10] 8080 --- template/stacks/core/ingress-apps/silly-game.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/ingress-apps/silly-game.yaml b/template/stacks/core/ingress-apps/silly-game.yaml index bce5ec1..f14b91f 100644 --- a/template/stacks/core/ingress-apps/silly-game.yaml +++ b/template/stacks/core/ingress-apps/silly-game.yaml @@ -22,4 +22,4 @@ spec: service: name: silly-game-backend-service port: - number: 80 + number: 8080 From ae8848cfd2a63c6de9630d439285e6a929a3ffa6 Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 17 Apr 2025 12:14:02 +0200 Subject: [PATCH 09/10] entstopfen --- template/stacks/ref-implementation/silly-game-backend.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/silly-game-backend.yaml b/template/stacks/ref-implementation/silly-game-backend.yaml index 95bf1de..a9fde4d 100644 --- a/template/stacks/ref-implementation/silly-game-backend.yaml +++ b/template/stacks/ref-implementation/silly-game-backend.yaml @@ -10,7 +10,7 @@ metadata: spec: project: default source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/michals-silly-game-backend + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/michals-silly-game-frontend targetRevision: HEAD path: "k8" destination: From 2022106cb09be767d37f79f47f80d66fb72ea4ed Mon Sep 17 00:00:00 2001 From: miwr Date: Thu, 17 Apr 2025 12:22:29 +0200 Subject: [PATCH 10/10] backend --- template/stacks/ref-implementation/silly-game-backend.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/silly-game-backend.yaml b/template/stacks/ref-implementation/silly-game-backend.yaml index a9fde4d..95bf1de 100644 --- a/template/stacks/ref-implementation/silly-game-backend.yaml +++ b/template/stacks/ref-implementation/silly-game-backend.yaml @@ -10,7 +10,7 @@ metadata: spec: project: default source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/michals-silly-game-frontend + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/michals-silly-game-backend targetRevision: HEAD path: "k8" destination: