diff --git a/deployment_files/global/v1.0dev/profiles/genesis.yaml b/deployment_files/global/v1.0dev/profiles/genesis.yaml index 6494f289..fe0eb095 100644 --- a/deployment_files/global/v1.0dev/profiles/genesis.yaml +++ b/deployment_files/global/v1.0dev/profiles/genesis.yaml @@ -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 diff --git a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml index c6f90bf4..8fd4a3c8 100644 --- a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml @@ -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,6 @@ data: required: - hostname - ip - - armada - images - labels additionalProperties: false diff --git a/deployment_files/site/demo/networks/common-addresses.yaml b/deployment_files/site/demo/networks/common-addresses.yaml index 4440f113..a74b7aec 100644 --- a/deployment_files/site/demo/networks/common-addresses.yaml +++ b/deployment_files/site/demo/networks/common-addresses.yaml @@ -56,6 +56,7 @@ data: dns: cluster_domain: cluster.local + node_domain: gate.local service_ip: 10.96.0.10 upstream_servers: - 8.8.8.8 diff --git a/deployment_files/site/dev-proxy/networks/common-addresses.yaml b/deployment_files/site/dev-proxy/networks/common-addresses.yaml index 7c63fdef..de87d489 100644 --- a/deployment_files/site/dev-proxy/networks/common-addresses.yaml +++ b/deployment_files/site/dev-proxy/networks/common-addresses.yaml @@ -56,6 +56,7 @@ data: dns: cluster_domain: cluster.local + node_domain: gate.local service_ip: 10.96.0.10 upstream_servers: - 8.8.8.8 diff --git a/deployment_files/site/dev/networks/common-addresses.yaml b/deployment_files/site/dev/networks/common-addresses.yaml index 4440f113..a74b7aec 100644 --- a/deployment_files/site/dev/networks/common-addresses.yaml +++ b/deployment_files/site/dev/networks/common-addresses.yaml @@ -56,6 +56,7 @@ data: dns: cluster_domain: cluster.local + node_domain: gate.local service_ip: 10.96.0.10 upstream_servers: - 8.8.8.8