Browse Source

Cilium: Pass cluster DNS to hubble.peerService in values.yaml.j2 (#12346)

* cilium: pass cluster DNS to hubble.peerService in values.yaml.j2

* Add dedicated Hubble variable defaulting to inventory cluster domain
pull/12378/head
Mustafa Mertcan Çam 3 months ago
committed by GitHub
parent
commit
cde6e815dd
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 0 deletions
  1. 4
      inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml
  2. 4
      roles/network_plugin/cilium/defaults/main.yml
  3. 2
      roles/network_plugin/cilium/templates/values.yaml.j2

4
inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml

@ -175,6 +175,10 @@ cilium_l2announcements: false
### Buffer size of the channel to receive monitor events. ### Buffer size of the channel to receive monitor events.
# cilium_hubble_event_queue_size: 50 # cilium_hubble_event_queue_size: 50
# Override the DNS suffix that Hubble-Relay uses to resolve its peer service.
# It defaults to the inventory's `dns_domain`.
# cilium_hubble_peer_service_cluster_domain: "{{ dns_domain }}"
# IP address management mode for v1.9+. # IP address management mode for v1.9+.
# https://docs.cilium.io/en/v1.9/concepts/networking/ipam/ # https://docs.cilium.io/en/v1.9/concepts/networking/ipam/
# cilium_ipam_mode: kubernetes # cilium_ipam_mode: kubernetes

4
roles/network_plugin/cilium/defaults/main.yml

@ -176,6 +176,10 @@ cilium_hubble_export_dynamic_config_content:
excludeFilters: [] excludeFilters: []
filePath: "/var/run/cilium/hubble/events.log" filePath: "/var/run/cilium/hubble/events.log"
# Override the DNS suffix that Hubble-Relay uses to resolve its peer service.
# It defaults to the inventory's `dns_domain`.
cilium_hubble_peer_service_cluster_domain: "{{ dns_domain }}"
### Capacity of Hubble events buffer. The provided value must be one less than an integer power of two and no larger than 65535 ### Capacity of Hubble events buffer. The provided value must be one less than an integer power of two and no larger than 65535
### (ie: 1, 3, ..., 2047, 4095, ..., 65535) (default 4095) ### (ie: 1, 3, ..., 2047, 4095, ..., 65535) (default 4095)
# cilium_hubble_event_buffer_capacity: 4095 # cilium_hubble_event_buffer_capacity: 4095

2
roles/network_plugin/cilium/templates/values.yaml.j2

@ -83,6 +83,8 @@ ipMasqAgent:
{% endif %} {% endif %}
hubble: hubble:
peerService:
clusterDomain: {{ cilium_hubble_peer_service_cluster_domain }}
enabled: {{ cilium_enable_hubble | to_json }} enabled: {{ cilium_enable_hubble | to_json }}
relay: relay:
enabled: {{ cilium_enable_hubble | to_json }} enabled: {{ cilium_enable_hubble | to_json }}

Loading…
Cancel
Save