update to latest 2.26.0 kubespray version and add dns zones settings to coredns
This commit is contained in:
@@ -97,6 +97,11 @@ rules:
|
||||
- ciliumloadbalancerippools/status
|
||||
- ciliumbgppeeringpolicies
|
||||
- ciliumenvoyconfigs
|
||||
{% endif %}
|
||||
{% if cilium_version | regex_replace('v') is version('1.15', '>=') %}
|
||||
- ciliumbgppeerconfigs
|
||||
- ciliumbgpadvertisements
|
||||
- ciliumbgpnodeconfigs
|
||||
{% endif %}
|
||||
verbs:
|
||||
- '*'
|
||||
@@ -146,6 +151,20 @@ rules:
|
||||
- ciliumlocalredirectpolicies.cilium.io
|
||||
- ciliumnetworkpolicies.cilium.io
|
||||
- ciliumnodes.cilium.io
|
||||
{% if cilium_version | regex_replace('v') is version('1.14', '>=') %}
|
||||
- ciliumnodeconfigs.cilium.io
|
||||
- ciliumcidrgroups.cilium.io
|
||||
- ciliuml2announcementpolicies.cilium.io
|
||||
- ciliumpodippools.cilium.io
|
||||
- ciliumloadbalancerippools.cilium.io
|
||||
{% endif %}
|
||||
{% if cilium_version | regex_replace('v') is version('1.15', '>=') %}
|
||||
- ciliumbgpclusterconfigs.cilium.io
|
||||
- ciliumbgppeerconfigs.cilium.io
|
||||
- ciliumbgpadvertisements.cilium.io
|
||||
- ciliumbgpnodeconfigs.cilium.io
|
||||
- ciliumbgpnodeconfigoverrides.cilium.io
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% for rules in cilium_clusterrole_rules_operator_extra_vars %}
|
||||
- apiGroups:
|
||||
|
||||
@@ -69,6 +69,13 @@ data:
|
||||
# custom-cni-conf to "true", otherwise Cilium may overwrite the configuration.
|
||||
custom-cni-conf: "false"
|
||||
|
||||
{% if cilium_version | regex_replace('v') is version('1.14.0', '>=') %}
|
||||
# Tell the agent to generate and write a CNI configuration file
|
||||
write-cni-conf-when-ready: /host/etc/cni/net.d/05-cilium.conflist
|
||||
cni-exclusive: "{{ cilium_cni_exclusive }}"
|
||||
cni-log-file: "{{ cilium_cni_log_file }}"
|
||||
{% endif %}
|
||||
|
||||
# If you want cilium monitor to aggregate tracing for packets, set this level
|
||||
# to "low", "medium", or "maximum". The higher the level, the less packets
|
||||
# that will be seen in monitor output.
|
||||
@@ -124,6 +131,12 @@ data:
|
||||
tunnel-protocol: "{{ cilium_tunnel_mode }}"
|
||||
{% endif %}
|
||||
|
||||
## DSR setting
|
||||
bpf-lb-mode: "{{ cilium_loadbalancer_mode }}"
|
||||
|
||||
# l2
|
||||
enable-l2-announcements: "{{ cilium_l2announcements }}"
|
||||
|
||||
# Enable Bandwidth Manager
|
||||
# Cilium’s bandwidth manager supports the kubernetes.io/egress-bandwidth Pod annotation.
|
||||
# Bandwidth enforcement currently does not work in combination with L7 Cilium Network Policies.
|
||||
@@ -179,6 +192,12 @@ data:
|
||||
{% for hubble_metrics_cycle in cilium_hubble_metrics %}
|
||||
{{ hubble_metrics_cycle }}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if cilium_hubble_event_buffer_capacity is defined %}
|
||||
hubble-event-buffer-capacity: "{{ cilium_hubble_event_buffer_capacity }}"
|
||||
{% endif %}
|
||||
{% if cilium_hubble_event_queue_size is defined %}
|
||||
hubble-event-queue-size: "{{ cilium_hubble_event_queue_size }}"
|
||||
{% endif %}
|
||||
hubble-listen-address: ":4244"
|
||||
{% if cilium_enable_hubble and cilium_hubble_install %}
|
||||
|
||||
@@ -106,6 +106,15 @@ rules:
|
||||
- ciliumnodes/finalizers
|
||||
- ciliumidentities/finalizers
|
||||
- ciliumlocalredirectpolicies/finalizers
|
||||
{% endif %}
|
||||
{% if cilium_version | regex_replace('v') is version('1.14', '>=') %}
|
||||
- ciliuml2announcementpolicies/status
|
||||
{% endif %}
|
||||
{% if cilium_version | regex_replace('v') is version('1.15', '>=') %}
|
||||
- ciliumbgpnodeconfigs
|
||||
- ciliumbgpnodeconfigs/status
|
||||
- ciliumbgpadvertisements
|
||||
- ciliumbgppeerconfigs
|
||||
{% endif %}
|
||||
verbs:
|
||||
- '*'
|
||||
@@ -125,7 +134,22 @@ rules:
|
||||
- cilium.io
|
||||
resources:
|
||||
- ciliumcidrgroups
|
||||
- ciliuml2announcementpolicies
|
||||
- ciliumpodippools
|
||||
- ciliuml2announcementpolicies/status
|
||||
verbs:
|
||||
- list
|
||||
- watch
|
||||
{% if cilium_version %}
|
||||
- apiGroups:
|
||||
- coordination.k8s.io
|
||||
resources:
|
||||
- leases
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
- update
|
||||
- list
|
||||
- delete
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -12,10 +12,10 @@ data:
|
||||
peer-service: "hubble-peer.kube-system.svc.{{ dns_domain }}:443"
|
||||
listen-address: :4245
|
||||
metrics-listen-address: ":9966"
|
||||
dial-timeout:
|
||||
retry-timeout:
|
||||
sort-buffer-len-max:
|
||||
sort-buffer-drain-timeout:
|
||||
dial-timeout:
|
||||
retry-timeout:
|
||||
sort-buffer-len-max:
|
||||
sort-buffer-drain-timeout:
|
||||
tls-client-cert-file: /var/lib/hubble-relay/tls/client.crt
|
||||
tls-client-key-file: /var/lib/hubble-relay/tls/client.key
|
||||
tls-server-cert-file: /var/lib/hubble-relay/tls/server.crt
|
||||
|
||||
@@ -102,4 +102,3 @@ spec:
|
||||
protocol: TCP
|
||||
targetPort: 4244
|
||||
internalTrafficPolicy: Local
|
||||
|
||||
|
||||
Reference in New Issue
Block a user