Skip to content
Draft
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
3 changes: 3 additions & 0 deletions roles/cilium/files/chart/templates/cilium-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,9 @@ data:
{{- if .Values.tunnelPort }}
tunnel-port: {{ .Values.tunnelPort | quote }}
{{- end }}
{{- if .Values.underlayProtocol }}
underlay-protocol: {{ .Values.underlayProtocol | quote }}
{{- end }}

{{- if .Values.MTU }}
mtu: {{ .Values.MTU | quote }}
Expand Down
4 changes: 4 additions & 0 deletions roles/cilium/files/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2125,6 +2125,10 @@ tunnel: ""
# @default -- `"vxlan"`
tunnelProtocol: ""

# -- IP family for the underlay.
# @default -- `"ipv4"`
underlayProtocol: ""

# -- Enable native-routing mode or tunneling mode.
# Possible values:
# - ""
Expand Down
7 changes: 7 additions & 0 deletions roles/cilium/templates/values.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ image:
useDigest: false
hubble:
enabled: false
ipv4:
enabled: false
ipv6:
enabled: true
tunnel: geneve
tunnelPort: 6082
operator:
Expand All @@ -17,10 +21,13 @@ operator:
{% else %}
node-role.kubernetes.io/master: ""
{% endif %}
underlayProtocol: ipv6
ipam:
operator:
clusterPoolIPv4PodCIDRList:
- "{{ cilium_ipv4_cidr | default('10.0.0.0/8') }}"
clusterPoolIPv6PodCIDRList:
- "{{ cilium_ipv6_cidr | default('fdac:bb5e:e415::/112')}}"
{% if cilium_replace_kube_proxy %}
k8sServiceHost: "{{ kubernetes_hostname }}"
k8sServicePort: 6443
Expand Down
2 changes: 1 addition & 1 deletion roles/kube_vip/templates/kube-vip.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
- name: vip_interface
value: "{{ kube_vip_interface }}"
- name: vip_cidr
value: "32"
value: "128"
- name: cp_enable
value: "true"
- name: cp_namespace
Expand Down
2 changes: 2 additions & 0 deletions roles/kubelet/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,8 @@ kubelet_allow_unsafe_swap: false
kubelet_sysctls:
- name: net.ipv4.ip_forward
value: 1
- name: net.ipv6.conf.default.forwarding
value: 1
- name: net.bridge.bridge-nf-call-iptables
value: 1
- name: net.bridge.bridge-nf-call-ip6tables
Expand Down
3 changes: 3 additions & 0 deletions roles/kubernetes/templates/kubeadm.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ etcd:
{% if kubernetes_version is ansible.builtin.version('1.28.0', '>=') %}
tls-min-version: TLS1.3
{% endif %}
networking:
podSubnet: "fd40:10::/64"
serviceSubnet: "fd40:10:100::/112"
apiServer:
extraArgs:
{% if kubernetes_version is ansible.builtin.version('1.28.0', '>=') %}
Expand Down
Loading