Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subnet scope support for POD and Node BD #398

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Subnet scope support for POD and Node BD #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57b4864
Support for Subnet Scope
camrossi Sep 2, 2020
ae7590a
subnet scope changes
camrossi Oct 29, 2020
859ae85
Merge branch 'master' into subnet_scope
camrossi Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions provision/acc_provision/acc_provision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ def config_default():
},
"net_config": {
"node_subnet": None,
"node_subnet_scope": ['public'],
"pod_subnet": None,
"pod_subnet_scope": ['private'],
"pod_subnet_chunk_size": 32,
"extern_dynamic": None,
"extern_static": None,
Expand Down
10 changes: 8 additions & 2 deletions provision/acc_provision/apic_provision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2733,7 +2733,9 @@ def kube_tn(self, flavor):
kube_vrf = self.config["aci_config"]["vrf"]["name"]
kube_l3out = self.config["aci_config"]["l3out"]["name"]
node_subnet = self.config["net_config"]["node_subnet"]
node_subnet_scope = ",".join([str(x) for x in self.config["net_config"]["node_subnet_scope"]])
pod_subnet = self.config["net_config"]["pod_subnet"]
pod_subnet_scope = ",".join([str(x) for x in self.config["net_config"]["pod_subnet_scope"]])
kade = self.config["kube_config"].get("allow_kube_api_default_epg") or \
self.config["kube_config"].get("allow_pods_kube_api_access")
eade = self.config["kube_config"].get("allow_pods_external_access")
Expand Down Expand Up @@ -2919,13 +2921,17 @@ def kube_tn(self, flavor):
[
(
"attributes",
collections.OrderedDict([("ip", node_subnet), ("scope", "public")]),
collections.OrderedDict([("ip", node_subnet), ("scope", node_subnet_scope)]),
)
]
)

pod_subnet_obj = collections.OrderedDict(
[("attributes", collections.OrderedDict([("ip", pod_subnet)]))]
[
(
"attributes", collections.OrderedDict([("ip", pod_subnet), ("scope", pod_subnet_scope)]),
)
]
)
if eade is True:
pod_subnet_obj["attributes"]["scope"] = "public"
Expand Down
9 changes: 7 additions & 2 deletions provision/acc_provision/templates/provision-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ aci_config:
#
net_config:
node_subnet: 10.1.0.1/16 # Subnet to use for nodes
node_subnet_scope: # Valid option are private, shared and public. Public and Private can't be configured at the same time.
- public # Default is public
- shared
pod_subnet: 10.2.0.1/16 # Subnet to use for Kubernetes
pod_subnet_scope: # Valid option are private, shared and public. Public and Private can't be configured at the same time.
- private # Default is private
# Pods/CloudFoundry containers
#vip_subnet: 10.3.0.1/16 # Subnet to use for virtual IPs
# (CloudFoundry only)
Expand Down Expand Up @@ -76,8 +81,8 @@ registry:
# ovs_memory_limit: "20Gi" # override if needed, default is "1Gi"
# reboot_opflex_with_ovs: "false" # override if needed, default is "true"

#istio_config:
# install_istio: False # default is True
istio_config:
install_istio: True # default is True
# install_profile: "default" # override if needed, default is "demo"

#drop_log_config:
Expand Down