Skip to content

Commit 181d16c

Browse files
Automator: update common-files@master in istio/api@master (#2691)
1 parent 7063fd5 commit 181d16c

File tree

2 files changed

+116
-27
lines changed

2 files changed

+116
-27
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f25cde919c2e8d0c2dfb9e465736ff92a9fa4de7
1+
811b64d6136aa6d85ea194b3cd1d378a82bf96e9

common/scripts/metallb.yaml

Lines changed: 115 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://github.com/metallb/metallb/tree/v0.9.3/manifests namespace.yaml and metallb.yaml
1+
# from https://github.com/metallb/metallb/blob/v0.12/manifests namespace.yaml and metallb.yaml
22
apiVersion: v1
33
kind: Namespace
44
metadata:
@@ -12,7 +12,6 @@ metadata:
1212
labels:
1313
app: metallb
1414
name: controller
15-
namespace: metallb-system
1615
spec:
1716
allowPrivilegeEscalation: false
1817
allowedCapabilities: []
@@ -54,13 +53,10 @@ metadata:
5453
labels:
5554
app: metallb
5655
name: speaker
57-
namespace: metallb-system
5856
spec:
5957
allowPrivilegeEscalation: false
6058
allowedCapabilities:
61-
- NET_ADMIN
6259
- NET_RAW
63-
- SYS_ADMIN
6460
allowedHostPaths: []
6561
defaultAddCapabilities: []
6662
defaultAllowPrivilegeEscalation: false
@@ -72,6 +68,8 @@ spec:
7268
hostPorts:
7369
- max: 7472
7470
min: 7472
71+
- max: 7946
72+
min: 7946
7573
privileged: true
7674
readOnlyRootFilesystem: true
7775
requiredDropCapabilities:
@@ -118,7 +116,6 @@ rules:
118116
- get
119117
- list
120118
- watch
121-
- update
122119
- apiGroups:
123120
- ''
124121
resources:
@@ -158,6 +155,13 @@ rules:
158155
- get
159156
- list
160157
- watch
158+
- apiGroups: ["discovery.k8s.io"]
159+
resources:
160+
- endpointslices
161+
verbs:
162+
- get
163+
- list
164+
- watch
161165
- apiGroups:
162166
- ''
163167
resources:
@@ -207,6 +211,37 @@ rules:
207211
- list
208212
---
209213
apiVersion: rbac.authorization.k8s.io/v1
214+
kind: Role
215+
metadata:
216+
labels:
217+
app: metallb
218+
name: controller
219+
namespace: metallb-system
220+
rules:
221+
- apiGroups:
222+
- ''
223+
resources:
224+
- secrets
225+
verbs:
226+
- create
227+
- apiGroups:
228+
- ''
229+
resources:
230+
- secrets
231+
resourceNames:
232+
- memberlist
233+
verbs:
234+
- list
235+
- apiGroups:
236+
- apps
237+
resources:
238+
- deployments
239+
resourceNames:
240+
- controller
241+
verbs:
242+
- get
243+
---
244+
apiVersion: rbac.authorization.k8s.io/v1
210245
kind: ClusterRoleBinding
211246
metadata:
212247
labels:
@@ -268,6 +303,21 @@ subjects:
268303
- kind: ServiceAccount
269304
name: speaker
270305
---
306+
apiVersion: rbac.authorization.k8s.io/v1
307+
kind: RoleBinding
308+
metadata:
309+
labels:
310+
app: metallb
311+
name: controller
312+
namespace: metallb-system
313+
roleRef:
314+
apiGroup: rbac.authorization.k8s.io
315+
kind: Role
316+
name: controller
317+
subjects:
318+
- kind: ServiceAccount
319+
name: controller
320+
---
271321
apiVersion: apps/v1
272322
kind: DaemonSet
273323
metadata:
@@ -294,6 +344,7 @@ spec:
294344
- args:
295345
- --port=7472
296346
- --config=config
347+
- --log-level=info
297348
env:
298349
- name: METALLB_NODE_NAME
299350
valueFrom:
@@ -307,45 +358,63 @@ spec:
307358
valueFrom:
308359
fieldRef:
309360
fieldPath: status.podIP
361+
# needed when another software is also using memberlist / port 7946
362+
# when changing this default you also need to update the container ports definition
363+
# and the PodSecurityPolicy hostPorts definition
364+
#- name: METALLB_ML_BIND_PORT
365+
# value: "7946"
310366
- name: METALLB_ML_LABELS
311367
value: "app=metallb,component=speaker"
312-
- name: METALLB_ML_NAMESPACE
313-
valueFrom:
314-
fieldRef:
315-
fieldPath: metadata.namespace
316368
- name: METALLB_ML_SECRET_KEY
317369
valueFrom:
318370
secretKeyRef:
319371
name: memberlist
320372
key: secretkey
321-
image: metallb/speaker:v0.9.3
322-
imagePullPolicy: Always
373+
image: gcr.io/istio-testing/metallb/speaker:v0.12.1
323374
name: speaker
324375
ports:
325376
- containerPort: 7472
326377
name: monitoring
327-
resources:
328-
limits:
329-
cpu: 100m
330-
memory: 100Mi
378+
- containerPort: 7946
379+
name: memberlist-tcp
380+
- containerPort: 7946
381+
name: memberlist-udp
382+
protocol: UDP
383+
livenessProbe:
384+
httpGet:
385+
path: /metrics
386+
port: monitoring
387+
initialDelaySeconds: 5
388+
periodSeconds: 10
389+
timeoutSeconds: 1
390+
successThreshold: 1
391+
failureThreshold: 3
392+
readinessProbe:
393+
httpGet:
394+
path: /metrics
395+
port: monitoring
396+
initialDelaySeconds: 5
397+
periodSeconds: 10
398+
timeoutSeconds: 1
399+
successThreshold: 1
400+
failureThreshold: 3
331401
securityContext:
332402
allowPrivilegeEscalation: false
333403
capabilities:
334404
add:
335-
- NET_ADMIN
336405
- NET_RAW
337-
- SYS_ADMIN
338406
drop:
339407
- ALL
340408
readOnlyRootFilesystem: true
341409
hostNetwork: true
342410
nodeSelector:
343-
beta.kubernetes.io/os: linux
411+
kubernetes.io/os: linux
344412
serviceAccountName: speaker
345413
terminationGracePeriodSeconds: 2
346414
tolerations:
347415
- effect: NoSchedule
348416
key: node-role.kubernetes.io/master
417+
operator: Exists
349418
---
350419
apiVersion: apps/v1
351420
kind: Deployment
@@ -374,26 +443,46 @@ spec:
374443
- args:
375444
- --port=7472
376445
- --config=config
377-
image: metallb/controller:v0.9.3
378-
imagePullPolicy: Always
446+
- --log-level=info
447+
env:
448+
- name: METALLB_ML_SECRET_NAME
449+
value: memberlist
450+
- name: METALLB_DEPLOYMENT
451+
value: controller
452+
image: gcr.io/istio-testing/metallb/controller:v0.12.1
379453
name: controller
380454
ports:
381455
- containerPort: 7472
382456
name: monitoring
383-
resources:
384-
limits:
385-
cpu: 100m
386-
memory: 100Mi
457+
livenessProbe:
458+
httpGet:
459+
path: /metrics
460+
port: monitoring
461+
initialDelaySeconds: 10
462+
periodSeconds: 10
463+
timeoutSeconds: 1
464+
successThreshold: 1
465+
failureThreshold: 3
466+
readinessProbe:
467+
httpGet:
468+
path: /metrics
469+
port: monitoring
470+
initialDelaySeconds: 10
471+
periodSeconds: 10
472+
timeoutSeconds: 1
473+
successThreshold: 1
474+
failureThreshold: 3
387475
securityContext:
388476
allowPrivilegeEscalation: false
389477
capabilities:
390478
drop:
391479
- all
392480
readOnlyRootFilesystem: true
393481
nodeSelector:
394-
beta.kubernetes.io/os: linux
482+
kubernetes.io/os: linux
395483
securityContext:
396484
runAsNonRoot: true
397485
runAsUser: 65534
486+
fsGroup: 65534
398487
serviceAccountName: controller
399488
terminationGracePeriodSeconds: 0

0 commit comments

Comments
 (0)