Merge "Support setting node domains"

This commit is contained in:
Zuul 2018-10-15 14:53:39 +00:00 committed by Gerrit Code Review
commit fb33c90205
4 changed files with 28 additions and 8 deletions

View File

@ -61,6 +61,12 @@ metadata:
path: .genesis.ip
dest:
path: .ip
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.node_domain
dest:
path: .domain
data:
armada:
target_manifest: cluster-bootstrap

View File

@ -57,6 +57,22 @@ data:
type: object
properties:
armada:
type: object
properties:
target_manifest:
type: string
additionalProperties: false
apiserver:
type: object
properties:
command_prefix:
type: array
items:
type: string
additionalProperties: false
files:
type: array
items:
@ -65,15 +81,12 @@ data:
hostname:
$ref: '#/definitions/hostname'
domain:
type: string
ip:
$ref: '#/definitions/ip_address'
armada:
properties:
target_manifest:
type: string
additionalProperties: false
labels:
properties:
static:
@ -125,7 +138,7 @@ data:
required:
- hostname
- ip
- armada
- images
- labels
additionalProperties: false
...

View File

@ -15,7 +15,7 @@ data:
- path: /opt/promjoin.sh
type: file
permissions: '555'
location: promenade+http://promenade-api.ucp.svc.cluster.local/api/v1.0/join-scripts?design_ref={{ action.design_ref | urlencode }}&hostname={{ node.hostname }}&ip={{ node.network.default.ip }}{% for k, v in node.labels.items() %}&labels.dynamic={{ k }}={{ v }}{% endfor %}
location: promenade+http://promenade-api.ucp.svc.cluster.local/api/v1.0/join-scripts?design_ref={{ action.design_ref | urlencode }}&hostname={{ node.hostname }}&ip={{ node.network.default.ip }}&domain={{ node.domain }}{% for k, v in node.labels.items() %}&labels.dynamic={{ k }}={{ v }}{% endfor %}
location_pipeline:
- template
data_pipeline:

View File

@ -15,6 +15,7 @@ data:
dns:
cluster_domain: cluster.local
node_domain: gate.local
service_ip: 10.96.0.10
upstream_servers:
- 172.24.1.9