Browse Source

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
Roman Gorshunov 6 months ago
parent
commit
cf3b7938d7

+ 6
- 0
deployment_files/global/v1.0dev/profiles/genesis.yaml View File

@@ -61,6 +61,12 @@ metadata:
61 61
         path: .genesis.ip
62 62
       dest:
63 63
         path: .ip
64
+    - src:
65
+        schema: pegleg/CommonAddresses/v1
66
+        name: common-addresses
67
+        path: .dns.node_domain
68
+      dest:
69
+        path: .domain
64 70
 data:
65 71
   armada:
66 72
     target_manifest: cluster-bootstrap

+ 19
- 7
deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml View File

@@ -57,6 +57,22 @@ data:
57 57
 
58 58
   type: object
59 59
   properties:
60
+    armada:
61
+      type: object
62
+      properties:
63
+        target_manifest:
64
+          type: string
65
+      additionalProperties: false
66
+
67
+    apiserver:
68
+      type: object
69
+      properties:
70
+        command_prefix:
71
+          type: array
72
+          items:
73
+            type: string
74
+      additionalProperties: false
75
+
60 76
     files:
61 77
       type: array
62 78
       items:
@@ -65,15 +81,12 @@ data:
65 81
     hostname:
66 82
       $ref: '#/definitions/hostname'
67 83
 
84
+    domain:
85
+      type: string
86
+
68 87
     ip:
69 88
       $ref: '#/definitions/ip_address'
70 89
 
71
-    armada:
72
-      properties:
73
-        target_manifest:
74
-          type: string
75
-      additionalProperties: false
76
-
77 90
     labels:
78 91
       properties:
79 92
         static:
@@ -125,7 +138,6 @@ data:
125 138
   required:
126 139
     - hostname
127 140
     - ip
128
-    - armada
129 141
     - images
130 142
     - labels
131 143
   additionalProperties: false

+ 1
- 0
deployment_files/site/demo/networks/common-addresses.yaml View File

@@ -56,6 +56,7 @@ data:
56 56
 
57 57
   dns:
58 58
     cluster_domain: cluster.local
59
+    node_domain: gate.local
59 60
     service_ip: 10.96.0.10
60 61
     upstream_servers:
61 62
       - 8.8.8.8

+ 1
- 0
deployment_files/site/dev-proxy/networks/common-addresses.yaml View File

@@ -56,6 +56,7 @@ data:
56 56
 
57 57
   dns:
58 58
     cluster_domain: cluster.local
59
+    node_domain: gate.local
59 60
     service_ip: 10.96.0.10
60 61
     upstream_servers:
61 62
       - 8.8.8.8

+ 1
- 0
deployment_files/site/dev/networks/common-addresses.yaml View File

@@ -56,6 +56,7 @@ data:
56 56
 
57 57
   dns:
58 58
     cluster_domain: cluster.local
59
+    node_domain: gate.local
59 60
     service_ip: 10.96.0.10
60 61
     upstream_servers:
61 62
       - 8.8.8.8

Loading…
Cancel
Save