diff --git a/fragments/configure-kubernetes-master.sh b/fragments/configure-kubernetes-master.sh index ed0192e..b035c0c 100644 --- a/fragments/configure-kubernetes-master.sh +++ b/fragments/configure-kubernetes-master.sh @@ -10,6 +10,7 @@ sed -i ' sed -i ' /^KUBE_API_ADDRESS=/ s/=.*/="--address=0.0.0.0"/ + /^KUBE_SERVICE_ADDRESSES=/ s/=.*/="--portal_net='"$PORTAL_NETWORK_CIDR"'"/ ' /etc/kubernetes/apiserver sed -i ' diff --git a/fragments/write-heat-params-master.yaml b/fragments/write-heat-params-master.yaml index bfaeac6..0def123 100644 --- a/fragments/write-heat-params-master.yaml +++ b/fragments/write-heat-params-master.yaml @@ -11,3 +11,4 @@ write_files: FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR" FLANNEL_NETWORK_SUBNETLEN="$FLANNEL_NETWORK_SUBNETLEN" FLANNEL_USE_VXLAN="$FLANNEL_USE_VXLAN" + PORTAL_NETWORK_CIDR="$PORTAL_NETWORK_CIDR" diff --git a/kubecluster.yaml b/kubecluster.yaml index 1f6a932..bd1cd6c 100644 --- a/kubecluster.yaml +++ b/kubecluster.yaml @@ -44,12 +44,18 @@ parameters: fixed_network_cidr: type: string description: network range for fixed ip network - default: 10.0.0.0/24 + default: "10.0.0.0/24" + + portal_network_cidr: + type: string + description: > + address range used by kubernetes for service portals + default: "10.254.0.0/16" flannel_network_cidr: type: string description: network range for flannel overlay network - default: 10.100.0.0/16 + default: "10.100.0.0/16" flannel_network_subnetlen: type: string @@ -181,6 +187,7 @@ resources: "$FLANNEL_NETWORK_CIDR": {get_param: flannel_network_cidr} "$FLANNEL_NETWORK_SUBNETLEN": {get_param: flannel_network_subnetlen} "$FLANNEL_USE_VXLAN": {get_param: flannel_use_vxlan} + "$PORTAL_NETWORK_CIDR": {get_param: portal_network_cidr} configure_kubernetes: type: "OS::Heat::SoftwareConfig"