mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 15:12:08 +01:00
Compare commits
54 Commits
803d05d7c8
...
merge/pr_d
| Author | SHA1 | Date | |
|---|---|---|---|
| 00bd885873 | |||
| f492e0cc03 | |||
| cb3747357e | |||
| 31bebaf247 | |||
| 316939b53c | |||
| 101bb34cb0 | |||
| 9a7759ab3d | |||
| c15dea5456 | |||
| fae5d828bf | |||
| 7ee45b451e | |||
| d4da625408 | |||
| 5c4e155546 | |||
| edfa42eee5 | |||
| ba7cc381cf | |||
| fc1b614f19 | |||
| 7b9d72791f | |||
| 48d56681fb | |||
| c45ecbc5bc | |||
| a940e257ee | |||
| bc219338b1 | |||
| 384d5004eb | |||
| 8e1d65a078 | |||
| 35e2ca6a72 | |||
| bda4cafcf6 | |||
| 29422f6500 | |||
| d03ff463a0 | |||
| e0fd68b135 | |||
| 8cef7467cf | |||
| c9705616dd | |||
| 40131cf7ca | |||
| 3a6ee3dace | |||
| d58d553945 | |||
| 291305c2e5 | |||
| 9cbe121b11 | |||
| 8edaaee117 | |||
|
|
4cb09bb053 | ||
| dd0ca4b4f1 | |||
| 145565b542 | |||
| 9a436d3c70 | |||
| 49efd88f29 | |||
| 3e809782a6 | |||
| 7cd96c830d | |||
| 233a331cba | |||
| a0bc94d7ec | |||
| e31ec199c0 | |||
| 6d8b760a7d | |||
|
|
42f3d4dae1 | ||
| 57d8f169da | |||
| 8a718d6f59 | |||
| 4af6d34507 | |||
| 615803de2d | |||
| 106497e791 | |||
| f4892a69d5 | |||
| 3c8ad5f74f |
105
.github/workflows/build-image.yaml
vendored
Normal file
105
.github/workflows/build-image.yaml
vendored
Normal file
@@ -0,0 +1,105 @@
|
||||
name: Build and Push Image
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
mode:
|
||||
description: "Build mode: 'prod' or 'pr'"
|
||||
required: true
|
||||
type: string
|
||||
image_repo:
|
||||
description: "Docker image repository (e.g., user/app)"
|
||||
required: false
|
||||
default: "lukastrkan/cc-app-demo"
|
||||
type: string
|
||||
context:
|
||||
description: "Docker build context path"
|
||||
required: false
|
||||
default: "7project/backend"
|
||||
type: string
|
||||
pr_number:
|
||||
description: "PR number (required when mode=pr)"
|
||||
required: false
|
||||
type: string
|
||||
secrets:
|
||||
DOCKER_USER:
|
||||
required: true
|
||||
DOCKER_PASSWORD:
|
||||
required: true
|
||||
outputs:
|
||||
digest:
|
||||
description: "Built image digest"
|
||||
value: ${{ jobs.build.outputs.digest }}
|
||||
image_repo:
|
||||
description: "Image repository used"
|
||||
value: ${{ jobs.build.outputs.image_repo }}
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
digest: ${{ steps.set.outputs.digest }}
|
||||
image_repo: ${{ steps.set.outputs.image_repo }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Log in to Docker Hub
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USER }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
- name: Compute image repo and tags
|
||||
id: meta
|
||||
env:
|
||||
MODE: ${{ inputs.mode }}
|
||||
IMAGE_REPO: ${{ inputs.image_repo }}
|
||||
PR: ${{ inputs.pr_number }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [ -z "${IMAGE_REPO:-}" ]; then IMAGE_REPO="lukastrkan/cc-app-demo"; fi
|
||||
echo "IMAGE_REPO=$IMAGE_REPO" >> $GITHUB_ENV
|
||||
SHA_SHORT="${GITHUB_SHA::12}"
|
||||
case "$MODE" in
|
||||
prod)
|
||||
TAG1="prod-$SHA_SHORT"
|
||||
TAG2="latest"
|
||||
;;
|
||||
pr)
|
||||
if [ -z "${PR:-}" ]; then echo "pr_number input is required for mode=pr"; exit 1; fi
|
||||
TAG1="pr-$PR"
|
||||
TAG2="pr-$PR-$SHA_SHORT"
|
||||
;;
|
||||
*)
|
||||
echo "Unknown mode '$MODE' (expected 'prod' or 'pr')"; exit 1;
|
||||
;;
|
||||
esac
|
||||
echo "TAG1=$TAG1" >> $GITHUB_ENV
|
||||
echo "TAG2=$TAG2" >> $GITHUB_ENV
|
||||
|
||||
- name: Build and push image
|
||||
id: build
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: ${{ inputs.context }}
|
||||
push: true
|
||||
tags: |
|
||||
${{ env.IMAGE_REPO }}:${{ env.TAG1 }}
|
||||
${{ env.IMAGE_REPO }}:${{ env.TAG2 }}
|
||||
platforms: linux/amd64
|
||||
|
||||
- name: Set outputs
|
||||
id: set
|
||||
env:
|
||||
IMAGE_REPO: ${{ env.IMAGE_REPO }}
|
||||
run: |
|
||||
echo "digest=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT
|
||||
echo "image_repo=$IMAGE_REPO" >> $GITHUB_OUTPUT
|
||||
131
.github/workflows/deploy-pr.yaml
vendored
Normal file
131
.github/workflows/deploy-pr.yaml
vendored
Normal file
@@ -0,0 +1,131 @@
|
||||
name: Deploy Preview (PR)
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, reopened, synchronize, closed]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
build:
|
||||
if: github.event.action != 'closed'
|
||||
name: Build and push image (reusable)
|
||||
uses: ./.github/workflows/build-image.yaml
|
||||
with:
|
||||
mode: pr
|
||||
image_repo: lukastrkan/cc-app-demo
|
||||
context: 7project/backend
|
||||
pr_number: ${{ github.event.pull_request.number }}
|
||||
secrets: inherit
|
||||
|
||||
deploy:
|
||||
if: github.event.action != 'closed'
|
||||
name: Helm upgrade/install (PR preview)
|
||||
runs-on: vhs
|
||||
concurrency:
|
||||
group: pr-${{ github.event.pull_request.number }}
|
||||
cancel-in-progress: false
|
||||
needs: [build]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Helm
|
||||
uses: azure/setup-helm@v4
|
||||
|
||||
- name: Setup kubectl
|
||||
uses: azure/setup-kubectl@v4
|
||||
|
||||
- name: Configure kubeconfig
|
||||
env:
|
||||
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
|
||||
run: |
|
||||
mkdir -p ~/.kube
|
||||
if [ -z "$KUBE_CONFIG" ]; then
|
||||
echo "Secret KUBE_CONFIG is required (kubeconfig content)"; exit 1; fi
|
||||
echo "$KUBE_CONFIG" > ~/.kube/config
|
||||
chmod 600 ~/.kube/config
|
||||
|
||||
- name: Helm upgrade/install PR preview
|
||||
env:
|
||||
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
||||
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
||||
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
||||
IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
|
||||
DIGEST: ${{ needs.build.outputs.digest }}
|
||||
run: |
|
||||
PR=${{ github.event.pull_request.number }}
|
||||
if [ -z "$PR" ]; then echo "PR number missing"; exit 1; fi
|
||||
if [ -z "$DEV_BASE_DOMAIN" ]; then echo "Secret DEV_BASE_DOMAIN is required (e.g., dev.example.com)"; exit 1; fi
|
||||
if [ -z "$RABBITMQ_PASSWORD" ]; then echo "Secret DEV_RABBITMQ_PASSWORD is required"; exit 1; fi
|
||||
if [ -z "$DB_PASSWORD" ]; then echo "Secret DEV_DB_PASSWORD is required"; exit 1; fi
|
||||
RELEASE=myapp-pr-$PR
|
||||
NAMESPACE=pr-$PR
|
||||
DOMAIN=pr-$PR.$DEV_BASE_DOMAIN
|
||||
if [ -z "$IMAGE_REPO" ]; then IMAGE_REPO="lukastrkan/cc-app-demo"; fi
|
||||
helm upgrade --install "$RELEASE" ./7project/charts/myapp-chart \
|
||||
-n "$NAMESPACE" --create-namespace \
|
||||
-f 7project/charts/myapp-chart/values-dev.yaml \
|
||||
--set prNumber="$PR" \
|
||||
--set deployment="pr-$PR" \
|
||||
--set domain="$DOMAIN" \
|
||||
--set image.repository="$IMAGE_REPO" \
|
||||
--set image.digest="$DIGEST" \
|
||||
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
||||
--set-string database.password="$DB_PASSWORD"
|
||||
|
||||
- name: Post preview URL as PR comment
|
||||
uses: actions/github-script@v7
|
||||
env:
|
||||
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
||||
with:
|
||||
script: |
|
||||
const pr = context.payload.pull_request;
|
||||
if (!pr) { core.setFailed('No pull_request context'); return; }
|
||||
const prNumber = pr.number;
|
||||
const domainBase = process.env.DEV_BASE_DOMAIN;
|
||||
if (!domainBase) { core.setFailed('DEV_BASE_DOMAIN is required'); return; }
|
||||
const domain = `pr-${prNumber}.${domainBase}`;
|
||||
const url = `https://${domain}`;
|
||||
const marker = '<!-- preview-link -->';
|
||||
const body = `${marker}\nPreview environment is running: ${url}\n`;
|
||||
const { owner, repo } = context.repo;
|
||||
const { data: comments } = await github.rest.issues.listComments({ owner, repo, issue_number: prNumber, per_page: 100 });
|
||||
const existing = comments.find(c => c.body && c.body.includes(marker));
|
||||
if (existing) {
|
||||
await github.rest.issues.updateComment({ owner, repo, comment_id: existing.id, body });
|
||||
} else {
|
||||
await github.rest.issues.createComment({ owner, repo, issue_number: prNumber, body });
|
||||
}
|
||||
|
||||
uninstall:
|
||||
if: github.event.action == 'closed'
|
||||
name: Helm uninstall (PR preview)
|
||||
runs-on: vhs
|
||||
steps:
|
||||
- name: Setup Helm
|
||||
uses: azure/setup-helm@v4
|
||||
|
||||
- name: Setup kubectl
|
||||
uses: azure/setup-kubectl@v4
|
||||
|
||||
- name: Configure kubeconfig
|
||||
env:
|
||||
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
|
||||
run: |
|
||||
mkdir -p ~/.kube
|
||||
if [ -z "$KUBE_CONFIG" ]; then
|
||||
echo "Secret KUBE_CONFIG is required (kubeconfig content)"; exit 1; fi
|
||||
echo "$KUBE_CONFIG" > ~/.kube/config
|
||||
chmod 600 ~/.kube/config
|
||||
|
||||
- name: Helm uninstall release and cleanup namespace
|
||||
run: |
|
||||
PR=${{ github.event.pull_request.number }}
|
||||
RELEASE=myapp-pr-$PR
|
||||
NAMESPACE=pr-$PR
|
||||
helm uninstall "$RELEASE" -n "$NAMESPACE" || true
|
||||
# Optionally delete the namespace if empty
|
||||
kubectl delete namespace "$NAMESPACE" --ignore-not-found=true || true
|
||||
78
.github/workflows/deploy-prod.yaml
vendored
Normal file
78
.github/workflows/deploy-prod.yaml
vendored
Normal file
@@ -0,0 +1,78 @@
|
||||
name: Deploy Prod
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- 7project/backend/**
|
||||
- 7project/charts/myapp-chart/**
|
||||
- .github/workflows/deploy-prod.yaml
|
||||
- .github/workflows/build-image.yaml
|
||||
workflow_dispatch:
|
||||
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: deploy-prod
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build and push image (reusable)
|
||||
uses: ./.github/workflows/build-image.yaml
|
||||
with:
|
||||
mode: prod
|
||||
image_repo: lukastrkan/cc-app-demo
|
||||
context: 7project/backend
|
||||
secrets: inherit
|
||||
|
||||
deploy:
|
||||
name: Helm upgrade/install (prod)
|
||||
runs-on: vhs
|
||||
needs: [build]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Helm
|
||||
uses: azure/setup-helm@v4
|
||||
|
||||
- name: Setup kubectl
|
||||
uses: azure/setup-kubectl@v4
|
||||
|
||||
- name: Configure kubeconfig
|
||||
env:
|
||||
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
|
||||
run: |
|
||||
mkdir -p ~/.kube
|
||||
if [ -z "$KUBE_CONFIG" ]; then
|
||||
echo "Secret KUBE_CONFIG is required (kubeconfig content)"; exit 1; fi
|
||||
echo "$KUBE_CONFIG" > ~/.kube/config
|
||||
chmod 600 ~/.kube/config
|
||||
|
||||
- name: Helm upgrade/install prod
|
||||
env:
|
||||
DOMAIN: ${{ secrets.PROD_DOMAIN }}
|
||||
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
||||
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
||||
IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
|
||||
DIGEST: ${{ needs.build.outputs.digest }}
|
||||
run: |
|
||||
if [ -z "$DOMAIN" ]; then
|
||||
echo "Secret PROD_DOMAIN is required (e.g., app.example.com)"; exit 1; fi
|
||||
if [ -z "$RABBITMQ_PASSWORD" ]; then
|
||||
echo "Secret PROD_RABBITMQ_PASSWORD is required"; exit 1; fi
|
||||
if [ -z "$DB_PASSWORD" ]; then
|
||||
echo "Secret PROD_DB_PASSWORD is required"; exit 1; fi
|
||||
if [ -z "$IMAGE_REPO" ]; then IMAGE_REPO="lukastrkan/cc-app-demo"; fi
|
||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||
-n prod --create-namespace \
|
||||
-f 7project/charts/myapp-chart/values-prod.yaml \
|
||||
--set deployment="prod" \
|
||||
--set domain="$DOMAIN" \
|
||||
--set image.repository="$IMAGE_REPO" \
|
||||
--set image.digest="$DIGEST" \
|
||||
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
||||
--set-string database.password="$DB_PASSWORD"
|
||||
54
.github/workflows/workflow.yml
vendored
54
.github/workflows/workflow.yml
vendored
@@ -1,54 +0,0 @@
|
||||
name: Build, Push and Update Image in Manifest
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
paths:
|
||||
- 'backend/**'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-and-update:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
packages: write
|
||||
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USER }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
- name: Build and push Docker image
|
||||
id: build
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: ./backend
|
||||
push: true
|
||||
tags: ${{ secrets.DOCKER_USER }}/cc-app-demo:latest
|
||||
|
||||
- name: Get image digest
|
||||
run: echo "IMAGE_DIGEST=${{ steps.build.outputs.digest }}" >> $GITHUB_ENV
|
||||
|
||||
- name: Update manifests with new image digest
|
||||
uses: OpsVerseIO/image-updater-action@0.1.0
|
||||
with:
|
||||
branch: main
|
||||
targetBranch: main
|
||||
createPR: 'false'
|
||||
message: "${{ github.event.head_commit.message }}"
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
changes: |
|
||||
{
|
||||
"deployment/app-demo-deployment.yaml": {
|
||||
"spec.template.spec.containers[0].image": "${{ secrets.DOCKER_USER }}/cc-app-demo@${{ env.IMAGE_DIGEST }}"
|
||||
},
|
||||
"deployment/app-demo-worker-deployment.yaml": {
|
||||
"spec.template.spec.containers[0].image": "${{ secrets.DOCKER_USER }}/cc-app-demo@${{ env.IMAGE_DIGEST }}"
|
||||
}
|
||||
}
|
||||
0
.gitignore → 7project/.gitignore
vendored
0
.gitignore → 7project/.gitignore
vendored
@@ -1,7 +1,8 @@
|
||||
FROM python:3.11-slim
|
||||
|
||||
WORKDIR /app
|
||||
COPY requirements.txt .
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
COPY . .
|
||||
EXPOSE 8000
|
||||
CMD ["uvicorn", "app.app:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||
CMD alembic upgrade head && uvicorn app.app:app --host 0.0.0.0 --port 8000
|
||||
148
7project/backend/alembic.ini
Normal file
148
7project/backend/alembic.ini
Normal file
@@ -0,0 +1,148 @@
|
||||
# A generic, single database configuration.
|
||||
|
||||
[alembic]
|
||||
# path to migration scripts.
|
||||
# this is typically a path given in POSIX (e.g. forward slashes)
|
||||
# format, relative to the token %(here)s which refers to the location of this
|
||||
# ini file
|
||||
script_location = %(here)s/alembic
|
||||
|
||||
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
||||
# Uncomment the line below if you want the files to be prepended with date and time
|
||||
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
||||
# for all available tokens
|
||||
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
||||
|
||||
# sys.path path, will be prepended to sys.path if present.
|
||||
# defaults to the current working directory. for multiple paths, the path separator
|
||||
# is defined by "path_separator" below.
|
||||
prepend_sys_path = .
|
||||
|
||||
|
||||
# timezone to use when rendering the date within the migration file
|
||||
# as well as the filename.
|
||||
# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
|
||||
# Any required deps can installed by adding `alembic[tz]` to the pip requirements
|
||||
# string value is passed to ZoneInfo()
|
||||
# leave blank for localtime
|
||||
# timezone =
|
||||
|
||||
# max length of characters to apply to the "slug" field
|
||||
# truncate_slug_length = 40
|
||||
|
||||
# set to 'true' to run the environment during
|
||||
# the 'revision' command, regardless of autogenerate
|
||||
# revision_environment = false
|
||||
|
||||
# set to 'true' to allow .pyc and .pyo files without
|
||||
# a source .py file to be detected as revisions in the
|
||||
# versions/ directory
|
||||
# sourceless = false
|
||||
|
||||
# version location specification; This defaults
|
||||
# to <script_location>/versions. When using multiple version
|
||||
# directories, initial revisions must be specified with --version-path.
|
||||
# The path separator used here should be the separator specified by "path_separator"
|
||||
# below.
|
||||
# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
|
||||
|
||||
# path_separator; This indicates what character is used to split lists of file
|
||||
# paths, including version_locations and prepend_sys_path within configparser
|
||||
# files such as alembic.ini.
|
||||
# The default rendered in new alembic.ini files is "os", which uses os.pathsep
|
||||
# to provide os-dependent path splitting.
|
||||
#
|
||||
# Note that in order to support legacy alembic.ini files, this default does NOT
|
||||
# take place if path_separator is not present in alembic.ini. If this
|
||||
# option is omitted entirely, fallback logic is as follows:
|
||||
#
|
||||
# 1. Parsing of the version_locations option falls back to using the legacy
|
||||
# "version_path_separator" key, which if absent then falls back to the legacy
|
||||
# behavior of splitting on spaces and/or commas.
|
||||
# 2. Parsing of the prepend_sys_path option falls back to the legacy
|
||||
# behavior of splitting on spaces, commas, or colons.
|
||||
#
|
||||
# Valid values for path_separator are:
|
||||
#
|
||||
# path_separator = :
|
||||
# path_separator = ;
|
||||
# path_separator = space
|
||||
# path_separator = newline
|
||||
#
|
||||
# Use os.pathsep. Default configuration used for new projects.
|
||||
path_separator = os
|
||||
|
||||
# set to 'true' to search source files recursively
|
||||
# in each "version_locations" directory
|
||||
# new in Alembic version 1.10
|
||||
# recursive_version_locations = false
|
||||
|
||||
# the output encoding used when revision files
|
||||
# are written from script.py.mako
|
||||
# output_encoding = utf-8
|
||||
|
||||
# database URL. This is consumed by the user-maintained env.py script only.
|
||||
# other means of configuring database URLs may be customized within the env.py
|
||||
# file.
|
||||
# sqlalchemy.url = driver://user:pass@localhost/dbname
|
||||
# Pro async MariaDB bude url brána z proměnné prostředí DATABASE_URL
|
||||
|
||||
|
||||
[post_write_hooks]
|
||||
# post_write_hooks defines scripts or Python functions that are run
|
||||
# on newly generated revision scripts. See the documentation for further
|
||||
# detail and examples
|
||||
|
||||
# format using "black" - use the console_scripts runner, against the "black" entrypoint
|
||||
# hooks = black
|
||||
# black.type = console_scripts
|
||||
# black.entrypoint = black
|
||||
# black.options = -l 79 REVISION_SCRIPT_FILENAME
|
||||
|
||||
# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
|
||||
# hooks = ruff
|
||||
# ruff.type = module
|
||||
# ruff.module = ruff
|
||||
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
|
||||
|
||||
# Alternatively, use the exec runner to execute a binary found on your PATH
|
||||
# hooks = ruff
|
||||
# ruff.type = exec
|
||||
# ruff.executable = ruff
|
||||
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
|
||||
|
||||
# Logging configuration. This is also consumed by the user-maintained
|
||||
# env.py script only.
|
||||
[loggers]
|
||||
keys = root,sqlalchemy,alembic
|
||||
|
||||
[handlers]
|
||||
keys = console
|
||||
|
||||
[formatters]
|
||||
keys = generic
|
||||
|
||||
[logger_root]
|
||||
level = WARNING
|
||||
handlers = console
|
||||
qualname =
|
||||
|
||||
[logger_sqlalchemy]
|
||||
level = WARNING
|
||||
handlers =
|
||||
qualname = sqlalchemy.engine
|
||||
|
||||
[logger_alembic]
|
||||
level = INFO
|
||||
handlers =
|
||||
qualname = alembic
|
||||
|
||||
[handler_console]
|
||||
class = StreamHandler
|
||||
args = (sys.stderr,)
|
||||
level = NOTSET
|
||||
formatter = generic
|
||||
|
||||
[formatter_generic]
|
||||
format = %(levelname)-5.5s [%(name)s] %(message)s
|
||||
datefmt = %H:%M:%S
|
||||
56
7project/backend/alembic/env.py
Normal file
56
7project/backend/alembic/env.py
Normal file
@@ -0,0 +1,56 @@
|
||||
import os
|
||||
import sys
|
||||
from logging.config import fileConfig
|
||||
from sqlalchemy import pool, create_engine
|
||||
from alembic import context
|
||||
|
||||
# Add path for correct loading of modules
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
|
||||
from app.core.db import Base
|
||||
|
||||
config = context.config
|
||||
if config.config_file_name is not None:
|
||||
fileConfig(config.config_file_name)
|
||||
|
||||
target_metadata = Base.metadata
|
||||
|
||||
DATABASE_URL = os.getenv("DATABASE_URL")
|
||||
if not DATABASE_URL:
|
||||
mariadb_host = os.getenv("MARIADB_HOST", "localhost")
|
||||
mariadb_port = os.getenv("MARIADB_PORT", "3306")
|
||||
mariadb_db = os.getenv("MARIADB_DB", "group_project")
|
||||
mariadb_user = os.getenv("MARIADB_USER", "root")
|
||||
mariadb_password = os.getenv("MARIADB_PASSWORD", "strongpassword")
|
||||
DATABASE_URL = f"mysql+pymysql://{mariadb_user}:{mariadb_password}@{mariadb_host}:{mariadb_port}/{mariadb_db}"
|
||||
|
||||
SYNC_DATABASE_URL = DATABASE_URL.replace("+asyncmy", "+pymysql")
|
||||
|
||||
ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
|
||||
connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
|
||||
|
||||
def run_migrations_offline() -> None:
|
||||
context.configure(
|
||||
url=SYNC_DATABASE_URL,
|
||||
target_metadata=target_metadata,
|
||||
literal_binds=True,
|
||||
dialect_opts={"paramstyle": "named"},
|
||||
)
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
def run_migrations_online() -> None:
|
||||
connectable = create_engine(SYNC_DATABASE_URL, poolclass=pool.NullPool, connect_args=connect_args)
|
||||
with connectable.connect() as connection:
|
||||
context.configure(
|
||||
connection=connection,
|
||||
target_metadata=target_metadata,
|
||||
)
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
if context.is_offline_mode():
|
||||
run_migrations_offline()
|
||||
else:
|
||||
run_migrations_online()
|
||||
28
7project/backend/alembic/script.py.mako
Normal file
28
7project/backend/alembic/script.py.mako
Normal file
@@ -0,0 +1,28 @@
|
||||
"""${message}
|
||||
|
||||
Revision ID: ${up_revision}
|
||||
Revises: ${down_revision | comma,n}
|
||||
Create Date: ${create_date}
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
${imports if imports else ""}
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = ${repr(up_revision)}
|
||||
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
|
||||
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
||||
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
${upgrades if upgrades else "pass"}
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Downgrade schema."""
|
||||
${downgrades if downgrades else "pass"}
|
||||
@@ -0,0 +1,52 @@
|
||||
"""Init migration
|
||||
|
||||
Revision ID: 81f275275556
|
||||
Revises:
|
||||
Create Date: 2025-09-24 17:39:25.346690
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
import fastapi_users_db_sqlalchemy
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = '81f275275556'
|
||||
down_revision: Union[str, Sequence[str], None] = None
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table('transaction',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('amount', sa.Float(), nullable=False),
|
||||
sa.Column('description', sa.String(length=255), nullable=True),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table('user',
|
||||
sa.Column('first_name', sa.String(length=100), nullable=True),
|
||||
sa.Column('last_name', sa.String(length=100), nullable=True),
|
||||
sa.Column('id', fastapi_users_db_sqlalchemy.generics.GUID(), nullable=False),
|
||||
sa.Column('email', sa.String(length=320), nullable=False),
|
||||
sa.Column('hashed_password', sa.String(length=1024), nullable=False),
|
||||
sa.Column('is_active', sa.Boolean(), nullable=False),
|
||||
sa.Column('is_superuser', sa.Boolean(), nullable=False),
|
||||
sa.Column('is_verified', sa.Boolean(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Downgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_index(op.f('ix_user_email'), table_name='user')
|
||||
op.drop_table('user')
|
||||
op.drop_table('transaction')
|
||||
# ### end Alembic commands ###
|
||||
0
7project/backend/app/api/__init__.py
Normal file
0
7project/backend/app/api/__init__.py
Normal file
@@ -1,9 +1,10 @@
|
||||
from fastapi import Depends, FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
|
||||
from .db import User, create_db_and_tables
|
||||
from .schemas import UserCreate, UserRead, UserUpdate
|
||||
from .users import auth_backend, current_active_verified_user, fastapi_users
|
||||
from app.models.user import User
|
||||
|
||||
from app.schemas.user import UserCreate, UserRead, UserUpdate
|
||||
from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users
|
||||
|
||||
app = FastAPI()
|
||||
|
||||
@@ -47,15 +48,9 @@ app.include_router(
|
||||
# Liveness/root endpoint
|
||||
@app.get("/", include_in_schema=False)
|
||||
async def root():
|
||||
return {"status": "ok"}
|
||||
return {"status": "ok", "message": "Welcome to the FastAPI application!"}
|
||||
|
||||
|
||||
@app.get("/authenticated-route")
|
||||
async def authenticated_route(user: User = Depends(current_active_verified_user)):
|
||||
return {"message": f"Hello {user.email}!"}
|
||||
|
||||
|
||||
@app.on_event("startup")
|
||||
async def on_startup():
|
||||
# Not needed if you setup a migration system like Alembic
|
||||
await create_db_and_tables()
|
||||
50
7project/backend/app/celery_app.py
Normal file
50
7project/backend/app/celery_app.py
Normal file
@@ -0,0 +1,50 @@
|
||||
import os
|
||||
from celery import Celery
|
||||
|
||||
if os.getenv("RABBITMQ_URL"):
|
||||
RABBITMQ_URL = os.getenv("RABBITMQ_URL") # type: ignore
|
||||
else:
|
||||
from urllib.parse import quote
|
||||
|
||||
username = os.getenv("RABBITMQ_USERNAME", "user")
|
||||
password = os.getenv("RABBITMQ_PASSWORD", "bitnami123")
|
||||
host = os.getenv("RABBITMQ_HOST", "localhost")
|
||||
port = os.getenv("RABBITMQ_PORT", "5672")
|
||||
vhost = os.getenv("RABBITMQ_VHOST", "/")
|
||||
use_ssl = os.getenv("RABBITMQ_USE_SSL", "0").lower() in {"1", "true", "yes"}
|
||||
scheme = "amqps" if use_ssl else "amqp"
|
||||
|
||||
# Kombu uses '//' to denote the default '/' vhost. For custom vhosts, URL-encode them.
|
||||
if vhost in ("/", ""):
|
||||
vhost_path = "/" # will become '//' after concatenation below
|
||||
else:
|
||||
vhost_path = f"/{quote(vhost, safe='')}"
|
||||
|
||||
# Ensure we end up with e.g. amqp://user:pass@host:5672// (for '/')
|
||||
RABBITMQ_URL = f"{scheme}://{username}:{password}@{host}:{port}{vhost_path}"
|
||||
if vhost in ("/", "") and not RABBITMQ_URL.endswith("//"):
|
||||
RABBITMQ_URL += "/"
|
||||
|
||||
DEFAULT_QUEUE = os.getenv("MAIL_QUEUE", "mail_queue")
|
||||
|
||||
CELERY_BACKEND = os.getenv("CELERY_BACKEND", "rpc://")
|
||||
|
||||
celery_app = Celery(
|
||||
"app",
|
||||
broker=RABBITMQ_URL,
|
||||
# backend=CELERY_BACKEND,
|
||||
)
|
||||
celery_app.autodiscover_tasks(["app.workers"], related_name="celery_tasks") # discover app.workers.celery_tasks
|
||||
|
||||
celery_app.set_default()
|
||||
|
||||
celery_app.conf.update(
|
||||
task_default_queue=DEFAULT_QUEUE,
|
||||
task_acks_late=True,
|
||||
worker_prefetch_multiplier=int(os.getenv("CELERY_PREFETCH", "1")),
|
||||
task_serializer="json",
|
||||
result_serializer="json",
|
||||
accept_content=["json"],
|
||||
)
|
||||
|
||||
__all__ = ["celery_app"]
|
||||
0
7project/backend/app/core/__init__.py
Normal file
0
7project/backend/app/core/__init__.py
Normal file
4
7project/backend/app/core/base.py
Normal file
4
7project/backend/app/core/base.py
Normal file
@@ -0,0 +1,4 @@
|
||||
from sqlalchemy.ext.declarative import DeclarativeMeta, declarative_base
|
||||
|
||||
Base: DeclarativeMeta = declarative_base()
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
import os
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from fastapi import Depends
|
||||
from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
||||
from sqlalchemy.ext.declarative import DeclarativeMeta, declarative_base
|
||||
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
|
||||
from app.core.base import Base
|
||||
|
||||
DATABASE_URL = os.getenv("DATABASE_URL")
|
||||
if not DATABASE_URL:
|
||||
@@ -13,21 +9,15 @@ if not DATABASE_URL:
|
||||
mariadb_db = os.getenv("MARIADB_DB", "group_project")
|
||||
mariadb_user = os.getenv("MARIADB_USER", "root")
|
||||
mariadb_password = os.getenv("MARIADB_PASSWORD", "strongpassword")
|
||||
#always use SSL except for localhost - i dont want to include certs
|
||||
if mariadb_host and mariadb_db and mariadb_user and mariadb_password:
|
||||
# Use MariaDB/MySQL over async driver
|
||||
DATABASE_URL = f"mysql+asyncmy://{mariadb_user}:{mariadb_password}@{mariadb_host}:{mariadb_port}/{mariadb_db}"
|
||||
else:
|
||||
raise Exception("Only MariaDB is supported. Please set the DATABASE_URL environment variable.")
|
||||
|
||||
Base: DeclarativeMeta = declarative_base()
|
||||
# Load all models to register them
|
||||
from app.models.user import User
|
||||
from app.models.transaction import Transaction
|
||||
|
||||
|
||||
class User(SQLAlchemyBaseUserTableUUID, Base):
|
||||
pass
|
||||
|
||||
|
||||
# Nastavení connect_args pro SSL pouze pokud není localhost
|
||||
ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
|
||||
connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
|
||||
|
||||
@@ -38,17 +28,3 @@ engine = create_async_engine(
|
||||
connect_args=connect_args,
|
||||
)
|
||||
async_session_maker = async_sessionmaker(engine, expire_on_commit=False)
|
||||
|
||||
|
||||
async def create_db_and_tables():
|
||||
async with engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
|
||||
|
||||
async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
async with async_session_maker() as session:
|
||||
yield session
|
||||
|
||||
|
||||
async def get_user_db(session: AsyncSession = Depends(get_async_session)):
|
||||
yield SQLAlchemyUserDatabase(session, User)
|
||||
6
7project/backend/app/core/queue.py
Normal file
6
7project/backend/app/core/queue.py
Normal file
@@ -0,0 +1,6 @@
|
||||
import app.celery_app # noqa: F401
|
||||
from app.workers.celery_tasks import send_email
|
||||
|
||||
|
||||
def enqueue_email(to: str, subject: str, body: str) -> None:
|
||||
send_email.delay(to, subject, body)
|
||||
0
7project/backend/app/models/__init__.py
Normal file
0
7project/backend/app/models/__init__.py
Normal file
9
7project/backend/app/models/transaction.py
Normal file
9
7project/backend/app/models/transaction.py
Normal file
@@ -0,0 +1,9 @@
|
||||
from sqlalchemy import Column, Integer, String, Float
|
||||
from app.core.base import Base
|
||||
|
||||
class Transaction(Base):
|
||||
__tablename__ = "transaction"
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
amount = Column(Float, nullable=False)
|
||||
description = Column(String(length=255), nullable=True)
|
||||
|
||||
7
7project/backend/app/models/user.py
Normal file
7
7project/backend/app/models/user.py
Normal file
@@ -0,0 +1,7 @@
|
||||
from sqlalchemy import Column, String
|
||||
from fastapi_users.db import SQLAlchemyBaseUserTableUUID
|
||||
from app.core.base import Base
|
||||
|
||||
class User(SQLAlchemyBaseUserTableUUID, Base):
|
||||
first_name = Column(String(length=100), nullable=True)
|
||||
last_name = Column(String(length=100), nullable=True)
|
||||
0
7project/backend/app/schemas/__init__.py
Normal file
0
7project/backend/app/schemas/__init__.py
Normal file
16
7project/backend/app/schemas/user.py
Normal file
16
7project/backend/app/schemas/user.py
Normal file
@@ -0,0 +1,16 @@
|
||||
import uuid
|
||||
from typing import Optional
|
||||
from fastapi_users import schemas
|
||||
|
||||
class UserRead(schemas.BaseUser[uuid.UUID]):
|
||||
first_name: Optional[str] = None
|
||||
surname: Optional[str] = None
|
||||
|
||||
class UserCreate(schemas.BaseUserCreate):
|
||||
first_name: Optional[str] = None
|
||||
surname: Optional[str] = None
|
||||
|
||||
class UserUpdate(schemas.BaseUserUpdate):
|
||||
first_name: Optional[str] = None
|
||||
surname: Optional[str] = None
|
||||
|
||||
0
7project/backend/app/services/__init__.py
Normal file
0
7project/backend/app/services/__init__.py
Normal file
14
7project/backend/app/services/db.py
Normal file
14
7project/backend/app/services/db.py
Normal file
@@ -0,0 +1,14 @@
|
||||
from typing import AsyncGenerator
|
||||
from fastapi import Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from fastapi_users.db import SQLAlchemyUserDatabase
|
||||
|
||||
from ..core.db import async_session_maker
|
||||
from ..models.user import User
|
||||
|
||||
async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
async with async_session_maker() as session:
|
||||
yield session
|
||||
|
||||
async def get_user_db(session: AsyncSession = Depends(get_async_session)):
|
||||
yield SQLAlchemyUserDatabase(session, User)
|
||||
@@ -7,23 +7,23 @@ from fastapi_users import BaseUserManager, FastAPIUsers, UUIDIDMixin
|
||||
from fastapi_users.authentication import (
|
||||
AuthenticationBackend,
|
||||
BearerTransport,
|
||||
JWTStrategy,
|
||||
)
|
||||
from fastapi_users.authentication.strategy.jwt import JWTStrategy
|
||||
from fastapi_users.db import SQLAlchemyUserDatabase
|
||||
|
||||
from .db import User, get_user_db
|
||||
from app.models.user import User
|
||||
from app.services.db import get_user_db
|
||||
from app.core.queue import enqueue_email
|
||||
|
||||
SECRET = os.getenv("SECRET", "CHANGE_ME_SECRET")
|
||||
FRONTEND_URL = os.getenv("FRONTEND_URL", "http://localhost:5173")
|
||||
BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:8000")
|
||||
|
||||
|
||||
class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
|
||||
reset_password_token_secret = SECRET
|
||||
verification_token_secret = SECRET
|
||||
|
||||
async def on_after_register(self, user: User, request: Optional[Request] = None):
|
||||
# Ask FastAPI Users to generate a verification token and trigger the hook below
|
||||
await self.request_verify(user, request)
|
||||
|
||||
async def on_after_forgot_password(
|
||||
@@ -34,7 +34,6 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
|
||||
async def on_after_request_verify(
|
||||
self, user: User, token: str, request: Optional[Request] = None
|
||||
):
|
||||
# Build verification email and send through RabbitMQ (with direct SMTP fallback)
|
||||
verify_frontend_link = f"{FRONTEND_URL}/verify?token={token}"
|
||||
verify_backend_link = f"{BACKEND_URL}/auth/verify?token={token}"
|
||||
subject = "Ověření účtu"
|
||||
@@ -47,26 +46,20 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
|
||||
"Pokud jsi registraci neprováděl(a), tento email ignoruj.\n"
|
||||
)
|
||||
try:
|
||||
from .queue import enqueue_email
|
||||
enqueue_email(to=user.email, subject=subject, body=body)
|
||||
except Exception:
|
||||
# Fallback: if queue is unavailable, log the email content (dev fallback)
|
||||
except Exception as e:
|
||||
print("[Email Fallback] To:", user.email)
|
||||
print("[Email Fallback] Subject:", subject)
|
||||
print("[Email Fallback] Body:\n", body)
|
||||
|
||||
|
||||
async def get_user_manager(user_db: SQLAlchemyUserDatabase = Depends(get_user_db)):
|
||||
yield UserManager(user_db)
|
||||
|
||||
|
||||
bearer_transport = BearerTransport(tokenUrl="auth/jwt/login")
|
||||
|
||||
|
||||
def get_jwt_strategy() -> JWTStrategy:
|
||||
return JWTStrategy(secret=SECRET, lifetime_seconds=3600)
|
||||
|
||||
|
||||
auth_backend = AuthenticationBackend(
|
||||
name="jwt",
|
||||
transport=bearer_transport,
|
||||
@@ -77,3 +70,4 @@ fastapi_users = FastAPIUsers[User, uuid.UUID](get_user_manager, [auth_backend])
|
||||
|
||||
current_active_user = fastapi_users.current_user(active=True)
|
||||
current_active_verified_user = fastapi_users.current_user(active=True, verified=True)
|
||||
|
||||
0
7project/backend/app/workers/__init__.py
Normal file
0
7project/backend/app/workers/__init__.py
Normal file
19
7project/backend/app/workers/celery_tasks.py
Normal file
19
7project/backend/app/workers/celery_tasks.py
Normal file
@@ -0,0 +1,19 @@
|
||||
import logging
|
||||
|
||||
from celery import shared_task
|
||||
|
||||
logger = logging.getLogger("celery_tasks")
|
||||
if not logger.handlers:
|
||||
_h = logging.StreamHandler()
|
||||
logger.addHandler(_h)
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
|
||||
@shared_task(name="workers.send_email")
|
||||
def send_email(to: str, subject: str, body: str) -> None:
|
||||
if not (to and subject and body):
|
||||
logger.error("Email task missing fields. to=%r subject=%r body_len=%r", to, subject, len(body) if body else 0)
|
||||
return
|
||||
|
||||
# Placeholder for real email sending logic
|
||||
logger.info("[Celery] Email sent | to=%s | subject=%s | body_len=%d", to, subject, len(body))
|
||||
@@ -1,14 +1,21 @@
|
||||
aio-pika==9.5.6
|
||||
aiormq==6.8.1
|
||||
aiosqlite==0.21.0
|
||||
alembic==1.16.5
|
||||
amqp==5.3.1
|
||||
annotated-types==0.7.0
|
||||
anyio==4.11.0
|
||||
argon2-cffi==23.1.0
|
||||
argon2-cffi-bindings==25.1.0
|
||||
asyncmy==0.2.9
|
||||
bcrypt==4.3.0
|
||||
billiard==4.2.2
|
||||
celery==5.5.3
|
||||
cffi==2.0.0
|
||||
click==8.1.8
|
||||
click-didyoumean==0.3.1
|
||||
click-plugins==1.1.1.2
|
||||
click-repl==0.3.0
|
||||
cryptography==46.0.1
|
||||
dnspython==2.7.0
|
||||
email_validator==2.2.0
|
||||
@@ -20,25 +27,37 @@ greenlet==3.2.4
|
||||
h11==0.16.0
|
||||
httptools==0.6.4
|
||||
idna==3.10
|
||||
kombu==5.5.4
|
||||
makefun==1.16.0
|
||||
Mako==1.3.10
|
||||
MarkupSafe==3.0.2
|
||||
multidict==6.6.4
|
||||
packaging==25.0
|
||||
pamqp==3.3.0
|
||||
prompt_toolkit==3.0.52
|
||||
propcache==0.3.2
|
||||
pwdlib==0.2.1
|
||||
pycparser==2.23
|
||||
pydantic==2.11.9
|
||||
pydantic_core==2.33.2
|
||||
PyJWT==2.10.1
|
||||
PyMySQL==1.1.2
|
||||
python-dateutil==2.9.0.post0
|
||||
python-dotenv==1.1.1
|
||||
python-multipart==0.0.20
|
||||
PyYAML==6.0.2
|
||||
six==1.17.0
|
||||
sniffio==1.3.1
|
||||
SQLAlchemy==2.0.43
|
||||
starlette==0.48.0
|
||||
tomli==2.2.1
|
||||
typing-inspection==0.4.1
|
||||
typing_extensions==4.15.0
|
||||
tzdata==2025.2
|
||||
uvicorn==0.37.0
|
||||
uvloop==0.21.0
|
||||
vine==5.1.0
|
||||
watchfiles==1.1.0
|
||||
wcwidth==0.2.14
|
||||
websockets==15.0.1
|
||||
yarl==1.20.1
|
||||
6
7project/charts/myapp-chart/Chart.yaml
Normal file
6
7project/charts/myapp-chart/Chart.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
apiVersion: v2
|
||||
name: myapp-chart
|
||||
version: 0.1.0
|
||||
description: Helm chart for my app with MariaDB Database CR
|
||||
appVersion: "1.0.0"
|
||||
type: application
|
||||
54
7project/charts/myapp-chart/templates/NOTES.txt
Normal file
54
7project/charts/myapp-chart/templates/NOTES.txt
Normal file
@@ -0,0 +1,54 @@
|
||||
Thank you for installing myapp-chart.
|
||||
|
||||
This chart packages all Kubernetes manifests from the original deployment directory and parameterizes environment, database name (with optional PR suffix), image, and domain for external access.
|
||||
|
||||
Namespaces per developer (important):
|
||||
- Install each developer's environment into their own namespace using Helm's -n/--namespace flag.
|
||||
- No hardcoded namespace is used in templates; resources are created in .Release.Namespace.
|
||||
- Example namespaces: dev-alice, dev-bob, pr-123, etc.
|
||||
|
||||
Key values:
|
||||
- deployment -> used as Database CR name and DB username (MARIADB_DB and MARIADB_USER)
|
||||
- image.repository/tag or image.digest -> container image
|
||||
- domain -> public FQDN used by TunnelBinding (required to expose app)
|
||||
- app/worker names, replicas, ports
|
||||
|
||||
Examples:
|
||||
- Dev install (Alice):
|
||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||
-n dev-alice --create-namespace \
|
||||
-f values-dev.yaml \
|
||||
--set domain=alice.demo.example.com \
|
||||
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
||||
--set-string database.password="$DB_PASSWORD"
|
||||
|
||||
- Dev install (Bob):
|
||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||
-n dev-bob --create-namespace \
|
||||
-f values-dev.yaml \
|
||||
--set domain=bob.demo.example.com
|
||||
|
||||
- Prod install (different cleanupPolicy):
|
||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||
-n prod --create-namespace \
|
||||
-f values-prod.yaml \
|
||||
--set domain=app.example.com
|
||||
|
||||
- PR (preview) install with DB name containing PR number (also its own namespace):
|
||||
PR=123
|
||||
helm upgrade --install myapp-pr-$PR ./7project/charts/myapp-chart \
|
||||
-n pr-$PR --create-namespace \
|
||||
-f values-dev.yaml \
|
||||
--set prNumber=$PR \
|
||||
--set deployment=preview-$PR \
|
||||
--set domain=pr-$PR.example.com
|
||||
|
||||
- Use a custom deployment identifier to suffix DB name, DB username and Secret name:
|
||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||
-n dev-alice --create-namespace \
|
||||
-f values-dev.yaml \
|
||||
--set deployment=alice \
|
||||
--set domain=alice.demo.example.com
|
||||
|
||||
Render locally (dry run):
|
||||
helm template ./7project/charts/myapp-chart -f values-dev.yaml --set prNumber=456 --set deployment=test --set domain=demo.example.com --namespace dev-test | sed -n '/kind: Database/,$p' | head -n 30
|
||||
68
7project/charts/myapp-chart/templates/app-deployment.yaml
Normal file
68
7project/charts/myapp-chart/templates/app-deployment.yaml
Normal file
@@ -0,0 +1,68 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ .Values.app.name }}
|
||||
spec:
|
||||
replicas: {{ .Values.app.replicas }}
|
||||
revisionHistoryLimit: 3
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ .Values.app.name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ .Values.app.name }}
|
||||
spec:
|
||||
containers:
|
||||
- name: {{ .Values.app.name }}
|
||||
image: "{{- if .Values.image.digest -}}{{ .Values.image.repository }}@{{ .Values.image.digest }}{{- else -}}{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}{{- end -}}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
capabilities:
|
||||
drop: ["ALL"]
|
||||
ports:
|
||||
- containerPort: {{ .Values.app.port }}
|
||||
env:
|
||||
- name: MARIADB_HOST
|
||||
value: {{ printf "%s.%s.svc.cluster.local" .Values.mariadb.mariaDbRef.name .Values.mariadb.mariaDbRef.namespace | quote }}
|
||||
- name: MARIADB_PORT
|
||||
value: '3306'
|
||||
- name: MARIADB_DB
|
||||
value: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
||||
- name: MARIADB_USER
|
||||
value: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
||||
- name: MARIADB_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ required "Set .Values.database.secretName" .Values.database.secretName }}
|
||||
key: password
|
||||
- name: RABBITMQ_USERNAME
|
||||
value: {{ .Values.rabbitmq.username | quote }}
|
||||
- name: RABBITMQ_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
|
||||
key: password
|
||||
- name: RABBITMQ_HOST
|
||||
value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
|
||||
- name: RABBITMQ_PORT
|
||||
value: {{ .Values.rabbitmq.port | quote }}
|
||||
- name: RABBITMQ_VHOST
|
||||
value: {{ .Values.rabbitmq.vhost | default "/" | quote }}
|
||||
- name: MAIL_QUEUE
|
||||
value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: {{ .Values.app.port }}
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
failureThreshold: 3
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: {{ .Values.app.port }}
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
failureThreshold: 3
|
||||
18
7project/charts/myapp-chart/templates/database-grant.yaml
Normal file
18
7project/charts/myapp-chart/templates/database-grant.yaml
Normal file
@@ -0,0 +1,18 @@
|
||||
apiVersion: k8s.mariadb.com/v1alpha1
|
||||
kind: Grant
|
||||
metadata:
|
||||
name: grant
|
||||
spec:
|
||||
mariaDbRef:
|
||||
name: {{ .Values.mariadb.mariaDbRef.name }}
|
||||
namespace: {{ .Values.mariadb.mariaDbRef.namespace }}
|
||||
privileges:
|
||||
- "ALL PRIVILEGES"
|
||||
database: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
||||
table: "*"
|
||||
username: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
||||
grantOption: true
|
||||
host: "%"
|
||||
cleanupPolicy: {{ .Values.mariadb.cleanupPolicy }}
|
||||
requeueInterval: {{ .Values.mariadb.requeueInterval | quote }}
|
||||
retryInterval: {{ .Values.mariadb.retryInterval | quote }}
|
||||
@@ -0,0 +1,7 @@
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ required "Set .Values.database.secretName" .Values.database.secretName }}
|
||||
type: kubernetes.io/basic-auth
|
||||
stringData:
|
||||
password: {{ required "Set .Values.database.password" .Values.database.password | quote }}
|
||||
16
7project/charts/myapp-chart/templates/database-user.yaml
Normal file
16
7project/charts/myapp-chart/templates/database-user.yaml
Normal file
@@ -0,0 +1,16 @@
|
||||
apiVersion: k8s.mariadb.com/v1alpha1
|
||||
kind: User
|
||||
metadata:
|
||||
name: {{ required "Set .Values.deployment" .Values.deployment }}
|
||||
spec:
|
||||
mariaDbRef:
|
||||
name: {{ .Values.mariadb.mariaDbRef.name }}
|
||||
namespace: {{ .Values.mariadb.mariaDbRef.namespace }}
|
||||
passwordSecretKeyRef:
|
||||
name: {{ required "Set .Values.database.secretName" .Values.database.secretName }}
|
||||
key: password
|
||||
maxUserConnections: 20
|
||||
host: "%"
|
||||
cleanupPolicy: {{ .Values.mariadb.cleanupPolicy }}
|
||||
requeueInterval: {{ .Values.mariadb.requeueInterval | quote }}
|
||||
retryInterval: {{ .Values.mariadb.retryInterval | quote }}
|
||||
14
7project/charts/myapp-chart/templates/database.yaml
Normal file
14
7project/charts/myapp-chart/templates/database.yaml
Normal file
@@ -0,0 +1,14 @@
|
||||
apiVersion: k8s.mariadb.com/v1alpha1
|
||||
kind: Database
|
||||
metadata:
|
||||
name: {{ required "Set .Values.deployment" .Values.deployment }}
|
||||
spec:
|
||||
mariaDbRef:
|
||||
name: {{ .Values.mariadb.mariaDbRef.name | required "Values mariadb.mariaDbRef.name is required" }}
|
||||
namespace: {{ .Values.mariadb.mariaDbRef.namespace | default .Release.Namespace }}
|
||||
characterSet: utf8
|
||||
collate: utf8_general_ci
|
||||
cleanupPolicy: {{ .Values.mariadb.cleanupPolicy }}
|
||||
requeueInterval: {{ .Values.mariadb.requeueInterval | quote }}
|
||||
retryInterval: {{ .Values.mariadb.retryInterval | quote }}
|
||||
|
||||
10
7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml
Normal file
10
7project/charts/myapp-chart/templates/rabbitmq-cluster.yaml
Normal file
@@ -0,0 +1,10 @@
|
||||
apiVersion: rabbitmq.com/v1beta1
|
||||
kind: RabbitmqCluster
|
||||
metadata:
|
||||
name: "rabbitmq-cluster"
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
replicas: {{ .Values.rabbitmq.replicas | default 1 }}
|
||||
persistence:
|
||||
storage: {{ .Values.rabbitmq.storage | default "1Gi" }}
|
||||
resources: {}
|
||||
@@ -0,0 +1,15 @@
|
||||
apiVersion: rabbitmq.com/v1beta1
|
||||
kind: Permission
|
||||
metadata:
|
||||
name: {{ printf "%s-permission" (.Values.rabbitmq.username | default "demo-app") }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
rabbitmqClusterReference:
|
||||
name: rabbitmq-cluster
|
||||
namespace: {{ .Release.Namespace }}
|
||||
vhost: {{ .Values.rabbitmq.vhost | default "/" | quote }}
|
||||
user: {{ .Values.rabbitmq.username | default "demo-app" }}
|
||||
permissions:
|
||||
configure: ".*"
|
||||
read: ".*"
|
||||
write: ".*"
|
||||
12
7project/charts/myapp-chart/templates/rabbitmq-queue.yaml
Normal file
12
7project/charts/myapp-chart/templates/rabbitmq-queue.yaml
Normal file
@@ -0,0 +1,12 @@
|
||||
apiVersion: rabbitmq.com/v1beta1
|
||||
kind: Queue
|
||||
metadata:
|
||||
name: {{ .Values.worker.mailQueueName | replace "_" "-" | lower }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
rabbitmqClusterReference:
|
||||
name: rabbitmq-cluster
|
||||
namespace: {{ .Release.Namespace }}
|
||||
name: {{ .Values.worker.mailQueueName }}
|
||||
vhost: {{ .Values.rabbitmq.vhost | default "/" | quote }}
|
||||
durable: true
|
||||
@@ -0,0 +1,10 @@
|
||||
{{- if .Values.rabbitmq.password }}
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
stringData:
|
||||
password: {{ .Values.rabbitmq.password | quote }}
|
||||
username: {{ .Values.rabbitmq.username | quote }}
|
||||
{{- end }}
|
||||
13
7project/charts/myapp-chart/templates/rabbitmq-user.yaml
Normal file
13
7project/charts/myapp-chart/templates/rabbitmq-user.yaml
Normal file
@@ -0,0 +1,13 @@
|
||||
apiVersion: rabbitmq.com/v1beta1
|
||||
kind: User
|
||||
metadata:
|
||||
name: {{ .Values.rabbitmq.username | default "demo-app" }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
rabbitmqClusterReference:
|
||||
name: rabbitmq-cluster
|
||||
namespace: {{ .Release.Namespace }}
|
||||
tags:
|
||||
- management
|
||||
importCredentialsSecret:
|
||||
name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
|
||||
10
7project/charts/myapp-chart/templates/service.yaml
Normal file
10
7project/charts/myapp-chart/templates/service.yaml
Normal file
@@ -0,0 +1,10 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ .Values.app.name }}
|
||||
spec:
|
||||
ports:
|
||||
- port: {{ .Values.service.port }}
|
||||
targetPort: {{ .Values.app.port }}
|
||||
selector:
|
||||
app: {{ .Values.app.name }}
|
||||
14
7project/charts/myapp-chart/templates/tunnel.yaml
Normal file
14
7project/charts/myapp-chart/templates/tunnel.yaml
Normal file
@@ -0,0 +1,14 @@
|
||||
apiVersion: networking.cfargotunnel.com/v1alpha1
|
||||
kind: TunnelBinding
|
||||
metadata:
|
||||
name: guestbook-tunnel-binding
|
||||
namespace: {{ .Release.Namespace }}
|
||||
subjects:
|
||||
- name: app-server
|
||||
spec:
|
||||
target: {{ printf "http://%s.%s.svc.cluster.local" .Values.app.name .Release.Namespace | quote }}
|
||||
fqdn: {{ required "Set .Values.domain via --set domain=example.com" .Values.domain | quote }}
|
||||
noTlsVerify: true
|
||||
tunnelRef:
|
||||
kind: ClusterTunnel
|
||||
name: cluster-tunnel
|
||||
48
7project/charts/myapp-chart/templates/worker-deployment.yaml
Normal file
48
7project/charts/myapp-chart/templates/worker-deployment.yaml
Normal file
@@ -0,0 +1,48 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ printf "%s-worker" .Values.app.name }}
|
||||
spec:
|
||||
replicas: {{ .Values.worker.replicas }}
|
||||
revisionHistoryLimit: 3
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ printf "%s-worker" .Values.app.name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ printf "%s-worker" .Values.app.name }}
|
||||
spec:
|
||||
containers:
|
||||
- name: {{ printf "%s-worker" .Values.app.name }}
|
||||
image: "{{- if .Values.image.digest -}}{{ .Values.image.repository }}@{{ .Values.image.digest }}{{- else -}}{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}{{- end -}}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
capabilities:
|
||||
drop: ["ALL"]
|
||||
command:
|
||||
- celery
|
||||
- -A
|
||||
- app.celery_app
|
||||
- worker
|
||||
- -Q
|
||||
- $(MAIL_QUEUE)
|
||||
- --loglevel
|
||||
- INFO
|
||||
env:
|
||||
- name: RABBITMQ_USERNAME
|
||||
value: {{ .Values.rabbitmq.username | quote }}
|
||||
- name: RABBITMQ_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
|
||||
key: password
|
||||
- name: RABBITMQ_HOST
|
||||
value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
|
||||
- name: RABBITMQ_PORT
|
||||
value: {{ .Values.rabbitmq.port | quote }}
|
||||
- name: RABBITMQ_VHOST
|
||||
value: {{ .Values.rabbitmq.vhost | default "/" | quote }}
|
||||
- name: MAIL_QUEUE
|
||||
value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}
|
||||
5
7project/charts/myapp-chart/values-dev.yaml
Normal file
5
7project/charts/myapp-chart/values-dev.yaml
Normal file
@@ -0,0 +1,5 @@
|
||||
env: dev
|
||||
|
||||
mariadb:
|
||||
cleanupPolicy: Delete
|
||||
|
||||
7
7project/charts/myapp-chart/values-prod.yaml
Normal file
7
7project/charts/myapp-chart/values-prod.yaml
Normal file
@@ -0,0 +1,7 @@
|
||||
env: prod
|
||||
|
||||
app:
|
||||
replicas: 3
|
||||
|
||||
worker:
|
||||
replicas: 3
|
||||
59
7project/charts/myapp-chart/values.yaml
Normal file
59
7project/charts/myapp-chart/values.yaml
Normal file
@@ -0,0 +1,59 @@
|
||||
# Base values shared across environments
|
||||
env: dev
|
||||
|
||||
# Optional PR number used to suffix DB name, set via --set prNumber=123 in CI
|
||||
prNumber: ""
|
||||
|
||||
# Optional deployment identifier used to suffix resource names (db, user, secret)
|
||||
# Example: --set deployment=alice or --set deployment=feature123
|
||||
deployment: ""
|
||||
|
||||
# Public domain to expose the app under (used by TunnelBinding fqdn)
|
||||
# Set at install time: --set domain=example.com
|
||||
domain: ""
|
||||
|
||||
image:
|
||||
repository: lukastrkan/cc-app-demo
|
||||
# You can use a tag or digest. If digest is provided, it takes precedence.
|
||||
digest: ""
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
app:
|
||||
name: "finance-tracker"
|
||||
replicas: 1
|
||||
port: 8000
|
||||
|
||||
worker:
|
||||
name: app-demo-worker
|
||||
replicas: 1
|
||||
# Queue name for Celery worker and for CRD Queue
|
||||
mailQueueName: "mail_queue"
|
||||
|
||||
service:
|
||||
port: 80
|
||||
|
||||
rabbitmq:
|
||||
create: true
|
||||
replicas: 1
|
||||
storage: 5Gi
|
||||
# Optional: override the generated cluster name; default is "<app.name>-rabbit[-<deployment>]"
|
||||
clusterName: ""
|
||||
port: "5672"
|
||||
username: demo-app
|
||||
password: ""
|
||||
vhost: "/"
|
||||
|
||||
mariadb:
|
||||
name: app-demo-database
|
||||
cleanupPolicy: Skip
|
||||
requeueInterval: 10h
|
||||
retryInterval: 30s
|
||||
mariaDbRef:
|
||||
name: mariadb-repl
|
||||
namespace: mariadb-operator
|
||||
|
||||
# Database access resources
|
||||
database:
|
||||
userName: app-demo-user
|
||||
secretName: app-demo-database-secret
|
||||
password: ""
|
||||
11
7project/create_migration.sh
Normal file
11
7project/create_migration.sh
Normal file
@@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo "Usage: $0 <migration_message>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd backend || { echo "Directory 'backend' does not exist"; exit 1; }
|
||||
alembic revision --autogenerate -m "$1"
|
||||
git add alembic/versions/*
|
||||
cd - || exit
|
||||
@@ -14,7 +14,7 @@ spec:
|
||||
app: app-demo
|
||||
spec:
|
||||
containers:
|
||||
- image: lukastrkan/cc-app-demo@sha256:84cbe8181c87c32579b00e44d9c15e2db6d4a5c1e73577e517832b76bf337c59
|
||||
- image: lukastrkan/cc-app-demo@sha256:75634b4d97282b6b8424fe17767c81adf44af5f7359c1d25883073b5629b3e05
|
||||
name: app-demo
|
||||
ports:
|
||||
- containerPort: 8000
|
||||
@@ -14,17 +14,28 @@ spec:
|
||||
app: app-demo-worker
|
||||
spec:
|
||||
containers:
|
||||
- image: lukastrkan/cc-app-demo@sha256:84cbe8181c87c32579b00e44d9c15e2db6d4a5c1e73577e517832b76bf337c59
|
||||
- image: lukastrkan/cc-app-demo@sha256:75634b4d97282b6b8424fe17767c81adf44af5f7359c1d25883073b5629b3e05
|
||||
name: app-demo-worker
|
||||
command:
|
||||
- python3
|
||||
- worker/email_worker.py
|
||||
- celery
|
||||
- -A
|
||||
- app.celery_app
|
||||
- worker
|
||||
- -Q
|
||||
- $(MAIL_QUEUE)
|
||||
- --loglevel
|
||||
- INFO
|
||||
env:
|
||||
- name: RABBITMQ_USERNAME
|
||||
value: demo-app
|
||||
- name: RABBITMQ_PASSWORD
|
||||
value: StrongPassword123!
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: demo-app-user-credentials
|
||||
key: password
|
||||
- name: RABBITMQ_HOST
|
||||
value: rabbitmq.rabbitmq.svc.cluster.local
|
||||
- name: RABBITMQ_PORT
|
||||
value: '5672'
|
||||
- name: RABBITMQ_VHOST
|
||||
value: "/"
|
||||
@@ -53,7 +53,8 @@ module "loadbalancer" {
|
||||
}
|
||||
|
||||
module "cert-manager" {
|
||||
source = "${path.module}/modules/cert-manager"
|
||||
source = "${path.module}/modules/cert-manager"
|
||||
depends_on = [module.loadbalancer]
|
||||
}
|
||||
|
||||
module "cloudflare" {
|
||||
@@ -67,10 +68,16 @@ module "cloudflare" {
|
||||
cloudflare_account_id = var.cloudflare_account_id
|
||||
}
|
||||
|
||||
module "monitoring" {
|
||||
source = "${path.module}/modules/prometheus"
|
||||
depends_on = [module.cloudflare]
|
||||
cloudflare_domain = var.cloudflare_domain
|
||||
}
|
||||
|
||||
|
||||
module "database" {
|
||||
source = "${path.module}/modules/maxscale"
|
||||
depends_on = [module.storage, module.loadbalancer, module.cloudflare]
|
||||
depends_on = [module.monitoring]
|
||||
|
||||
mariadb_password = var.mariadb_password
|
||||
mariadb_root_password = var.mariadb_root_password
|
||||
@@ -87,23 +94,23 @@ module "database" {
|
||||
cloudflare_domain = var.cloudflare_domain
|
||||
}
|
||||
|
||||
module "argocd" {
|
||||
source = "${path.module}/modules/argocd"
|
||||
depends_on = [module.storage, module.loadbalancer, module.cloudflare]
|
||||
#module "argocd" {
|
||||
# source = "${path.module}/modules/argocd"
|
||||
# depends_on = [module.storage, module.loadbalancer, module.cloudflare]
|
||||
|
||||
argocd_admin_password = var.argocd_admin_password
|
||||
cloudflare_domain = var.cloudflare_domain
|
||||
}
|
||||
# argocd_admin_password = var.argocd_admin_password
|
||||
# cloudflare_domain = var.cloudflare_domain
|
||||
#}
|
||||
|
||||
module "redis" {
|
||||
source = "${path.module}/modules/redis"
|
||||
depends_on = [module.storage]
|
||||
cloudflare_base_domain = var.cloudflare_domain
|
||||
}
|
||||
#module "redis" {
|
||||
# source = "${path.module}/modules/redis"
|
||||
# depends_on = [module.storage]
|
||||
# cloudflare_base_domain = var.cloudflare_domain
|
||||
#}
|
||||
|
||||
module "rabbitmq" {
|
||||
source = "${path.module}/modules/rabbitmq"
|
||||
depends_on = [module.storage]
|
||||
depends_on = [module.database]
|
||||
base_domain = var.cloudflare_domain
|
||||
rabbitmq-password = var.rabbitmq-password
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
apiVersion: networking.cfargotunnel.com/v1alpha2
|
||||
kind: ClusterTunnel
|
||||
metadata:
|
||||
name: cluster-tunnel # The ClusterTunnel Custom Resource Name
|
||||
name: cluster-tunnel
|
||||
spec:
|
||||
newTunnel:
|
||||
name: ${cloudflare_tunnel_name} # Name of your new tunnel on Cloudflare
|
||||
name: ${cloudflare_tunnel_name}
|
||||
cloudflare:
|
||||
email: ${cloudflare_email}
|
||||
domain: ${cloudflare_domain}
|
||||
@@ -41,10 +41,10 @@ resource "kubectl_manifest" "cloudflare-api-token" {
|
||||
resource "kubectl_manifest" "cloudflare-tunnel" {
|
||||
yaml_body = templatefile("${path.module}/cluster-tunnel.yaml", {
|
||||
cloudflare_tunnel_name = var.cloudflare_tunnel_name
|
||||
cloudflare_email = var.cloudflare_email
|
||||
cloudflare_domain = var.cloudflare_domain
|
||||
cloudflare_account_id = var.cloudflare_account_id
|
||||
cloudflare_email = var.cloudflare_email
|
||||
cloudflare_domain = var.cloudflare_domain
|
||||
cloudflare_account_id = var.cloudflare_account_id
|
||||
})
|
||||
|
||||
depends_on = [kustomization_resource.cloudflare]
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
apiVersion: v2
|
||||
name: maxscale-helm
|
||||
version: 1.0.2
|
||||
version: 1.0.7
|
||||
description: Helm chart for MaxScale related Kubernetes manifests
|
||||
@@ -54,6 +54,12 @@ spec:
|
||||
|
||||
metrics:
|
||||
enabled: true
|
||||
serviceMonitor:
|
||||
enabled: true
|
||||
interval: 30s
|
||||
scrapeTimeout: 10s
|
||||
prometheusRelease: kube-prometheus-stack
|
||||
jobLabel: mariadb-monitoring
|
||||
|
||||
tls:
|
||||
enabled: true
|
||||
@@ -106,7 +112,17 @@ spec:
|
||||
key: dsn
|
||||
|
||||
affinity:
|
||||
antiAffinityEnabled: true
|
||||
podAntiAffinity:
|
||||
preferredDuringSchedulingIgnoredDuringExecution:
|
||||
- weight: 100
|
||||
podAffinityTerm:
|
||||
labelSelector:
|
||||
matchExpressions:
|
||||
- key: app.kubernetes.io/name
|
||||
operator: In
|
||||
values:
|
||||
- mariadb-repl
|
||||
topologyKey: kubernetes.io/hostname
|
||||
|
||||
tolerations:
|
||||
- key: "k8s.mariadb.com/ha"
|
||||
@@ -149,6 +165,12 @@ spec:
|
||||
|
||||
metrics:
|
||||
enabled: true
|
||||
serviceMonitor:
|
||||
enabled: true
|
||||
interval: 30s
|
||||
scrapeTimeout: 10s
|
||||
prometheusRelease: kube-prometheus-stack
|
||||
jobLabel: mariadb-monitoring
|
||||
|
||||
tls:
|
||||
enabled: true
|
||||
@@ -33,7 +33,7 @@ spec:
|
||||
value: "3306"
|
||||
- name: PHPMYADMIN_ALLOW_NO_PASSWORD
|
||||
value: "false"
|
||||
image: "docker.io/bitnami/phpmyadmin:5.2.2"
|
||||
image: "bitnamilegacy/phpmyadmin:5.2.2"
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
@@ -58,7 +58,7 @@ resource "helm_release" "mariadb-operator" {
|
||||
resource "helm_release" "maxscale_helm" {
|
||||
name = "maxscale-helm"
|
||||
chart = "${path.module}/charts/maxscale-helm"
|
||||
version = "1.0.2"
|
||||
version = "1.0.7"
|
||||
depends_on = [ helm_release.mariadb-operator-crds, kubectl_manifest.secrets ]
|
||||
timeout = 3600
|
||||
|
||||
14
7project/tofu/modules/prometheus/grafana-ui.yaml
Normal file
14
7project/tofu/modules/prometheus/grafana-ui.yaml
Normal file
@@ -0,0 +1,14 @@
|
||||
apiVersion: networking.cfargotunnel.com/v1alpha1
|
||||
kind: TunnelBinding
|
||||
metadata:
|
||||
name: grafana-tunnel-binding
|
||||
namespace: monitoring
|
||||
subjects:
|
||||
- name: grafana
|
||||
spec:
|
||||
target: http://kube-prometheus-stack-grafana.monitoring.svc.cluster.local
|
||||
fqdn: grafana.${base_domain}
|
||||
noTlsVerify: true
|
||||
tunnelRef:
|
||||
kind: ClusterTunnel
|
||||
name: cluster-tunnel
|
||||
66
7project/tofu/modules/prometheus/main.tf
Normal file
66
7project/tofu/modules/prometheus/main.tf
Normal file
@@ -0,0 +1,66 @@
|
||||
terraform {
|
||||
required_providers {
|
||||
kubectl = {
|
||||
source = "gavinbunney/kubectl"
|
||||
version = "1.19.0"
|
||||
}
|
||||
helm = {
|
||||
source = "hashicorp/helm"
|
||||
version = "3.0.2"
|
||||
}
|
||||
kubernetes = {
|
||||
source = "hashicorp/kubernetes"
|
||||
version = "2.38.0"
|
||||
}
|
||||
kustomization = {
|
||||
source = "kbst/kustomization"
|
||||
version = "0.9.6"
|
||||
}
|
||||
time = {
|
||||
source = "hashicorp/time"
|
||||
version = "0.13.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Create namespace for monitoring
|
||||
resource "kubernetes_namespace" "monitoring" {
|
||||
metadata {
|
||||
name = "monitoring"
|
||||
labels = {
|
||||
"pod-security.kubernetes.io/enforce" = "privileged"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Deploy kube-prometheus-stack
|
||||
resource "helm_release" "kube_prometheus_stack" {
|
||||
name = "kube-prometheus-stack"
|
||||
repository = "https://prometheus-community.github.io/helm-charts"
|
||||
chart = "kube-prometheus-stack"
|
||||
namespace = kubernetes_namespace.monitoring.metadata[0].name
|
||||
version = "67.2.1" # Check for latest version
|
||||
|
||||
# Wait for CRDs to be created
|
||||
wait = true
|
||||
timeout = 600
|
||||
force_update = false
|
||||
recreate_pods = false
|
||||
|
||||
# Reference the values file
|
||||
values = [
|
||||
file("${path.module}/values.yaml")
|
||||
]
|
||||
|
||||
depends_on = [
|
||||
kubernetes_namespace.monitoring
|
||||
]
|
||||
}
|
||||
|
||||
resource "kubectl_manifest" "argocd-tunnel-bind" {
|
||||
depends_on = [helm_release.kube_prometheus_stack]
|
||||
|
||||
yaml_body = templatefile("${path.module}/grafana-ui.yaml", {
|
||||
base_domain = var.cloudflare_domain
|
||||
})
|
||||
}
|
||||
189
7project/tofu/modules/prometheus/values.yaml
Normal file
189
7project/tofu/modules/prometheus/values.yaml
Normal file
@@ -0,0 +1,189 @@
|
||||
# Prometheus configuration
|
||||
prometheus:
|
||||
prometheusSpec:
|
||||
retention: 30d
|
||||
retentionSize: "45GB"
|
||||
|
||||
# Storage configuration
|
||||
storageSpec:
|
||||
volumeClaimTemplate:
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 50Gi
|
||||
# storageClassName: "your-storage-class" # Uncomment and specify if needed
|
||||
|
||||
# Resource limits
|
||||
resources:
|
||||
requests:
|
||||
cpu: 500m
|
||||
memory: 2Gi
|
||||
limits:
|
||||
cpu: 2000m
|
||||
memory: 4Gi
|
||||
|
||||
# Scrape interval
|
||||
scrapeInterval: 30s
|
||||
evaluationInterval: 30s
|
||||
|
||||
# Service configuration
|
||||
service:
|
||||
type: ClusterIP
|
||||
port: 9090
|
||||
|
||||
# Ingress (disabled by default)
|
||||
ingress:
|
||||
enabled: false
|
||||
# ingressClassName: nginx
|
||||
# hosts:
|
||||
# - prometheus.example.com
|
||||
# tls:
|
||||
# - secretName: prometheus-tls
|
||||
# hosts:
|
||||
# - prometheus.example.com
|
||||
|
||||
# Grafana configuration
|
||||
grafana:
|
||||
enabled: true
|
||||
|
||||
# Admin credentials
|
||||
adminPassword: "admin" # CHANGE THIS IN PRODUCTION!
|
||||
|
||||
# Persistence
|
||||
persistence:
|
||||
enabled: true
|
||||
size: 10Gi
|
||||
# storageClassName: "your-storage-class" # Uncomment and specify if needed
|
||||
|
||||
# Resource limits
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 256Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 512Mi
|
||||
|
||||
# Service configuration
|
||||
service:
|
||||
type: ClusterIP
|
||||
port: 80
|
||||
|
||||
# Ingress (disabled by default)
|
||||
ingress:
|
||||
enabled: false
|
||||
# ingressClassName: nginx
|
||||
# hosts:
|
||||
# - grafana.example.com
|
||||
# tls:
|
||||
# - secretName: grafana-tls
|
||||
# hosts:
|
||||
# - grafana.example.com
|
||||
|
||||
# Default dashboards
|
||||
defaultDashboardsEnabled: true
|
||||
defaultDashboardsTimezone: Europe/Prague
|
||||
|
||||
# Alertmanager configuration
|
||||
alertmanager:
|
||||
enabled: true
|
||||
|
||||
alertmanagerSpec:
|
||||
# Storage configuration
|
||||
storage:
|
||||
volumeClaimTemplate:
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 10Gi
|
||||
# storageClassName: "your-storage-class" # Uncomment and specify if needed
|
||||
|
||||
# Resource limits
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 256Mi
|
||||
|
||||
# Service configuration
|
||||
service:
|
||||
type: ClusterIP
|
||||
port: 9093
|
||||
|
||||
# Ingress (disabled by default)
|
||||
ingress:
|
||||
enabled: false
|
||||
# ingressClassName: nginx
|
||||
# hosts:
|
||||
# - alertmanager.example.com
|
||||
# tls:
|
||||
# - secretName: alertmanager-tls
|
||||
# hosts:
|
||||
# - alertmanager.example.com
|
||||
|
||||
# Alertmanager configuration
|
||||
config:
|
||||
global:
|
||||
resolve_timeout: 5m
|
||||
|
||||
route:
|
||||
group_by: [ 'alertname', 'cluster', 'service' ]
|
||||
group_wait: 10s
|
||||
group_interval: 10s
|
||||
repeat_interval: 12h
|
||||
receiver: 'null'
|
||||
routes:
|
||||
- match:
|
||||
alertname: Watchdog
|
||||
receiver: 'null'
|
||||
|
||||
receivers:
|
||||
- name: 'null'
|
||||
# Add your receivers here (email, slack, pagerduty, etc.)
|
||||
# - name: 'slack'
|
||||
# slack_configs:
|
||||
# - api_url: 'YOUR_SLACK_WEBHOOK_URL'
|
||||
# channel: '#alerts'
|
||||
# title: '{{ range .Alerts }}{{ .Annotations.summary }}\n{{ end }}'
|
||||
# text: '{{ range .Alerts }}{{ .Annotations.description }}\n{{ end }}'
|
||||
|
||||
# Node Exporter
|
||||
nodeExporter:
|
||||
enabled: true
|
||||
|
||||
# Kube State Metrics
|
||||
kubeStateMetrics:
|
||||
enabled: true
|
||||
|
||||
# Prometheus Operator
|
||||
prometheusOperator:
|
||||
enabled: true
|
||||
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 256Mi
|
||||
|
||||
# Service Monitors
|
||||
# Automatically discover and monitor services with appropriate labels
|
||||
prometheus-node-exporter:
|
||||
prometheus:
|
||||
monitor:
|
||||
enabled: true
|
||||
|
||||
# Additional ServiceMonitors can be defined here
|
||||
# additionalServiceMonitors: []
|
||||
|
||||
# Global settings
|
||||
global:
|
||||
rbac:
|
||||
create: true
|
||||
5
7project/tofu/modules/prometheus/variables.tf
Normal file
5
7project/tofu/modules/prometheus/variables.tf
Normal file
@@ -0,0 +1,5 @@
|
||||
variable "cloudflare_domain" {
|
||||
type = string
|
||||
default = "Base cloudflare domain, e.g. example.com"
|
||||
nullable = false
|
||||
}
|
||||
85
7project/tofu/modules/rabbitmq/main.tf
Normal file
85
7project/tofu/modules/rabbitmq/main.tf
Normal file
@@ -0,0 +1,85 @@
|
||||
terraform {
|
||||
required_providers {
|
||||
kubectl = {
|
||||
source = "gavinbunney/kubectl"
|
||||
version = "1.19.0"
|
||||
}
|
||||
helm = {
|
||||
source = "hashicorp/helm"
|
||||
version = "3.0.2" # Doporučuji použít novější verzi providera
|
||||
}
|
||||
kubernetes = {
|
||||
source = "hashicorp/kubernetes"
|
||||
version = "2.38.0" # Doporučuji použít novější verzi providera
|
||||
}
|
||||
# Ostatní provideři mohou zůstat
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
resource "helm_release" "rabbitmq_operator" {
|
||||
name = "rabbitmq-cluster-operator"
|
||||
repository = "oci://registry-1.docker.io/bitnamicharts"
|
||||
chart = "rabbitmq-cluster-operator"
|
||||
|
||||
version = "4.4.34"
|
||||
|
||||
namespace = "rabbitmq-system"
|
||||
create_namespace = true
|
||||
|
||||
# Zde můžete přepsat výchozí hodnoty chartu, pokud by bylo potřeba
|
||||
# Například sledovat jen určité namespace, nastavit tolerations atd.
|
||||
# Pro základní instalaci není potřeba nic měnit.
|
||||
# values = [
|
||||
# templatefile("${path.module}/values/operator-values.yaml", {})
|
||||
# ]
|
||||
set = [
|
||||
{
|
||||
name = "rabbitmqImage.repository"
|
||||
value = "bitnamilegacy/rabbitmq"
|
||||
},
|
||||
{
|
||||
name = "clusterOperator.image.repository"
|
||||
value = "bitnamilegacy/rabbitmq-cluster-operator"
|
||||
},
|
||||
{
|
||||
name = "msgTopologyOperator.image.repository"
|
||||
value = "bitnamilegacy/rmq-messaging-topology-operator"
|
||||
},
|
||||
{
|
||||
name = "credentialUpdaterImage.repository"
|
||||
value = "bitnamilegacy/rmq-default-credential-updater"
|
||||
},
|
||||
{
|
||||
name = "clusterOperator.metrics.service.enabled"
|
||||
value = "true"
|
||||
},
|
||||
{
|
||||
name = "clusterOperator.metrics.service.enabled"
|
||||
value = "true"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
||||
resource "kubectl_manifest" "rabbitmq_cluster" {
|
||||
yaml_body = templatefile("${path.module}/rabbit-cluster.yaml", {
|
||||
replicas = var.rabbitmq_replicas
|
||||
password = var.rabbitmq-password
|
||||
})
|
||||
|
||||
depends_on = [
|
||||
helm_release.rabbitmq_operator
|
||||
]
|
||||
}
|
||||
|
||||
resource "kubectl_manifest" "rabbit_ui" {
|
||||
yaml_body = templatefile("${path.module}/rabbit-ui.yaml", {
|
||||
base_domain = var.base_domain
|
||||
})
|
||||
|
||||
depends_on = [
|
||||
kubectl_manifest.rabbitmq_cluster
|
||||
]
|
||||
}
|
||||
5
7project/tofu/modules/rabbitmq/rabbit-cluster.yaml
Normal file
5
7project/tofu/modules/rabbitmq/rabbit-cluster.yaml
Normal file
@@ -0,0 +1,5 @@
|
||||
apiVersion: rabbitmq.com/v1beta1
|
||||
kind: RabbitmqCluster
|
||||
metadata:
|
||||
name: 'rabbitmq-cluster'
|
||||
namespace: "rabbitmq"
|
||||
@@ -6,7 +6,7 @@ metadata:
|
||||
subjects:
|
||||
- name: rabbit-gui
|
||||
spec:
|
||||
target: http://rabbitmq.rabbitmq.svc.cluster.local:15672
|
||||
target: http://rabbitmq-cluster.rabbitmq.svc.cluster.local:15672
|
||||
fqdn: rabbitmq.${base_domain}
|
||||
noTlsVerify: true
|
||||
tunnelRef:
|
||||
@@ -4,8 +4,14 @@ variable "base_domain" {
|
||||
}
|
||||
|
||||
variable "rabbitmq-password" {
|
||||
type = string
|
||||
nullable = false
|
||||
sensitive = true
|
||||
type = string
|
||||
nullable = false
|
||||
sensitive = true
|
||||
description = "Admin password for RabbitMQ user"
|
||||
}
|
||||
|
||||
variable "rabbitmq_replicas" {
|
||||
type = number
|
||||
description = "Number of replicas for the RabbitMQ cluster"
|
||||
default = 1
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user