Skip to content
Snippets Groups Projects
Unverified Commit ea7dcd46 authored by Jeroen Rijken's avatar Jeroen Rijken Committed by GitHub
Browse files

Update MetalLB deployment, wait for resource. (#9995)


* Update MetalLB deployment, wait for resource.

Signed-off-by: default avatarJeroen Rijken <jeroen.rijken@xs4all.nl>

* yml to yaml, add basic test for metallb

Signed-off-by: default avatarJeroen Rijken <jeroen.rijken@xs4all.nl>

---------

Signed-off-by: default avatarJeroen Rijken <jeroen.rijken@xs4all.nl>
parent 94e33bdb
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,8 @@ By default only the MetalLB BGP speaker is allowed to run on control plane nodes ...@@ -26,6 +26,8 @@ By default only the MetalLB BGP speaker is allowed to run on control plane nodes
```yaml ```yaml
metallb_config: metallb_config:
controller: controller:
nodeselector:
kubernetes.io/os: linux
tolerations: tolerations:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: "Equal" operator: "Equal"
...@@ -37,6 +39,28 @@ metallb_config: ...@@ -37,6 +39,28 @@ metallb_config:
effect: "NoSchedule" effect: "NoSchedule"
``` ```
If you'd like to set additional nodeSelector and tolerations values, you can do so in the following fasion:
```yaml
metallb_config:
controller:
nodeselector:
kubernetes.io/os: linux
tolerations:
- key: "node-role.kubernetes.io/control-plane"
operator: "Equal"
value: ""
effect: "NoSchedule"
speaker:
nodeselector:
kubernetes.io/os: linux
tolerations:
- key: "node-role.kubernetes.io/control-plane"
operator: "Equal"
value: ""
effect: "NoSchedule"
```
## Pools ## Pools
First you need to specify all of the pools you are going to use: First you need to specify all of the pools you are going to use:
...@@ -137,7 +161,6 @@ In this scenario you should disable the MetalLB speaker and configure the `calic ...@@ -137,7 +161,6 @@ In this scenario you should disable the MetalLB speaker and configure the `calic
```yaml ```yaml
metallb_speaker_enabled: false metallb_speaker_enabled: false
metallb_avoid_buggy_ips: true
metallb_config: metallb_config:
address_pools: address_pools:
primary: primary:
......
--- ---
metallb_enabled: false metallb_enabled: false
metallb_log_level: info metallb_log_level: info
metallb_protocol: "layer2"
metallb_port: "7472" metallb_port: "7472"
metallb_memberlist_port: "7946" metallb_memberlist_port: "7946"
metallb_peers: []
metallb_speaker_enabled: "{{ metallb_enabled }}" metallb_speaker_enabled: "{{ metallb_enabled }}"
metallb_speaker_nodeselector: metallb_speaker_nodeselector:
kubernetes.io/os: "linux" kubernetes.io/os: "linux"
...@@ -18,6 +16,3 @@ metallb_speaker_tolerations: ...@@ -18,6 +16,3 @@ metallb_speaker_tolerations:
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane
operator: Exists operator: Exists
metallb_controller_tolerations: [] metallb_controller_tolerations: []
metallb_pool_name: "loadbalanced"
metallb_auto_assign: true
metallb_avoid_buggy_ips: false
...@@ -5,13 +5,6 @@ ...@@ -5,13 +5,6 @@
when: when:
- "kube_proxy_mode == 'ipvs' and not kube_proxy_strict_arp" - "kube_proxy_mode == 'ipvs' and not kube_proxy_strict_arp"
- name: Kubernetes Apps | Check BGP peers for MetalLB
fail:
msg: "metallb_peers is mandatory when metallb_protocol is bgp and metallb_speaker_enabled"
when:
- metallb_config.layer3 is defined and metallb_speaker_enabled
- metallb_config.metallb_peers is not defined or not metallb_config.metallb_peers
- name: Kubernetes Apps | Check that the deprecated 'matallb_auto_assign' variable is not used anymore - name: Kubernetes Apps | Check that the deprecated 'matallb_auto_assign' variable is not used anymore
fail: fail:
msg: "'matallb_auto_assign' configuration variable is deprecated, please use 'metallb_auto_assign' instead" msg: "'matallb_auto_assign' configuration variable is deprecated, please use 'metallb_auto_assign' instead"
...@@ -36,46 +29,95 @@ ...@@ -36,46 +29,95 @@
- name: Kubernetes Apps | Lay Down MetalLB - name: Kubernetes Apps | Lay Down MetalLB
become: true become: true
template: template:
src: "{{ item }}.j2" src: "metallb.yaml.j2"
dest: "{{ kube_config_dir }}/{{ item }}" dest: "{{ kube_config_dir }}/metallb.yaml"
mode: 0644 mode: 0644
with_items: ["metallb.yml", "pools.yaml", "layer2.yaml", "layer3.yaml"] register: metallb_rendering
register: "rendering"
when: when:
- "inventory_hostname == groups['kube_control_plane'][0]" - inventory_hostname == groups['kube_control_plane'][0]
- name: Kubernetes Apps | Create MetalLB resources and replace existing - name: Kubernetes Apps | Install and configure MetalLB
k8s: kube:
definition: "{{ lookup('template', 'metallb.yaml') }}" name: "MetalLB"
kubectl: "{{ bin_dir }}/kubectl"
filename: "{{ kube_config_dir }}/metallb.yaml"
state: "{{ metallb_rendering.changed | ternary('latest','present') }}"
wait: true
become: true
when:
- inventory_hostname == groups['kube_control_plane'][0]
- name: Kubernetes Apps | Wait for MetalLB controller to be running - name: Kubernetes Apps | Wait for MetalLB controller to be running
k8s_info: command: "{{ bin_dir }}/kubectl -n metallb-system wait --for=condition=ready pod -l app=metallb,component=controller"
kind: Deployment become: true
namespace: metallb-system when:
name: controller - inventory_hostname == groups['kube_control_plane'][0]
wait: True
wait_sleep: 10
wait_timeout: 360
wait_condition:
status: "True"
type: Available
register: result
until: result is not failed
- name: Kubernetes Apps | Install and configure MetalLB - name: MetalLB | Address pools
block:
- name: MetalLB | Layout address pools template
ansible.builtin.template:
src: pools.yaml.j2
dest: "{{ kube_config_dir }}/pools.yaml"
mode: 0644
register: pools_rendering
- name: MetalLB | Create address pools configuration
kube:
name: "MetalLB"
kubectl: "{{ bin_dir }}/kubectl"
filename: "{{ kube_config_dir }}/pools.yaml"
state: "{{ pools_rendering.changed | ternary('latest','present') }}"
become: true
when:
- inventory_hostname == groups['kube_control_plane'][0]
- metallb_config.address_pools is defined
- name: MetalLB | Layer2
block:
- name: MetalLB | Layout layer2 template
ansible.builtin.template:
src: layer2.yaml.j2
dest: "{{ kube_config_dir }}/layer2.yaml"
mode: 0644
register: layer2_rendering
- name: MetalLB | Create layer2 configuration
kube:
name: "MetalLB"
kubectl: "{{ bin_dir }}/kubectl"
filename: "{{ kube_config_dir }}/layer2.yaml"
state: "{{ layer2_rendering.changed | ternary('latest','present') }}"
become: true
when:
- inventory_hostname == groups['kube_control_plane'][0]
- metallb_config.layer2 is defined
- name: MetalLB | Layer3
block:
- name: MetalLB | Layout layer3 template
ansible.builtin.template:
src: layer3.yaml.j2
dest: "{{ kube_config_dir }}/layer3.yaml"
mode: 0644
register: layer3_rendering
- name: MetalLB | Create layer3 configuration
kube: kube:
name: "MetalLB" name: "MetalLB"
kubectl: "{{ bin_dir }}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
filename: "{{ kube_config_dir }}/{{ item.item }}" filename: "{{ kube_config_dir }}/layer3.yaml"
state: "{{ item.changed | ternary('latest','present') }}" state: "{{ layer3_rendering.changed | ternary('latest','present') }}"
become: true become: true
with_items: "{{ rendering.results }}"
when: when:
- "inventory_hostname == groups['kube_control_plane'][0]" - inventory_hostname == groups['kube_control_plane'][0]
- metallb_config.layer3 is defined
- name: Kubernetes Apps | Delete MetalLB ConfigMap - name: Kubernetes Apps | Delete MetalLB ConfigMap
k8s: kube:
name: config name: config
kind: ConfigMap kubectl: "{{ bin_dir }}/kubectl"
resource: ConfigMap
namespace: metallb-system namespace: metallb-system
state: absent state: absent
---
apiVersion: v1
kind: Namespace
metadata:
labels:
pod-security.kubernetes.io/audit: privileged
pod-security.kubernetes.io/enforce: privileged
pod-security.kubernetes.io/warn: privileged
name: metallb-system
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
...@@ -1703,8 +1713,8 @@ spec: ...@@ -1703,8 +1713,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
prometheus.io/port: "{{ metallb_port }}" prometheus.io/port: '{{ metallb_port }}'
prometheus.io/scrape: "true" prometheus.io/scrape: 'true'
labels: labels:
app: metallb app: metallb
component: controller component: controller
...@@ -1719,7 +1729,7 @@ spec: ...@@ -1719,7 +1729,7 @@ spec:
value: memberlist value: memberlist
- name: METALLB_DEPLOYMENT - name: METALLB_DEPLOYMENT
value: controller value: controller
image: {{ metallb_controller_image_repo }}:{{ metallb_version }} image: "{{ metallb_controller_image_repo }}:{{ metallb_version }}"
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3
httpGet: httpGet:
...@@ -1755,13 +1765,14 @@ spec: ...@@ -1755,13 +1765,14 @@ spec:
- mountPath: /tmp/k8s-webhook-server/serving-certs - mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert name: cert
readOnly: true readOnly: true
{% if metallb_config.controller.tolerations %} {% if metallb_config.controller is defined and metallb_config.controller.tolerations is defined %}
tolerations: tolerations:
{{ metallb_config.controller.tolerations | to_nice_yaml(indent=2) | indent(width=8) }} {{ metallb_config.controller.tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
{% endif %} {%- endif %}
{% if metallb_controller_nodeselector %}
nodeSelector: nodeSelector:
{{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }} {{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) -}}
{% if metallb_config.controller is defined and metallb_config.controller.nodeselector is defined %}
{{ metallb_config.controller.nodeselector | to_nice_yaml | indent(width=8) -}}
{%- endif %} {%- endif %}
securityContext: securityContext:
fsGroup: 65534 fsGroup: 65534
...@@ -1793,8 +1804,8 @@ spec: ...@@ -1793,8 +1804,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
prometheus.io/port: "{{ metallb_port }}" prometheus.io/port: '{{ metallb_port }}'
prometheus.io/scrape: "true" prometheus.io/scrape: 'true'
labels: labels:
app: metallb app: metallb
component: speaker component: speaker
...@@ -1823,7 +1834,7 @@ spec: ...@@ -1823,7 +1834,7 @@ spec:
secretKeyRef: secretKeyRef:
key: secretkey key: secretkey
name: memberlist name: memberlist
image: {{ metallb_speaker_image_repo }}:{{ metallb_version }} image: "{{ metallb_speaker_image_repo }}:{{ metallb_version }}"
livenessProbe: livenessProbe:
failureThreshold: 3 failureThreshold: 3
httpGet: httpGet:
...@@ -1860,15 +1871,18 @@ spec: ...@@ -1860,15 +1871,18 @@ spec:
- ALL - ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
hostNetwork: true hostNetwork: true
{% if metallb_speaker_nodeselector %}
nodeSelector: nodeSelector:
{{ metallb_speaker_nodeselector | to_nice_yaml | indent(width=8) }} {{ metallb_speaker_nodeselector | to_nice_yaml | indent(width=8) -}}
{% if metallb_config.speaker is defined and metallb_config.speaker.nodeselector is defined %}
{{ metallb_config.speaker.nodeselector | to_nice_yaml | indent(width=8) -}}
{%- endif %} {%- endif %}
serviceAccountName: speaker serviceAccountName: speaker
terminationGracePeriodSeconds: 2 terminationGracePeriodSeconds: 2
{% if metallb_speaker_tolerations %}
tolerations: tolerations:
{{ metallb_speaker_tolerations | to_nice_yaml(indent=2) | indent(width=8) }} {{ metallb_speaker_tolerations | to_nice_yaml(indent=2) | indent(width=8) -}}
{% if metallb_config.speaker is defined and metallb_config.speaker.tolerations is defined %}
{{ metallb_config.speaker.tolerations | to_nice_yaml(indent=2) | indent(width=8) -}}
{% endif %} {% endif %}
{% endif %} {% endif %}
......
...@@ -49,3 +49,26 @@ kube_vip_enabled: true ...@@ -49,3 +49,26 @@ kube_vip_enabled: true
kube_vip_arp_enabled: true kube_vip_arp_enabled: true
kube_vip_controlplane_enabled: true kube_vip_controlplane_enabled: true
kube_vip_address: 192.168.1.100 kube_vip_address: 192.168.1.100
# MetalLB
metallb_enabled: true
metallb_speaker_enabled: true
metallb_config:
address_pools:
primary:
ip_range:
- 192.0.1.0-192.0.1.254
auto_assign: true
pool1:
ip_range:
- 192.0.2.1-192.0.2.1
auto_assign: false
pool2:
ip_range:
- 192.0.2.2-192.0.2.2
auto_assign: false
layer2:
- primary
- pool1
- pool2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment