Skip to content

Commit 90a8681

Browse files
authored
Merge pull request #145 from ArangoGutierrez/cherry/0.4.2
Cherry/0.4.2
2 parents 4073a52 + 9868aeb commit 90a8681

11 files changed

+289
-284
lines changed

build/assets/master/0400_master_daemonset.yaml

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
app: nfd-master
6+
name: nfd-master
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
app: nfd-master
12+
template:
13+
metadata:
14+
labels:
15+
app: nfd-master
16+
spec:
17+
serviceAccount: nfd-master
18+
serviceAccountName: nfd-master
19+
dnsPolicy: ClusterFirstWithHostNet
20+
restartPolicy: Always
21+
tolerations:
22+
- effect: NoSchedule
23+
key: node-role.kubernetes.io/master
24+
operator: Equal
25+
- effect: NoSchedule
26+
key: node-role.kubernetes.io/control-plane
27+
operator: Equal
28+
affinity:
29+
nodeAffinity:
30+
preferredDuringSchedulingIgnoredDuringExecution:
31+
- preference:
32+
matchExpressions:
33+
- key: node-role.kubernetes.io/master
34+
operator: In
35+
values:
36+
- ""
37+
weight: 1
38+
- preference:
39+
matchExpressions:
40+
- key: node-role.kubernetes.io/control-plane
41+
operator: In
42+
values:
43+
- ""
44+
weight: 1
45+
containers:
46+
- name: nfd-master
47+
env:
48+
- name: NODE_NAME
49+
valueFrom:
50+
fieldRef:
51+
apiVersion: v1
52+
fieldPath: spec.nodeName
53+
image: $(NODE_FEATURE_DISCOVERY_IMAGE)
54+
imagePullPolicy: Always
55+
command:
56+
- "nfd-master"
57+
args: []
58+
securityContext:
59+
allowPrivilegeEscalation: false
60+
capabilities:
61+
drop:
62+
- ALL
63+
readOnlyRootFilesystem: true
64+
runAsNonRoot: true
65+
volumeMounts: []
66+
livenessProbe:
67+
exec:
68+
command:
69+
- /usr/bin/grpc_health_probe
70+
- -addr=:12000
71+
failureThreshold: 3
72+
initialDelaySeconds: 10
73+
periodSeconds: 10
74+
successThreshold: 1
75+
timeoutSeconds: 1
76+
readinessProbe:
77+
exec:
78+
command:
79+
- /usr/bin/grpc_health_probe
80+
- -addr=:12000
81+
failureThreshold: 10
82+
initialDelaySeconds: 5
83+
periodSeconds: 10
84+
successThreshold: 1
85+
timeoutSeconds: 1
86+
volumes: []

build/assets/master/0500_service.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ kind: Service
33
metadata:
44
name: nfd-master
55
spec:
6-
type: ClusterIP
76
selector:
87
app: nfd-master
98
ports:
109
- protocol: TCP
1110
port: 12000
12-
targetPort: 12000
13-
name: nfd
14-
11+
type: ClusterIP

config/rbac/kustomization.yaml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,3 @@ resources:
1313
- auth_proxy_role.yaml
1414
- auth_proxy_role_binding.yaml
1515
- auth_proxy_client_clusterrole.yaml
16-
17-
# needed for nfd-worker
18-
# this patch is needed given that
19-
# +kubebuilder does not allow resourceNames
20-
patchesJSON6902:
21-
- target:
22-
kind: ClusterRole
23-
name: manager-role
24-
patch: |-
25-
- op: add
26-
path: /rules/0
27-
value:
28-
apiGroups:
29-
- policy
30-
resources:
31-
- podsecuritypolicies
32-
verbs:
33-
- use
34-
resourceNames:
35-
- nfd-worker
36-
- op: add
37-
path: /rules/1
38-
value:
39-
apiGroups:
40-
- nfd.k8s-sigs.io
41-
resources:
42-
- nodefeaturerules
43-
verbs:
44-
- get
45-
- list
46-
- watch
47-
- op: add
48-
path: /rules/2
49-
value:
50-
apiGroups:
51-
- topology.node.k8s.io
52-
resources:
53-
- noderesourcetopologies
54-
verbs:
55-
- create
56-
- get
57-
- update

0 commit comments

Comments
 (0)