Support setting node domains

Change-Id: Ie5890cd3b962f69429b93ee182ef25dd788f8b94
This commit is contained in:
Scott Hussey 2018-09-21 14:40:59 +00:00
parent b857672967
commit 1e93afe00d
4 changed files with 28 additions and 8 deletions

View File

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

View File

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

View File

@ -15,7 +15,7 @@ data:
- path: /opt/promjoin.sh - path: /opt/promjoin.sh
type: file type: file
permissions: '555' 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: location_pipeline:
- template - template
data_pipeline: data_pipeline:

View File

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