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.

Sign up for GitHub

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

[MetalLB] Remove unused resources #10004

Merged
merged 7 commits into from
May 9, 2023
Merged

[MetalLB] Remove unused resources #10004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b777ba0
Fix MetalLB deploy
eugene-marchanka Apr 19, 2023
7589034
Remove `metallb_ip_range` check
eugene-marchanka Apr 19, 2023
a15da17
Remove missing `metallb-config.yml`
eugene-marchanka Apr 20, 2023
b150a7c
fix template name
eugene-marchanka Apr 20, 2023
5be7f67
make deployment of layer3 conditional
eugene-marchanka Apr 20, 2023
e92bd4a
revert
eugene-marchanka Apr 20, 2023
6aff8a4
revert
eugene-marchanka Apr 20, 2023
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
2 changes: 1 addition & 1 deletion docs/metallb.md
View file
Open in desktop
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
View file
Open in desktop
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"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nice catch for non-existent metallb-config.yml.j2 under ./roles/kubernetes-apps/metallb/templates/

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ spec:
ebgpMultiHop: {{ peer.multihop }}
{% endif -%}

{% endfor %}
{% endfor %}