Merge branch 'master' into develop #126

Merged
metal3d merged 11 commits from develop into master 2025-07-04 12:53:00 +00:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit c97b398914 - Show all commits

View File

@@ -172,12 +172,13 @@ services:
katenary.v3/ingress: |-
hostname: myapp.example.com
port: 80
# make adaptations, DB_HOST environment is actually the service name
katenary.v3/map-env: |-
# make adaptations, DB_HOST environment is actually the service name
DB_HOST: '{{ .Release.Name }}-database'
# get the values from the "database" service
# this will use the database secrets and environment,
# see the "database" service to see the values
katenary.v3/values-from: |-
# get the values from the "database" service
# this will use the databas secret, see below
DB_USER: databse.MARIADB_USER
DB_PASSWORD: database.MARIADB_PASSWORD

View File

@@ -338,9 +338,9 @@
MARIADB_USER: myuser
MARIADB_PASSWORD: mypassword
labels:
# it can be a secret
# we can declare secrets
{{ .KatenaryPrefix }}/secrets: |-
- DB_PASSWORD
- MARIADB_PASSWORD
php:
image: php:7.4-fpm
environment: