Merge Develop to prepare V3 #77

Merged
metal3d merged 98 commits from develop into master 2024-10-29 16:45:05 +00:00
Showing only changes of commit 6ce52cc037 - Show all commits

View File

@@ -83,7 +83,8 @@ services:
environment: environment:
MYSQL_ROOT_PASSWORD: foobar MYSQL_ROOT_PASSWORD: foobar
labels: labels:
katenary.io/ports: 3306 katenary.v3/ports: |-
- 3306
``` ```
### Declare ingresses ### Declare ingresses
@@ -97,7 +98,9 @@ services:
image: ... image: ...
ports: 8080:5050 ports: 8080:5050
labels: labels:
katenary.io/ingress: 5050 katenary.v3/ingress: |-
port: 5050
hostname: myapp.example.com
``` ```
Note that the port to bind is the one used by the container, not the used locally. This is because Katenary create a service to bind the container itself. Note that the port to bind is the one used by the container, not the used locally. This is because Katenary create a service to bind the container itself.
@@ -130,7 +133,7 @@ services:
environment: environment:
DB_HOST: database DB_HOST: database
labels: labels:
katenary.io/mapenv: | katenary.v3/mapenv: |-
DB_HOST: "{{ .Release.Name }}-database" DB_HOST: "{{ .Release.Name }}-database"
database: database:
@@ -138,7 +141,7 @@ services:
``` ```
!!! Warning !!! Warning
This is a "multiline" label that accepts YAML or JSON content, don't forget to add a pipe char (`|`) and to indent your content This is a "multiline" label that accepts YAML or JSON content, don't forget to add a pipe char (`|` or `|-`) and to **indent** your content
This label can be used to map others environment for any others reason. E.g. to change an informational environment variable. This label can be used to map others environment for any others reason. E.g. to change an informational environment variable.
@@ -150,7 +153,7 @@ services:
environment: environment:
RUNNING: docker RUNNING: docker
labels: labels:
katenary.io/mapenv: | katenary.v3/mapenv: |-
RUNNING: kubernetes RUNNING: kubernetes
``` ```