Swap the order of controller and speaker in the manifest file.
This is just to reduce the diff generated when I switch back to building
this from the Helm chart.
@@ -129,41 +129,47 @@ roleRef:
kind: Role
name: leader-election
---
-# Source: metallb/templates/controller.yaml
+# Source: metallb/templates/speaker.yaml
apiVersion: apps/v1beta2
-kind: Deployment
+kind: DaemonSet
metadata:
namespace: metallb-system
- name: controller
+ name: speaker
labels:
app: metallb
- component: controller
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "7472"
+ component: speaker
spec:
- revisionHistoryLimit: 3
selector:
matchLabels:
app: metallb
- component: controller
+ component: speaker
template:
metadata:
labels:
app: metallb
- component: controller
+ component: speaker
+ annotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "7472"
spec:
- serviceAccountName: controller
+ serviceAccountName: speaker
terminationGracePeriodSeconds: 0
- securityContext:
- runAsNonRoot: true
- runAsUser: 65534 # nobody
+ hostNetwork: true
containers:
- - name: controller
- image: metallb/controller:latest
+ - name: speaker
+ image: metallb/speaker:latest
imagePullPolicy: Always
args:
- --port=7472
+ env:
+ - name: METALLB_NODE_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.hostIP
+ - name: METALLB_NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
ports:
- name: monitoring
containerPort: 7472
@@ -174,53 +180,48 @@ spec:
securityContext:
allowPrivilegeEscalation: false
+ readOnlyRootFilesystem: true
capabilities:
drop:
- all
- readOnlyRootFilesystem: true
-
+ add:
+ - net_raw
---
-# Source: metallb/templates/speaker.yaml
+# Source: metallb/templates/controller.yaml
apiVersion: apps/v1beta2
-kind: DaemonSet
+kind: Deployment
metadata:
namespace: metallb-system
- name: speaker
+ name: controller
labels:
app: metallb
- component: speaker
+ component: controller
+ annotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "7472"
spec:
+ revisionHistoryLimit: 3
selector:
matchLabels:
app: metallb
- component: speaker
+ component: controller
template:
metadata:
labels:
app: metallb
- component: speaker
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "7472"
+ component: controller
spec:
- serviceAccountName: speaker
+ serviceAccountName: controller
terminationGracePeriodSeconds: 0
- hostNetwork: true
+ securityContext:
+ runAsNonRoot: true
+ runAsUser: 65534 # nobody
containers:
- - name: speaker
- image: metallb/speaker:latest
+ - name: controller
+ image: metallb/controller:latest
imagePullPolicy: Always
args:
- --port=7472
- env:
- - name: METALLB_NODE_IP
- valueFrom:
- fieldRef:
- fieldPath: status.hostIP
- - name: METALLB_NODE_NAME
- valueFrom:
- fieldRef:
- fieldPath: spec.nodeName
ports:
- name: monitoring
containerPort: 7472
@@ -231,10 +232,7 @@ spec:
securityContext:
allowPrivilegeEscalation: false
- readOnlyRootFilesystem: true
capabilities:
drop:
- all
- add:
- - net_raw
-
+ readOnlyRootFilesystem: true
