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.

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

feat: upgrade metallb to v0.11.0 #8420

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 inventory/sample/group_vars/k8s_cluster/addons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ metallb_speaker_enabled: true
# operator: "Equal"
# value: ""
# effect: "NoSchedule"
# metallb_version: v0.10.3
# metallb_version: v0.11.0
# metallb_protocol: "layer2"
# metallb_port: "7472"
# metallb_memberlist_port: "7946"
Expand Down
3 changes: 2 additions & 1 deletion roles/kubernetes-apps/metallb/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
metallb_enabled: false
metallb_version: v0.10.3
metallb_version: v0.11.0
metallb_log_level: info
metallb_protocol: "layer2"
metallb_port: "7472"
metallb_memberlist_port: "7946"
Expand Down
43 changes: 39 additions & 4 deletions roles/kubernetes-apps/metallb/templates/metallb.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ spec:
requiredDropCapabilities:
- ALL
runAsUser:
ranges:
- max: 65535
min: 1
rule: MustRunAs
rule: MustRunAsNonRoot
seLinux:
rule: RunAsAny
supplementalGroups:
Expand Down Expand Up @@ -354,6 +351,7 @@ spec:
- args:
- --port={{ metallb_port }}
- --config=config
- --log-level={{ metallb_log_level }}
env:
- name: METALLB_NODE_NAME
valueFrom:
Expand Down Expand Up @@ -389,6 +387,24 @@ spec:
- containerPort: {{ metallb_memberlist_port }}
name: memberlist-udp
protocol: UDP
livenessProbe:
httpGet:
path: /metrics
port: metrics
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
path: /metrics
port: metrics
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
successThreshold: 1
failureThreshold: 3
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down Expand Up @@ -442,6 +458,7 @@ spec:
- args:
- --port={{ metallb_port }}
- --config=config
- --log-level={{ metallb_log_level }}
env:
- name: METALLB_ML_SECRET_NAME
value: memberlist
Expand All @@ -458,6 +475,24 @@ spec:
drop:
- all
readOnlyRootFilesystem: true
livenessProbe:
httpGet:
path: /metrics
port: metrics
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
path: /metrics
port: metrics
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
successThreshold: 1
failureThreshold: 3
{% if metallb_controller_nodeselector %}
nodeSelector:
{{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }}
Expand Down