From f45dccff97e453c7864368e2c376dee6d1b00f86 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 13:09:27 +0200
Subject: [PATCH 1/7] just a test
---
backend/README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/backend/README.md b/backend/README.md
index a9fee94..cdde734 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -13,4 +13,5 @@ To deploy the backend docker container, we use kubernetes. The deployment config
## Development
-TBD
\ No newline at end of file
+TBD
+Test for pull request
\ No newline at end of file
From 2f901e008e709e56cc051f340d61f97b19dbe72f Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 13:12:56 +0200
Subject: [PATCH 2/7] slight workflow test
---
.gitea/workflows/backend_build-deploy-prod.yaml | 4 ++--
.gitea/workflows/backend_build-deploy-stg.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitea/workflows/backend_build-deploy-prod.yaml b/.gitea/workflows/backend_build-deploy-prod.yaml
index f9d079e..968e65b 100644
--- a/.gitea/workflows/backend_build-deploy-prod.yaml
+++ b/.gitea/workflows/backend_build-deploy-prod.yaml
@@ -8,7 +8,7 @@ name: Build and deploy the backend to production
jobs:
build-and-push:
name: Build and push image
- uses: ./workflow_build-image.yaml
+ uses: anydev/anyway/.gitea/workflows/workflow_build-image.yaml
with:
tag: stable
secrets:
@@ -16,7 +16,7 @@ jobs:
deploy-prod:
name: Deploy to production
- uses: ./workflow_deploy-container.yaml
+ uses: anydev/anyway/.gitea/workflows/workflow_deploy-container.yaml
with:
environment: prod
secrets:
diff --git a/.gitea/workflows/backend_build-deploy-stg.yaml b/.gitea/workflows/backend_build-deploy-stg.yaml
index 2cbb0f3..4d8d90b 100644
--- a/.gitea/workflows/backend_build-deploy-stg.yaml
+++ b/.gitea/workflows/backend_build-deploy-stg.yaml
@@ -10,7 +10,7 @@ name: Build and deploy the backend to staging
jobs:
build-and-push:
name: Build and push image
- uses: ./workflow_build-image.yaml
+ uses: anydev/anyway/.gitea/workflows/workflow_build-image.yaml
with:
tag: unstable
secrets:
@@ -18,7 +18,7 @@ jobs:
deploy-prod:
name: Deploy to production
- uses: ./workflow_deploy-container.yaml
+ uses: anydev/anyway/.gitea/workflows/workflow_deploy-container.yaml
with:
environment: stg
secrets:
From 0e3f56a131194f57e603942a21a67c027b706ad5 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 13:14:11 +0200
Subject: [PATCH 3/7] must be this format?
---
.gitea/workflows/backend_build-deploy-prod.yaml | 4 ++--
.gitea/workflows/backend_build-deploy-stg.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitea/workflows/backend_build-deploy-prod.yaml b/.gitea/workflows/backend_build-deploy-prod.yaml
index 968e65b..2a33cc0 100644
--- a/.gitea/workflows/backend_build-deploy-prod.yaml
+++ b/.gitea/workflows/backend_build-deploy-prod.yaml
@@ -8,7 +8,7 @@ name: Build and deploy the backend to production
jobs:
build-and-push:
name: Build and push image
- uses: anydev/anyway/.gitea/workflows/workflow_build-image.yaml
+ uses: ./.gitea/workflows/workflow_build-image.yaml
with:
tag: stable
secrets:
@@ -16,7 +16,7 @@ jobs:
deploy-prod:
name: Deploy to production
- uses: anydev/anyway/.gitea/workflows/workflow_deploy-container.yaml
+ uses: ./.gitea/workflows/workflow_deploy-container.yaml
with:
environment: prod
secrets:
diff --git a/.gitea/workflows/backend_build-deploy-stg.yaml b/.gitea/workflows/backend_build-deploy-stg.yaml
index 4d8d90b..98b7451 100644
--- a/.gitea/workflows/backend_build-deploy-stg.yaml
+++ b/.gitea/workflows/backend_build-deploy-stg.yaml
@@ -10,7 +10,7 @@ name: Build and deploy the backend to staging
jobs:
build-and-push:
name: Build and push image
- uses: anydev/anyway/.gitea/workflows/workflow_build-image.yaml
+ uses: ./.gitea/workflows/workflow_build-image.yaml
with:
tag: unstable
secrets:
@@ -18,7 +18,7 @@ jobs:
deploy-prod:
name: Deploy to production
- uses: anydev/anyway/.gitea/workflows/workflow_deploy-container.yaml
+ uses: ./.gitea/workflows/workflow_deploy-container.yaml
with:
environment: stg
secrets:
From 94d12f298351b0ede1aab6408b049ca0d2c897ef Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 13:47:39 +0200
Subject: [PATCH 4/7] even more fixes
---
.gitea/workflows/backend_build-deploy-prod.yaml | 5 +++--
.gitea/workflows/backend_build-deploy-stg.yaml | 7 ++++---
.gitea/workflows/workflow_build-image.yaml | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitea/workflows/backend_build-deploy-prod.yaml b/.gitea/workflows/backend_build-deploy-prod.yaml
index 2a33cc0..3dfb55a 100644
--- a/.gitea/workflows/backend_build-deploy-prod.yaml
+++ b/.gitea/workflows/backend_build-deploy-prod.yaml
@@ -18,6 +18,7 @@ jobs:
name: Deploy to production
uses: ./.gitea/workflows/workflow_deploy-container.yaml
with:
- environment: prod
+ overlay: prod
secrets:
- PACKAGE_REGISTRY_ACCESS: ${{ secrets.KUBE_CONFIG }}
+ KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+ needs: build-and-push
diff --git a/.gitea/workflows/backend_build-deploy-stg.yaml b/.gitea/workflows/backend_build-deploy-stg.yaml
index 98b7451..3d67c44 100644
--- a/.gitea/workflows/backend_build-deploy-stg.yaml
+++ b/.gitea/workflows/backend_build-deploy-stg.yaml
@@ -17,9 +17,10 @@ jobs:
PACKAGE_REGISTRY_ACCESS: ${{ secrets.PACKAGE_REGISTRY_ACCESS }}
deploy-prod:
- name: Deploy to production
+ name: Deploy to staging
uses: ./.gitea/workflows/workflow_deploy-container.yaml
with:
- environment: stg
+ overlay: stg
secrets:
- PACKAGE_REGISTRY_ACCESS: ${{ secrets.KUBE_CONFIG }}
+ KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+ needs: build-and-push
diff --git a/.gitea/workflows/workflow_build-image.yaml b/.gitea/workflows/workflow_build-image.yaml
index b33b03b..c04e6cf 100644
--- a/.gitea/workflows/workflow_build-image.yaml
+++ b/.gitea/workflows/workflow_build-image.yaml
@@ -34,5 +34,5 @@ jobs:
uses: docker/build-push-action@v5
with:
context: backend
- tags: git.kluster.moll.re/anydev/anyway-backend:${{intputs.tag}}
+ tags: git.kluster.moll.re/anydev/anyway-backend:${{ inputs.tag }}
push: true
From 7414f7109d6371ad1108f4b5c555eef09e0a3a24 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 14:56:40 +0200
Subject: [PATCH 5/7] updated deployment config
---
backend/deployment | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/deployment b/backend/deployment
index 2b8b839..09ba656 160000
--- a/backend/deployment
+++ b/backend/deployment
@@ -1 +1 @@
-Subproject commit 2b8b8390bcf22042ac9c164bab17a44c1291d4bc
+Subproject commit 09ba656ae7f210cf91df49aff180fe3ba900c27c
From 9deb461925f7806751a351902d07e2bdb35ca40e Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 15:10:48 +0200
Subject: [PATCH 6/7] a bit of documentation
---
backend/README.md | 6 ++++--
backend/deployment | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/backend/README.md b/backend/README.md
index cdde734..1def675 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -9,9 +9,11 @@ This repository contains the backend code for the application. It utilizes FastA
- Since the application is aimed to be deployed in a container, the `Dockerfile` is provided to build the image.
### Deployment
-To deploy the backend docker container, we use kubernetes. The deployment configuration is located under [https://git.kluster.moll.re/anydev/deployment-backend/](https://git.kluster.moll.re/anydev/deployment-backend/).
+To deploy the backend docker container, we use kubernetes. Modifications to the backend are automatically pushed to a two-stage environment through the CI pipeline. See [deployment/README](deployment/README.md] for further information.
+
+The deployment configuration is included as a submodule in the `deployment` directory. The standalone repository is under [https://git.kluster.moll.re/anydev/anyway-backend-deployment/](https://git.kluster.moll.re/anydev/anyway-backend-deployment/).
## Development
TBD
-Test for pull request
\ No newline at end of file
+
diff --git a/backend/deployment b/backend/deployment
index 09ba656..7bbb9af 160000
--- a/backend/deployment
+++ b/backend/deployment
@@ -1 +1 @@
-Subproject commit 09ba656ae7f210cf91df49aff180fe3ba900c27c
+Subproject commit 7bbb9af15b7762fbb52cf0f5709339e3ab0cfeaa
From e5ea6e64e73790516ba66d58246c31d7dd3af10a Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Sep 2024 16:04:35 +0200
Subject: [PATCH 7/7] fix ingress
---
backend/deployment | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/deployment b/backend/deployment
index 7bbb9af..8927f27 160000
--- a/backend/deployment
+++ b/backend/deployment
@@ -1 +1 @@
-Subproject commit 7bbb9af15b7762fbb52cf0f5709339e3ab0cfeaa
+Subproject commit 8927f278f32bf0eca169ce4b13fbde8a4ed57274