mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 15:12:08 +01:00
Compare commits
21 Commits
3b6b64d472
...
d593f7a994
| Author | SHA1 | Date | |
|---|---|---|---|
| d593f7a994 | |||
| ef5b3f2d30 | |||
| 60109c4a35 | |||
| b6f9ee8fc7 | |||
| 52333b24d5 | |||
| 8929920072 | |||
| cdb6cf5e20 | |||
| 5190e9c48e | |||
| 815bf7f065 | |||
| 85a390565a | |||
| 20d26b7edc | |||
| 579dda50b9 | |||
| 4f7d30daf6 | |||
| 49c96187c9 | |||
| d1feafd4ef | |||
| efb454ba99 | |||
| 810f1ccb32 | |||
| c4afdf5ad2 | |||
| c290a109b6 | |||
| 7c161f6f37 | |||
| c4991ea3c4 |
41
.github/workflows/deploy-pr.yaml
vendored
41
.github/workflows/deploy-pr.yaml
vendored
@@ -20,13 +20,26 @@ jobs:
|
|||||||
pr_number: ${{ github.event.pull_request.number }}
|
pr_number: ${{ github.event.pull_request.number }}
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
|
get_urls:
|
||||||
|
if: github.event.action != 'closed'
|
||||||
|
name: Generate Preview URLs
|
||||||
|
uses: ./.github/workflows/url_generator.yml
|
||||||
|
with:
|
||||||
|
runner: vhs
|
||||||
|
mode: pr
|
||||||
|
pr_number: ${{ github.event.pull_request.number }}
|
||||||
|
base_domain: ${{ vars.DEV_BASE_DOMAIN }}
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
if: github.event.action != 'closed'
|
if: github.event.action != 'closed'
|
||||||
name: Frontend - Build and Deploy to Cloudflare Pages (PR)
|
name: Frontend - Build and Deploy to Cloudflare Pages (PR)
|
||||||
|
needs: [get_urls]
|
||||||
uses: ./.github/workflows/frontend-pages.yml
|
uses: ./.github/workflows/frontend-pages.yml
|
||||||
with:
|
with:
|
||||||
mode: pr
|
mode: pr
|
||||||
pr_number: ${{ github.event.pull_request.number }}
|
pr_number: ${{ github.event.pull_request.number }}
|
||||||
|
backend_url_scheme: ${{ needs.get_urls.outputs.backend_url_scheme }}
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
@@ -36,7 +49,7 @@ jobs:
|
|||||||
concurrency:
|
concurrency:
|
||||||
group: pr-${{ github.event.pull_request.number }}
|
group: pr-${{ github.event.pull_request.number }}
|
||||||
cancel-in-progress: false
|
cancel-in-progress: false
|
||||||
needs: [build, frontend]
|
needs: [build, frontend, get_urls]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -62,25 +75,24 @@ jobs:
|
|||||||
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
||||||
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
||||||
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
||||||
IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
|
|
||||||
DIGEST: ${{ needs.build.outputs.digest }}
|
DIGEST: ${{ needs.build.outputs.digest }}
|
||||||
|
DOMAIN: "${{ needs.get_urls.outputs.backend_url }}"
|
||||||
|
DOMAIN_SCHEME: "${{ needs.get_urls.outputs.backend_url_scheme }}"
|
||||||
|
FRONTEND_DOMAIN: "${{ needs.get_urls.outputs.frontend_url }}"
|
||||||
|
FRONTEND_DOMAIN_SCHEME: "${{ needs.get_urls.outputs.frontend_url_scheme }}"
|
||||||
run: |
|
run: |
|
||||||
PR=${{ github.event.pull_request.number }}
|
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
|
RELEASE=myapp-pr-$PR
|
||||||
NAMESPACE=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 \
|
helm upgrade --install "$RELEASE" ./7project/charts/myapp-chart \
|
||||||
-n "$NAMESPACE" --create-namespace \
|
-n "$NAMESPACE" --create-namespace \
|
||||||
-f 7project/charts/myapp-chart/values-dev.yaml \
|
-f 7project/charts/myapp-chart/values-dev.yaml \
|
||||||
--set prNumber="$PR" \
|
--set prNumber="$PR" \
|
||||||
--set deployment="pr-$PR" \
|
--set deployment="pr-$PR" \
|
||||||
--set domain="$DOMAIN" \
|
--set domain="$DOMAIN" \
|
||||||
--set image.repository="$IMAGE_REPO" \
|
--set domain_scheme="$DOMAIN_SCHEME" \
|
||||||
|
--set frontend_domain="$FRONTEND_DOMAIN" \
|
||||||
|
--set frontend_domain_scheme="$FRONTEND_DOMAIN_SCHEME" \
|
||||||
--set image.digest="$DIGEST" \
|
--set image.digest="$DIGEST" \
|
||||||
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
||||||
--set-string database.password="$DB_PASSWORD"
|
--set-string database.password="$DB_PASSWORD"
|
||||||
@@ -88,19 +100,16 @@ jobs:
|
|||||||
- name: Post preview URLs as PR comment
|
- name: Post preview URLs as PR comment
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v7
|
||||||
env:
|
env:
|
||||||
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
BACKEND_URL: ${{ needs.get_urls.outputs.backend_url_scheme }}
|
||||||
FRONTEND_URL: ${{ needs.frontend.outputs.deployed_url }}
|
FRONTEND_URL: ${{ needs.get_urls.outputs.frontend_url_scheme }}
|
||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
const pr = context.payload.pull_request;
|
const pr = context.payload.pull_request;
|
||||||
if (!pr) { core.setFailed('No pull_request context'); return; }
|
if (!pr) { core.setFailed('No pull_request context'); return; }
|
||||||
const prNumber = pr.number;
|
const prNumber = pr.number;
|
||||||
const domainBase = process.env.DEV_BASE_DOMAIN;
|
const backendUrl = process.env.BACKEND_URL || '(not available)';
|
||||||
if (!domainBase) { core.setFailed('DEV_BASE_DOMAIN is required'); return; }
|
|
||||||
const backendDomain = `pr-${prNumber}.${domainBase}`;
|
|
||||||
const backendUrl = `https://${backendDomain}`;
|
|
||||||
const frontendUrl = process.env.FRONTEND_URL || '(not available)';
|
const frontendUrl = process.env.FRONTEND_URL || '(not available)';
|
||||||
const marker = '<!-- preview-link -->';
|
const marker = '<!-- preview-comment-marker -->';
|
||||||
const body = `${marker}\nPreview environment is running\n- Frontend: ${frontendUrl}\n- Backend: ${backendUrl}\n`;
|
const body = `${marker}\nPreview environment is running\n- Frontend: ${frontendUrl}\n- Backend: ${backendUrl}\n`;
|
||||||
const { owner, repo } = context.repo;
|
const { owner, repo } = context.repo;
|
||||||
const { data: comments } = await github.rest.issues.listComments({ owner, repo, issue_number: prNumber, per_page: 100 });
|
const { data: comments } = await github.rest.issues.listComments({ owner, repo, issue_number: prNumber, per_page: 100 });
|
||||||
|
|||||||
41
.github/workflows/deploy-prod.yaml
vendored
41
.github/workflows/deploy-prod.yaml
vendored
@@ -30,17 +30,28 @@ jobs:
|
|||||||
context: 7project/backend
|
context: 7project/backend
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
|
get_urls:
|
||||||
|
name: Generate Production URLs
|
||||||
|
uses: ./.github/workflows/url_generator.yml
|
||||||
|
with:
|
||||||
|
mode: prod
|
||||||
|
runner: vhs
|
||||||
|
base_domain: ${{ vars.PROD_DOMAIN }}
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
name: Frontend - Build and Deploy to Cloudflare Pages (prod)
|
name: Frontend - Build and Deploy to Cloudflare Pages (prod)
|
||||||
|
needs: [get_urls]
|
||||||
uses: ./.github/workflows/frontend-pages.yml
|
uses: ./.github/workflows/frontend-pages.yml
|
||||||
with:
|
with:
|
||||||
mode: prod
|
mode: prod
|
||||||
|
backend_url_scheme: ${{ needs.get_urls.outputs.backend_url_scheme }}
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
name: Helm upgrade/install (prod)
|
name: Helm upgrade/install (prod)
|
||||||
runs-on: vhs
|
runs-on: vhs
|
||||||
needs: [build, frontend]
|
needs: [build, frontend, get_urls]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -63,25 +74,31 @@ jobs:
|
|||||||
|
|
||||||
- name: Helm upgrade/install prod
|
- name: Helm upgrade/install prod
|
||||||
env:
|
env:
|
||||||
DOMAIN: ${{ secrets.PROD_DOMAIN }}
|
DOMAIN: ${{ needs.get_urls.outputs.backend_url }}
|
||||||
|
DOMAIN_SCHEME: ${{ needs.get_urls.outputs.backend_url_scheme }}
|
||||||
|
FRONTEND_DOMAIN: ${{ needs.get_urls.outputs.frontend_url }}
|
||||||
|
FRONTEND_DOMAIN_SCHEME: ${{ needs.get_urls.outputs.frontend_url_scheme }}
|
||||||
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
||||||
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
||||||
IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
|
|
||||||
DIGEST: ${{ needs.build.outputs.digest }}
|
DIGEST: ${{ needs.build.outputs.digest }}
|
||||||
|
BANKID_CLIENT_ID: ${{ secrets.BANKID_CLIENT_ID }}
|
||||||
|
BANKID_CLIENT_SECRET: ${{ secrets.BANKID_CLIENT_SECRET }}
|
||||||
|
MOJEID_CLIENT_ID: ${{ secrets.MOJEID_CLIENT_ID }}
|
||||||
|
MOJEID_CLIENT_SECRET: ${{ secrets.MOJEID_CLIENT_SECRET }}
|
||||||
|
|
||||||
run: |
|
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 \
|
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||||
-n prod --create-namespace \
|
-n prod --create-namespace \
|
||||||
-f 7project/charts/myapp-chart/values-prod.yaml \
|
-f 7project/charts/myapp-chart/values-prod.yaml \
|
||||||
--set deployment="prod" \
|
--set deployment="prod" \
|
||||||
--set domain="$DOMAIN" \
|
--set domain="$DOMAIN" \
|
||||||
--set image.repository="$IMAGE_REPO" \
|
--set domain_scheme="$DOMAIN_SCHEME" \
|
||||||
|
--set frontend_domain="$FRONTEND_DOMAIN" \
|
||||||
|
--set frontend_domain_scheme="$FRONTEND_DOMAIN_SCHEME" \
|
||||||
--set image.digest="$DIGEST" \
|
--set image.digest="$DIGEST" \
|
||||||
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
||||||
--set-string database.password="$DB_PASSWORD"
|
--set-string database.password="$DB_PASSWORD" \
|
||||||
|
--set-string oauth.bankid.clientId="$BANKID_CLIENT_ID" \
|
||||||
|
--set-string oauth.bankid.clientSecret="$BANKID_CLIENT_SECRET" \
|
||||||
|
--set-string oauth.mojeid.clientId="$MOJEID_CLIENT_ID" \
|
||||||
|
--set-string oauth.mojeid.clientSecret="$MOJEID_CLIENT_SECRET"
|
||||||
57
.github/workflows/frontend-pages.yml
vendored
57
.github/workflows/frontend-pages.yml
vendored
@@ -15,6 +15,10 @@ on:
|
|||||||
description: 'Cloudflare Pages project name (overrides default)'
|
description: 'Cloudflare Pages project name (overrides default)'
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
|
backend_url_scheme:
|
||||||
|
description: 'The full scheme URL for the backend (e.g., https://api.example.com)'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
secrets:
|
secrets:
|
||||||
CLOUDFLARE_API_TOKEN:
|
CLOUDFLARE_API_TOKEN:
|
||||||
required: true
|
required: true
|
||||||
@@ -25,14 +29,6 @@ on:
|
|||||||
description: 'URL of deployed frontend'
|
description: 'URL of deployed frontend'
|
||||||
value: ${{ jobs.deploy.outputs.deployed_url }}
|
value: ${{ jobs.deploy.outputs.deployed_url }}
|
||||||
|
|
||||||
# Required repository secrets:
|
|
||||||
# CLOUDFLARE_API_TOKEN - API token with Pages:Edit (or Account:Workers Scripts:Edit) permissions
|
|
||||||
# CLOUDFLARE_ACCOUNT_ID - Your Cloudflare account ID
|
|
||||||
# Optional repository variables:
|
|
||||||
# CF_PAGES_PROJECT_NAME - Default Cloudflare Pages project name
|
|
||||||
# PROD_DOMAIN - App domain for prod releases (e.g., api.example.com or https://api.example.com)
|
|
||||||
# BACKEND_URL_PR_TEMPLATE - Template for PR backend URL. Use {PR} placeholder for PR number (e.g., https://api-pr-{PR}.example.com)
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build frontend
|
name: Build frontend
|
||||||
@@ -54,50 +50,9 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
|
||||||
- name: Compute backend URL for Vite
|
- name: Set backend URL from workflow input
|
||||||
id: be
|
|
||||||
env:
|
|
||||||
EVENT_NAME: ${{ github.event_name }}
|
|
||||||
PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
|
|
||||||
PR_TEMPLATE: ${{ vars.BACKEND_URL_PR_TEMPLATE }}
|
|
||||||
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
|
||||||
PROD_DOMAIN_VAR: ${{ vars.PROD_DOMAIN }}
|
|
||||||
PROD_DOMAIN_SECRET: ${{ secrets.PROD_DOMAIN }}
|
|
||||||
BACKEND_URL_OVERRIDE: ${{ vars.BACKEND_URL || secrets.BACKEND_URL }}
|
|
||||||
MODE: ${{ inputs.mode }}
|
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
echo "VITE_BACKEND_URL=${{ inputs.backend_url_scheme }}" >> $GITHUB_ENV
|
||||||
URL=""
|
|
||||||
# 1) Explicit override wins (from repo var or secret)
|
|
||||||
if [ -n "${BACKEND_URL_OVERRIDE:-}" ]; then
|
|
||||||
if echo "$BACKEND_URL_OVERRIDE" | grep -Eiq '^https?://'; then
|
|
||||||
URL="$BACKEND_URL_OVERRIDE"
|
|
||||||
else
|
|
||||||
URL="https://${BACKEND_URL_OVERRIDE}"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# 2) PR-specific URL when building for PR
|
|
||||||
if [ "${MODE:-}" = "pr" ] || [ "${EVENT_NAME}" = "pull_request" ]; then
|
|
||||||
if [ -n "${PR_TEMPLATE:-}" ] && [ -n "${PR_NUMBER:-}" ] ; then
|
|
||||||
URL="${PR_TEMPLATE//\{PR\}/${PR_NUMBER}}"
|
|
||||||
elif [ -n "${DEV_BASE_DOMAIN:-}" ] && [ -n "${PR_NUMBER:-}" ]; then
|
|
||||||
URL="https://pr-${PR_NUMBER}.${DEV_BASE_DOMAIN}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# 3) Fallback to PROD_DOMAIN (prefer repo var, then secret)
|
|
||||||
if [ -z "$URL" ]; then
|
|
||||||
PROD_DOMAIN="${PROD_DOMAIN_VAR:-${PROD_DOMAIN_SECRET:-}}"
|
|
||||||
if [ -n "$PROD_DOMAIN" ]; then
|
|
||||||
if echo "$PROD_DOMAIN" | grep -Eiq '^https?://'; then
|
|
||||||
URL="$PROD_DOMAIN"
|
|
||||||
else
|
|
||||||
URL="https://${PROD_DOMAIN}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
echo "Using backend URL: ${URL:-<empty>}"
|
|
||||||
echo "VITE_BACKEND_URL=${URL}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|||||||
74
.github/workflows/url_generator.yml
vendored
Normal file
74
.github/workflows/url_generator.yml
vendored
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
name: Generate Preview or Production URLs
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
mode:
|
||||||
|
description: "Build mode: 'prod' or 'pr'"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
pr_number:
|
||||||
|
description: 'PR number (required when mode=pr)'
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
runner:
|
||||||
|
description: 'The runner to use for this job'
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
default: 'ubuntu-latest'
|
||||||
|
base_domain:
|
||||||
|
description: 'The base domain for production URLs (e.g., example.com)'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
backend_url:
|
||||||
|
description: "The backend URL without scheme (e.g., api.example.com)"
|
||||||
|
value: ${{ jobs.generate-urls.outputs.backend_url }}
|
||||||
|
frontend_url:
|
||||||
|
description: "The frontend URL without scheme (e.g., app.example.com)"
|
||||||
|
value: ${{ jobs.generate-urls.outputs.frontend_url }}
|
||||||
|
backend_url_scheme:
|
||||||
|
description: "The backend URL with scheme (e.g., https://api.example.com)"
|
||||||
|
value: ${{ jobs.generate-urls.outputs.backend_url_scheme }}
|
||||||
|
frontend_url_scheme:
|
||||||
|
description: "The frontend URL with scheme (e.g., https://app.example.com)"
|
||||||
|
value: ${{ jobs.generate-urls.outputs.frontend_url_scheme }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
generate-urls:
|
||||||
|
permissions:
|
||||||
|
contents: none
|
||||||
|
runs-on: ${{ inputs.runner }}
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
backend_url: ${{ steps.set_urls.outputs.backend_url }}
|
||||||
|
frontend_url: ${{ steps.set_urls.outputs.frontend_url }}
|
||||||
|
backend_url_scheme: ${{ steps.set_urls.outputs.backend_url_scheme }}
|
||||||
|
frontend_url_scheme: ${{ steps.set_urls.outputs.frontend_url_scheme }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Generate URLs
|
||||||
|
id: set_urls
|
||||||
|
env:
|
||||||
|
BASE_DOMAIN: ${{ inputs.base_domain }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
if [ "${{ inputs.mode }}" = "prod" ]; then
|
||||||
|
BACKEND_URL="api.${BASE_DOMAIN}"
|
||||||
|
FRONTEND_URL="finance.${BASE_DOMAIN}"
|
||||||
|
else
|
||||||
|
# This is your current logic
|
||||||
|
FRONTEND_URL="pr-${{ inputs.pr_number }}.group-8-frontend.pages.dev"
|
||||||
|
BACKEND_URL="api-pr-${{ inputs.pr_number }}.${BASE_DOMAIN}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
FRONTEND_URL_SCHEME="https://$FRONTEND_URL"
|
||||||
|
BACKEND_URL_SCHEME="https://$BACKEND_URL"
|
||||||
|
|
||||||
|
# This part correctly writes to GITHUB_OUTPUT for the step
|
||||||
|
echo "backend_url_scheme=$BACKEND_URL_SCHEME" >> $GITHUB_OUTPUT
|
||||||
|
echo "frontend_url_scheme=$FRONTEND_URL_SCHEME" >> $GITHUB_OUTPUT
|
||||||
|
echo "backend_url=$BACKEND_URL" >> $GITHUB_OUTPUT
|
||||||
|
echo "frontend_url=$FRONTEND_URL" >> $GITHUB_OUTPUT
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -29,21 +29,27 @@ spec:
|
|||||||
- name: MARIADB_PORT
|
- name: MARIADB_PORT
|
||||||
value: '3306'
|
value: '3306'
|
||||||
- name: MARIADB_DB
|
- name: MARIADB_DB
|
||||||
value: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MARIADB_DB
|
||||||
- name: MARIADB_USER
|
- name: MARIADB_USER
|
||||||
value: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MARIADB_USER
|
||||||
- name: MARIADB_PASSWORD
|
- name: MARIADB_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ required "Set .Values.database.secretName" .Values.database.secretName }}
|
name: prod
|
||||||
key: password
|
key: MARIADB_PASSWORD
|
||||||
- name: RABBITMQ_USERNAME
|
- name: RABBITMQ_USERNAME
|
||||||
value: {{ .Values.rabbitmq.username | quote }}
|
value: {{ .Values.rabbitmq.username | quote }}
|
||||||
- name: RABBITMQ_PASSWORD
|
- name: RABBITMQ_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
|
name: prod
|
||||||
key: password
|
key: RABBITMQ_PASSWORD
|
||||||
- name: RABBITMQ_HOST
|
- name: RABBITMQ_HOST
|
||||||
value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
|
value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
|
||||||
- name: RABBITMQ_PORT
|
- name: RABBITMQ_PORT
|
||||||
@@ -52,6 +58,34 @@ spec:
|
|||||||
value: {{ .Values.rabbitmq.vhost | default "/" | quote }}
|
value: {{ .Values.rabbitmq.vhost | default "/" | quote }}
|
||||||
- name: MAIL_QUEUE
|
- name: MAIL_QUEUE
|
||||||
value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}
|
value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}
|
||||||
|
- name: MOJEID_CLIENT_ID
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MOJEID_CLIENT_ID
|
||||||
|
- name: MOJEID_CLIENT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MOJEID_CLIENT_SECRET
|
||||||
|
- name: BANKID_CLIENT_ID
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: BANKID_CLIENT_ID
|
||||||
|
- name: BANKID_CLIENT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: BANKID_CLIENT_SECRET
|
||||||
|
- name: DOMAIN
|
||||||
|
value: {{ required "Set .Values.domain" .Values.domain | quote }}
|
||||||
|
- name: DOMAIN_SCHEME
|
||||||
|
value: {{ required "Set .Values.domain_scheme" .Values.domain_scheme | quote }}
|
||||||
|
- name: FRONTEND_DOMAIN
|
||||||
|
value: {{ required "Set .Values.frontend_domain" .Values.frontend_domain | quote }}
|
||||||
|
- name: FRONTEND_DOMAIN_SCHEME
|
||||||
|
value: {{ required "Set .Values.frontend_domain_scheme" .Values.frontend_domain_scheme | quote }}
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|||||||
17
7project/charts/myapp-chart/templates/prod.yaml
Normal file
17
7project/charts/myapp-chart/templates/prod.yaml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Secret
|
||||||
|
metadata:
|
||||||
|
name: prod
|
||||||
|
type: Opaque
|
||||||
|
stringData:
|
||||||
|
MOJEID_CLIENT_ID: {{ .Values.oauth.mojeid.clientId | quote }}
|
||||||
|
MOJEID_CLIENT_SECRET: {{ .Values.oauth.mojeid.clientSecret | quote }}
|
||||||
|
BANKID_CLIENT_ID: {{ .Values.oauth.bankid.clientId | quote }}
|
||||||
|
BANKID_CLIENT_SECRET: {{ .Values.oauth.bankid.clientSecret | quote }}
|
||||||
|
# Database credentials
|
||||||
|
MARIADB_DB: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
||||||
|
MARIADB_USER: {{ required "Set .Values.deployment" .Values.deployment | quote }}
|
||||||
|
MARIADB_PASSWORD: {{ .Values.database.password | default "" | quote }}
|
||||||
|
# RabbitMQ credentials
|
||||||
|
RABBITMQ_PASSWORD: {{ .Values.rabbitmq.password | default "" | quote }}
|
||||||
|
RABBITMQ_USERNAME: {{ .Values.rabbitmq.username | quote }}
|
||||||
@@ -31,13 +31,32 @@ spec:
|
|||||||
- --loglevel
|
- --loglevel
|
||||||
- INFO
|
- INFO
|
||||||
env:
|
env:
|
||||||
|
- name: MARIADB_HOST
|
||||||
|
value: "mariadb-repl-maxscale-internal.mariadb-operator.svc.cluster.local"
|
||||||
|
- name: MARIADB_PORT
|
||||||
|
value: '3306'
|
||||||
|
- name: MARIADB_DB
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MARIADB_DB
|
||||||
|
- name: MARIADB_USER
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MARIADB_USER
|
||||||
|
- name: MARIADB_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: MARIADB_PASSWORD
|
||||||
- name: RABBITMQ_USERNAME
|
- name: RABBITMQ_USERNAME
|
||||||
value: {{ .Values.rabbitmq.username | quote }}
|
value: {{ .Values.rabbitmq.username | quote }}
|
||||||
- name: RABBITMQ_PASSWORD
|
- name: RABBITMQ_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
|
name: prod
|
||||||
key: password
|
key: RABBITMQ_PASSWORD
|
||||||
- name: RABBITMQ_HOST
|
- name: RABBITMQ_HOST
|
||||||
value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
|
value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
|
||||||
- name: RABBITMQ_PORT
|
- name: RABBITMQ_PORT
|
||||||
|
|||||||
@@ -11,6 +11,10 @@ deployment: ""
|
|||||||
# Public domain to expose the app under (used by TunnelBinding fqdn)
|
# Public domain to expose the app under (used by TunnelBinding fqdn)
|
||||||
# Set at install time: --set domain=example.com
|
# Set at install time: --set domain=example.com
|
||||||
domain: ""
|
domain: ""
|
||||||
|
domain_scheme: ""
|
||||||
|
|
||||||
|
frontend_domain: ""
|
||||||
|
frontend_domain_scheme: ""
|
||||||
|
|
||||||
image:
|
image:
|
||||||
repository: lukastrkan/cc-app-demo
|
repository: lukastrkan/cc-app-demo
|
||||||
@@ -33,6 +37,14 @@ worker:
|
|||||||
service:
|
service:
|
||||||
port: 80
|
port: 80
|
||||||
|
|
||||||
|
oauth:
|
||||||
|
bankid:
|
||||||
|
clientId: ""
|
||||||
|
clientSecret: ""
|
||||||
|
mojeid:
|
||||||
|
clientId: ""
|
||||||
|
clientSecret: ""
|
||||||
|
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
create: true
|
create: true
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
|||||||
Reference in New Issue
Block a user