From 7a9db79c8ef5c2a6dce08cf9dbdf4de3fdd36fba Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Tue, 6 Nov 2018 16:48:16 -0600 Subject: [PATCH] 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 --- .../global/v1.0demo/profiles/genesis.yaml | 25 +++++++++++++++++++ .../global/v1.0dev/profiles/genesis.yaml | 25 +++++++++++++++++++ .../v1.0dev/schemas/promenade/Genesis/v1.yaml | 1 + .../site/demo/networks/common-addresses.yaml | 1 + .../dev-proxy/networks/common-addresses.yaml | 1 + .../site/dev/networks/common-addresses.yaml | 1 + .../networks/common-addresses.yaml | 1 + 7 files changed, 55 insertions(+) diff --git a/deployment_files/global/v1.0demo/profiles/genesis.yaml b/deployment_files/global/v1.0demo/profiles/genesis.yaml index cfbc04c8..7420a83a 100644 --- a/deployment_files/global/v1.0demo/profiles/genesis.yaml +++ b/deployment_files/global/v1.0demo/profiles/genesis.yaml @@ -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: diff --git a/deployment_files/global/v1.0dev/profiles/genesis.yaml b/deployment_files/global/v1.0dev/profiles/genesis.yaml index fe0eb095..0d3f8dc6 100644 --- a/deployment_files/global/v1.0dev/profiles/genesis.yaml +++ b/deployment_files/global/v1.0dev/profiles/genesis.yaml @@ -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: 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 8fd4a3c8..12f9b5b5 100644 --- a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml @@ -141,3 +141,4 @@ data: - 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 a74b7aec..9792c420 100644 --- a/deployment_files/site/demo/networks/common-addresses.yaml +++ b/deployment_files/site/demo/networks/common-addresses.yaml @@ -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 diff --git a/deployment_files/site/dev-proxy/networks/common-addresses.yaml b/deployment_files/site/dev-proxy/networks/common-addresses.yaml index de87d489..4e824f5c 100644 --- a/deployment_files/site/dev-proxy/networks/common-addresses.yaml +++ b/deployment_files/site/dev-proxy/networks/common-addresses.yaml @@ -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 diff --git a/deployment_files/site/dev/networks/common-addresses.yaml b/deployment_files/site/dev/networks/common-addresses.yaml index a74b7aec..9792c420 100644 --- a/deployment_files/site/dev/networks/common-addresses.yaml +++ b/deployment_files/site/dev/networks/common-addresses.yaml @@ -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 diff --git a/deployment_files/site/gate-multinode/networks/common-addresses.yaml b/deployment_files/site/gate-multinode/networks/common-addresses.yaml index 99efb1de..9c50fd59 100644 --- a/deployment_files/site/gate-multinode/networks/common-addresses.yaml +++ b/deployment_files/site/gate-multinode/networks/common-addresses.yaml @@ -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