diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml index d929f0edda..8a78d46d6c 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml @@ -544,6 +544,7 @@ resources: fixed_network: {get_resource: fixed_network} fixed_subnet: {get_resource: fixed_subnet} network_driver: {get_param: network_driver} + flannel_network_cidr: {get_param: flannel_network_cidr} kube_master_ip: {get_attr: [api_address_lb_switch, private_ip]} etcd_server_ip: {get_attr: [etcd_address_lb_switch, private_ip]} external_network: {get_param: external_network} diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml index a3f5607944..c0acc46065 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml @@ -42,12 +42,10 @@ parameters: flannel_network_cidr: type: string description: network range for flannel overlay network - default: 10.100.0.0/16 flannel_network_subnetlen: type: number description: size of subnet assigned to each master - default: 24 flannel_network_subnet_min: type: string @@ -74,14 +72,12 @@ parameters: tls_disabled: type: boolean description: whether or not to enable TLS - default: False kubernetes_port: type: number description: > The port which are used by kube-apiserver to provide Kubernetes service. - default: 6443 kube_version: type: string @@ -306,6 +302,8 @@ resources: - {get_param: secgroup_kube_master_id} fixed_ips: - subnet: {get_param: fixed_subnet} + allowed_address_pairs: + - ip_address: {get_param: flannel_network_cidr} replacement_policy: AUTO kube_master_floating: diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml index 89b222c30a..6131281c5a 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml @@ -84,6 +84,10 @@ parameters: type: string description: network driver to use for instantiating container networks + flannel_network_cidr: + type: string + description: network range for flannel overlay network + wait_condition_timeout: type: number description : > @@ -305,6 +309,8 @@ resources: - get_param: secgroup_kube_minion_id fixed_ips: - subnet: {get_param: fixed_subnet} + allowed_address_pairs: + - ip_address: {get_param: flannel_network_cidr} replacement_policy: AUTO kube_minion_floating: