fix: Support setting node domains: add node_domain to other sites
Adding node_domain to other sites to make promenade render documents w/o errors [0]. [0] http://lists.airshipit.org/pipermail/airship-discuss/2018-October/000147.html Depends-On: Ie5890cd3b962f69429b93ee182ef25dd788f8b94 Change-Id: I418cb43dfbe67dab1d20ebeefada16c4c45c7bb2
This commit is contained in:
parent
1e43bdcbc6
commit
cf3b7938d7
|
@ -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
|
||||||
|
|
|
@ -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,6 @@ data:
|
||||||
required:
|
required:
|
||||||
- hostname
|
- hostname
|
||||||
- ip
|
- ip
|
||||||
- armada
|
|
||||||
- images
|
- images
|
||||||
- labels
|
- labels
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
|
|
@ -56,6 +56,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:
|
||||||
- 8.8.8.8
|
- 8.8.8.8
|
||||||
|
|
|
@ -56,6 +56,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:
|
||||||
- 8.8.8.8
|
- 8.8.8.8
|
||||||
|
|
|
@ -56,6 +56,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:
|
||||||
- 8.8.8.8
|
- 8.8.8.8
|
||||||
|
|
Loading…
Reference in New Issue