Skip to content

Commit

Permalink
Fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gerrit91
Gerrit91 committed Jun 3, 2024
1 parent a1fbc59 commit 90a9688
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 16 deletions.
19 changes: 10 additions & 9 deletions control-plane/roles/metal/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya
### metal-api

| Name | Mandatory | Description |
|-------------------------------------|-----------|------------------------------------------------------------------------------------------------|
| ----------------------------------- | --------- | ---------------------------------------------------------------------------------------------- |
| metal_api_replicas | | The number of deployed replicas of the metal-api |
| metal_api_hpa_enabled | | Enables horizontal pod autoscaling for the metal-api |
| metal_api_hpa_max | | Max amount of replicas for the HPA of the metal-api |
Expand All @@ -63,7 +63,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya
| metal_api_dex_clientid | | The trusted dex clientid |
| metal_api_db_address | | The URL of the metal-db |
| metal_api_db_password | | The password of the metal-db |
| metal_api_ipam_grpc_server_endpoint | | The grpc endpoint address of the ipam grpc service |
| metal_api_ipam_grpc_server_endpoint | | The grpc endpoint address of the ipam grpc service (requires scheme) |
| metal_api_nsq_lookupd_address | | The http address of nsqlookupd (only used for in-cluster traffic) |
| metal_api_nsq_tcp_address | | The tcp address of nsqd |
| metal_api_nsq_http_address | | The http address of nsqd (only used for in-cluster traffic) |
Expand Down Expand Up @@ -129,13 +129,14 @@ You can look up all the default values of this role [here](defaults/main/main.ya

### ipam

| Name | Mandatory | Description |
|------------------|-----------|---------------------------------------|
| ipam_db_host | | The hostname of the ipam service |
| ipam_db_port | | The port of the ipam service |
| ipam_db_name | | The database name of the ipam service |
| ipam_db_user | | The user of the ipam service |
| ipam_db_password | | The password of the ipam service |
| Name | Mandatory | Description |
| ---------------------- | --------- | --------------------------------------------------------------------------------- |
| metal_ipam_db_address | | The hostname of the ipam service |
| metal_ipam_db_port | | The port of the ipam service |
| metal_ipam_db_name | | The database name of the ipam service |
| metal_ipam_db_user | | The user of the ipam service |
| metal_ipam_db_password | | The password of the ipam service |
| metal_ipam_log_level | | The log level for the ipam service (metal_log_level is not used for this service) |

### Ingress

Expand Down
5 changes: 3 additions & 2 deletions control-plane/roles/metal/defaults/main/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ metal_api_dex_address: ""
metal_api_dex_clientid: ""
metal_api_db_address: metal-db
metal_api_db_password: change-me
metal_api_ipam_grpc_server_endpoint: ipam
metal_api_ipam_grpc_server_endpoint: http://ipam:9090
metal_api_nsq_tcp_address: "{{ metal_control_plane_ingress_dns }}:4150"
metal_api_nsq_http_address: "nsqd:4151"
metal_api_nsq_lookupd_address: "nsq-lookupd:4161"
Expand Down Expand Up @@ -78,11 +78,12 @@ metal_masterdata_api_projects: []

# ipam
metal_ipam_image_pull_policy: "{{ metal_control_plane_image_pull_policy }}"
metal_ipam_db_host: ipam-db
metal_ipam_db_address: ipam-db
metal_ipam_db_port: 5432
metal_ipam_db_name: ipam
metal_ipam_db_user: postgres
metal_ipam_db_password: change-me
metal_ipam_log_level: debug

# metal-console
metal_console_image_pull_policy: "{{ metal_control_plane_image_pull_policy }}"
Expand Down
15 changes: 10 additions & 5 deletions control-plane/roles/metal/templates/metal-values.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,19 @@ ports:
masterdata_api_metrics: {{ metal_masterdata_api_metrics_port }}
metal_console: {{ metal_console_port }}

ipam:
db_host: "{{ metal_ipam_db_address }}"
db_port: "{{ metal_ipam_db_port }}"
db_name: "{{ metal_ipam_db_name }}"
db_user: "{{ metal_ipam_db_user }}"
db_password: "{{ metal_ipam_db_password }}"
log_level: "{{ metal_ipam_log_level }}"

metal_api:
db_address: "{{ metal_api_db_address }}"
db_password: "{{ metal_api_db_password }}"
ipam_db_address: "{{ metal_api_ipam_db_address }}"
ipam_db_port: "{{ metal_api_ipam_db_port }}"
ipam_db_name: "{{ metal_api_ipam_db_name }}"
ipam_db_user: "{{ metal_api_ipam_db_user }}"
ipam_db_password: "{{ metal_api_ipam_db_password }}"
ipam_grpc_server_endpoint: "{{ metal_api_ipam_grpc_server_endpoint }}"

nsq:
lookupd_address: "{{ metal_api_nsq_lookupd_address }}"
tcp_address: "{{ metal_api_nsq_tcp_address }}"
Expand Down

0 comments on commit 90a9688

Please sign in to comment.