openstack
/
magnum
Code Issues Proposed changes

[k8s-atomic] Support master_lb_allowed_cidrs in template 

In I157a3b01d169e550e79b94316803fde8ddf77b03, support for
master_lb_allowed_cidrs  was introduced but only for the fedora coreos
driver. However, this parameter is also supplied to fedora atomic
clusters but the template does not expect this parameter. As a result,
cluster creation fails due to backward incompatibility. This PS
addresses this issue.

Task: 40632
Story: 2007478

Change-Id: Ia781288f7aa35146582b10d5762aa05e3b107dce
(cherry picked from commit ffed883959)
This commit is contained in:
Bharat Kunwar 2020-08-07 15:18:32 +00:00
parent 34468cf03d
commit 3e4cac2bee
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/user/index.rst
View File

@ -1529,8 +1529,8 @@ _`master_lb_floating_ip_enabled`
_`master_lb_allowed_cidrs`
A CIDR list which can be used to control the access for the load balancer of
master nodes. The input format is comma delimited list. For example,
192.168.0.0/16,10.0.0.0/24. Default value is "" which means opening to
0.0.0.0/0.
192.168.0.0/16,10.0.0.0/24.
Default: "" (which opens to 0.0.0.0/0)
_`auto_healing_enabled`
If set to true, auto healing feature will be enabled. Defaults to false.

7
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -920,6 +920,11 @@ parameters:
specific configs
default: ""
master_lb_allowed_cidrs:
type: comma_delimited_list
description: The allowed CIDR list for master load balancer
default: []
resources:
######################################################################
@ -949,6 +954,7 @@ resources:
external_network: {get_param: external_network}
protocol: {get_param: loadbalancing_protocol}
port: {get_param: kubernetes_port}
allowed_cidrs: {get_param: master_lb_allowed_cidrs}
etcd_lb:
condition: create_cluster_resources
@ -957,6 +963,7 @@ resources:
fixed_subnet: {get_attr: [network, fixed_subnet]}
protocol: {get_param: loadbalancing_protocol}
port: 2379
allowed_cidrs: {get_param: master_lb_allowed_cidrs}
######################################################################
#