Skip to content

Commit bc7c1c6

Browse files
authored
Merge pull request #325 from lsst-it/IT-5255/metallb
(fleet/metallb) bump metallb to 0.14.4; set metallb limits; add ingress-nginx-lhn to ruka
2 parents b95c91e + a47c2c8 commit bc7c1c6

File tree

4 files changed

+40
-2
lines changed

4 files changed

+40
-2
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
apiVersion: metallb.io/v1beta1
3+
kind: IPAddressPool
4+
metadata:
5+
name: ingress-lhn
6+
namespace: metallb-system
7+
spec:
8+
addresses:
9+
- 139.229.153.1/32
10+
autoAssign: false
11+
---
12+
apiVersion: metallb.io/v1beta1
13+
kind: L2Advertisement
14+
metadata:
15+
name: ingress-lhn
16+
namespace: metallb-system
17+
spec:
18+
ipAddressPools:
19+
- ingress-lhn
20+
interfaces:
21+
- br2505

fleet/lib/metallb-conf/overlays/ruka/ipaddresspool-lhn.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: metallb-system
77
spec:
88
addresses:
9-
- 139.229.153.1-139.229.153.62 # ~139.229.153.0/26
9+
- 139.229.153.2-139.229.153.62 # ~139.229.153.0/26
1010
autoAssign: false
1111
---
1212
apiVersion: metallb.io/v1beta1

fleet/lib/metallb/fleet.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,32 @@ helm:
88
chart: *name
99
releaseName: *name
1010
repo: https://metallb.github.io/metallb
11-
version: 0.14.3
11+
version: 0.14.4
1212
# daemonset rollout may take > 300s on larger clusters
1313
timeoutSeconds: 900
1414
waitForJobs: true
1515
atomic: false
1616
values:
1717
controller:
1818
priorityClassName: system-cluster-critical
19+
resources:
20+
limits:
21+
cpu: 100m
22+
memory: 192Mi
23+
requests:
24+
cpu: 10m
25+
memory: 192Mi
1926
speaker:
2027
priorityClassName: system-node-critical
28+
frr:
29+
enabled: false
30+
resources: # XXX check live usage on yagan after frr is disabled
31+
limits:
32+
cpu: 500m
33+
memory: 192Mi
34+
requests:
35+
cpu: 50m
36+
memory: 192Mi
2137
prometheus:
2238
namespace: "kube-prometheus-stack"
2339
serviceAccount: "kube-prometheus-stack-prometheus"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../lib/ingress-nginx-lhn

0 commit comments

Comments
 (0)