Browse Source

feat: upgrade metallb to v0.11.0 (#8420)

Signed-off-by: Cyril Corbon <corboncyril@gmail.com>
pull/8433/head
cyril-corbon 3 years ago
committed by GitHub
parent
commit
01dcbc18ac
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 6 deletions
  1. 2
      inventory/sample/group_vars/k8s_cluster/addons.yml
  2. 3
      roles/kubernetes-apps/metallb/defaults/main.yml
  3. 43
      roles/kubernetes-apps/metallb/templates/metallb.yml.j2

2
inventory/sample/group_vars/k8s_cluster/addons.yml

@ -182,7 +182,7 @@ metallb_speaker_enabled: true
# operator: "Equal" # operator: "Equal"
# value: "" # value: ""
# effect: "NoSchedule" # effect: "NoSchedule"
# metallb_version: v0.10.3
# metallb_version: v0.11.0
# metallb_protocol: "layer2" # metallb_protocol: "layer2"
# metallb_port: "7472" # metallb_port: "7472"
# metallb_memberlist_port: "7946" # metallb_memberlist_port: "7946"

3
roles/kubernetes-apps/metallb/defaults/main.yml

@ -1,6 +1,7 @@
--- ---
metallb_enabled: false metallb_enabled: false
metallb_version: v0.10.3
metallb_version: v0.11.0
metallb_log_level: info
metallb_protocol: "layer2" metallb_protocol: "layer2"
metallb_port: "7472" metallb_port: "7472"
metallb_memberlist_port: "7946" metallb_memberlist_port: "7946"

43
roles/kubernetes-apps/metallb/templates/metallb.yml.j2

@ -31,10 +31,7 @@ spec:
requiredDropCapabilities: requiredDropCapabilities:
- ALL - ALL
runAsUser: runAsUser:
ranges:
- max: 65535
min: 1
rule: MustRunAs
rule: MustRunAsNonRoot
seLinux: seLinux:
rule: RunAsAny rule: RunAsAny
supplementalGroups: supplementalGroups:
@ -354,6 +351,7 @@ spec:
- args: - args:
- --port={{ metallb_port }} - --port={{ metallb_port }}
- --config=config - --config=config
- --log-level={{ metallb_log_level }}
env: env:
- name: METALLB_NODE_NAME - name: METALLB_NODE_NAME
valueFrom: valueFrom:
@ -389,6 +387,24 @@ spec:
- containerPort: {{ metallb_memberlist_port }} - containerPort: {{ metallb_memberlist_port }}
name: memberlist-udp name: memberlist-udp
protocol: 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: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities: capabilities:
@ -442,6 +458,7 @@ spec:
- args: - args:
- --port={{ metallb_port }} - --port={{ metallb_port }}
- --config=config - --config=config
- --log-level={{ metallb_log_level }}
env: env:
- name: METALLB_ML_SECRET_NAME - name: METALLB_ML_SECRET_NAME
value: memberlist value: memberlist
@ -458,6 +475,24 @@ spec:
drop: drop:
- all - all
readOnlyRootFilesystem: true 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 %} {% if metallb_controller_nodeselector %}
nodeSelector: nodeSelector:
{{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }} {{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }}

Loading…
Cancel
Save