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
This commit is contained in:
Bryan Strassner 2018-11-06 16:48:16 -06:00
parent b01454859f
commit 7a9db79c8e
7 changed files with 55 additions and 0 deletions

View File

@ -67,7 +67,32 @@ metadata:
path: .dns.node_domain
dest:
path: .domain
# Command prefix
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .kubernetes.service_cidr
dest:
path: .apiserver.command_prefix[1]
pattern: SERVICE_CIDR
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .kubernetes.service_node_port_range
dest:
path: .apiserver.command_prefix[2]
pattern: SERVICE_NODE_PORT_RANGE
data:
apiserver:
command_prefix:
- /apiserver
- --service-cluster-ip-range=SERVICE_CIDR
- --service-node-port-range=SERVICE_NODE_PORT_RANGE
- --authorization-mode=Node,RBAC
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
- --endpoint-reconciler-type=lease
armada:
target_manifest: cluster-bootstrap
labels:

View File

@ -67,7 +67,32 @@ metadata:
path: .dns.node_domain
dest:
path: .domain
# Command prefix
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .kubernetes.service_cidr
dest:
path: .apiserver.command_prefix[1]
pattern: SERVICE_CIDR
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .kubernetes.service_node_port_range
dest:
path: .apiserver.command_prefix[2]
pattern: SERVICE_NODE_PORT_RANGE
data:
apiserver:
command_prefix:
- /apiserver
- --service-cluster-ip-range=SERVICE_CIDR
- --service-node-port-range=SERVICE_NODE_PORT_RANGE
- --authorization-mode=Node,RBAC
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
- --endpoint-reconciler-type=lease
armada:
target_manifest: cluster-bootstrap
labels:

View File

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

View File

@ -77,6 +77,7 @@ data:
service_cidr: 10.96.0.0/16
apiserver_port: 6443
haproxy_port: 6553
service_node_port_range: 30000-32767
etcd:
container_port: 2379

View File

@ -77,6 +77,7 @@ data:
service_cidr: 10.96.0.0/16
apiserver_port: 6443
haproxy_port: 6553
service_node_port_range: 30000-32767
etcd:
container_port: 2379

View File

@ -77,6 +77,7 @@ data:
service_cidr: 10.96.0.0/16
apiserver_port: 6443
haproxy_port: 6553
service_node_port_range: 30000-32767
etcd:
container_port: 2379

View File

@ -35,6 +35,7 @@ data:
service_cidr: 10.96.0.0/16
apiserver_port: 6443
haproxy_port: 6553
service_node_port_range: 30000-32767
etcd:
container_port: 2379