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.

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

Allow configuration of Calico bgp and encapsulation values #388

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/cluster-addons/templates/cni/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ stringData:
nodeMetricsPort: 9091
typhaMetricsPort: 9093
calicoNetwork:
bgp: Disabled
bgp: {{ .Values.cni.calico.bgp }}
nodeAddressAutodetectionV4:
kubernetes: NodeInternalIP
ipPools:
{% for cidr in cluster.spec.clusterNetwork.pods.cidrBlocks %}
- blockSize: 26
cidr: {{ "{{" }} cidr {{ "}}" }}
disableBGPExport: false
encapsulation: VXLAN
encapsulation: {{ .Values.cni.calico.encapsulation }}
natOutgoing: Enabled
nodeSelector: all()
{% endfor %}
Expand Down
6 changes: 6 additions & 0 deletions charts/cluster-addons/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ cni:
type: calico
# Settings for the calico CNI
# See https://projectcalico.docs.tigera.io/getting-started/kubernetes/helm
# Defaults in this Helm chart for encapsulation and bgp are for VXLAN.
# To enable BGP mode Calico:
# 1. Set encapsulation:None and bgp:Enabled
# 2. Ensure all nodes have the pod CIDR in allowed address pairs on network ports.
calico:
bgp: Disabled
encapsulation: VXLAN
chart:
repo: https://projectcalico.docs.tigera.io/charts
name: tigera-operator
Expand Down
Loading