Browse Source

Update to set the apiserver command

Sets the apiserver command for use during genesis to refect the service
cidr and service node port range to match Treasuremap conventions (and
fix a failing genesis process)

Change-Id: Id1745d7734901e071e0889fe2a3dc00982156d44
Bryan Strassner 5 months ago
parent
commit
7a9db79c8e

+ 25
- 0
deployment_files/global/v1.0demo/profiles/genesis.yaml View File

@@ -67,7 +67,32 @@ metadata:
67 67
         path: .dns.node_domain
68 68
       dest:
69 69
         path: .domain
70
+
71
+    # Command prefix
72
+    - src:
73
+        schema: pegleg/CommonAddresses/v1
74
+        name: common-addresses
75
+        path: .kubernetes.service_cidr
76
+      dest:
77
+        path: .apiserver.command_prefix[1]
78
+        pattern: SERVICE_CIDR
79
+    - src:
80
+        schema: pegleg/CommonAddresses/v1
81
+        name: common-addresses
82
+        path: .kubernetes.service_node_port_range
83
+      dest:
84
+        path: .apiserver.command_prefix[2]
85
+        pattern: SERVICE_NODE_PORT_RANGE
86
+
70 87
 data:
88
+  apiserver:
89
+    command_prefix:
90
+      - /apiserver
91
+      - --service-cluster-ip-range=SERVICE_CIDR
92
+      - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93
+      - --authorization-mode=Node,RBAC
94
+      - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
95
+      - --endpoint-reconciler-type=lease
71 96
   armada:
72 97
     target_manifest: cluster-bootstrap
73 98
   labels:

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

@@ -67,7 +67,32 @@ metadata:
67 67
         path: .dns.node_domain
68 68
       dest:
69 69
         path: .domain
70
+
71
+    # Command prefix
72
+    - src:
73
+        schema: pegleg/CommonAddresses/v1
74
+        name: common-addresses
75
+        path: .kubernetes.service_cidr
76
+      dest:
77
+        path: .apiserver.command_prefix[1]
78
+        pattern: SERVICE_CIDR
79
+    - src:
80
+        schema: pegleg/CommonAddresses/v1
81
+        name: common-addresses
82
+        path: .kubernetes.service_node_port_range
83
+      dest:
84
+        path: .apiserver.command_prefix[2]
85
+        pattern: SERVICE_NODE_PORT_RANGE
86
+
70 87
 data:
88
+  apiserver:
89
+    command_prefix:
90
+      - /apiserver
91
+      - --service-cluster-ip-range=SERVICE_CIDR
92
+      - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93
+      - --authorization-mode=Node,RBAC
94
+      - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
95
+      - --endpoint-reconciler-type=lease
71 96
   armada:
72 97
     target_manifest: cluster-bootstrap
73 98
   labels:

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

@@ -141,3 +141,4 @@ data:
141 141
     - images
142 142
     - labels
143 143
   additionalProperties: false
144
+...

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

@@ -77,6 +77,7 @@ data:
77 77
     service_cidr: 10.96.0.0/16
78 78
     apiserver_port: 6443
79 79
     haproxy_port: 6553
80
+    service_node_port_range: 30000-32767
80 81
 
81 82
   etcd:
82 83
     container_port: 2379

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

@@ -77,6 +77,7 @@ data:
77 77
     service_cidr: 10.96.0.0/16
78 78
     apiserver_port: 6443
79 79
     haproxy_port: 6553
80
+    service_node_port_range: 30000-32767
80 81
 
81 82
   etcd:
82 83
     container_port: 2379

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

@@ -77,6 +77,7 @@ data:
77 77
     service_cidr: 10.96.0.0/16
78 78
     apiserver_port: 6443
79 79
     haproxy_port: 6553
80
+    service_node_port_range: 30000-32767
80 81
 
81 82
   etcd:
82 83
     container_port: 2379

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

@@ -35,6 +35,7 @@ data:
35 35
     service_cidr: 10.96.0.0/16
36 36
     apiserver_port: 6443
37 37
     haproxy_port: 6553
38
+    service_node_port_range: 30000-32767
38 39
 
39 40
   etcd:
40 41
     container_port: 2379

Loading…
Cancel
Save