Skip to content

Commit

Permalink
[MetalLB] Remove unused resources (kubernetes-sigs#10004)
Browse files Browse the repository at this point in the history
* Fix MetalLB deploy

This will fix MetalLB deploy

* Remove `metallb_ip_range` check

* Remove missing `metallb-config.yml`

* fix template name

* make deployment of layer3 conditional

* revert

* revert
  • Loading branch information
eugene-marchanka authored and pedromcpedro committed May 8, 2024
1 parent 47c84bc commit 000ffab
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/metallb.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ metallb_config:
When using calico >= 3.18 you can replace MetalLB speaker by calico Service LoadBalancer IP advertisement.
See [calico service IPs advertisement documentation](https://docs.projectcalico.org/archive/v3.18/networking/advertise-service-ips#advertise-service-load-balancer-ip-addresses).
In this scenario you should disable the MetalLB speaker and configure the `calico_advertise_service_loadbalancer_ips` to match your `metallb_ip_range`
In this scenario you should disable the MetalLB speaker and configure the `calico_advertise_service_loadbalancer_ips` to match your `ip_range`

```yaml
metallb_speaker_enabled: false
Expand Down
8 changes: 1 addition & 7 deletions roles/kubernetes-apps/metallb/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
when:
- "kube_proxy_mode == 'ipvs' and not kube_proxy_strict_arp"

- name: Kubernetes Apps | Check cluster settings for MetalLB
fail:
msg: "metallb_ip_range is mandatory to be specified for MetalLB"
when:
- metallb_ip_range is not defined or not metallb_ip_range

- name: Kubernetes Apps | Check BGP peers for MetalLB
fail:
msg: "metallb_peers is mandatory when metallb_protocol is bgp and metallb_speaker_enabled"
Expand Down Expand Up @@ -45,7 +39,7 @@
src: "{{ item }}.j2"
dest: "{{ kube_config_dir }}/{{ item }}"
mode: 0644
with_items: ["metallb.yml", "metallb-config.yml", "pools.yaml", "layer2.yaml", "layer3.yaml"]
with_items: ["metallb.yml", "pools.yaml", "layer2.yaml", "layer3.yaml"]
register: "rendering"
when:
- "inventory_hostname == groups['kube_control_plane'][0]"
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/metallb/templates/layer3.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ spec:
ebgpMultiHop: {{ peer.multihop }}
{% endif -%}

{% endfor %}
{% endfor %}

0 comments on commit 000ffab

Please sign in to comment.