Skip to content

Commit

Permalink
Merge pull request #145 from ArangoGutierrez/cherry/0.4.2
Browse files Browse the repository at this point in the history
Cherry/0.4.2
  • Loading branch information
k8s-ci-robot authored Apr 26, 2022
2 parents 4073a52 + 9868aeb commit 90a8681
Show file tree
Hide file tree
Showing 11 changed files with 289 additions and 284 deletions.
37 changes: 0 additions & 37 deletions build/assets/master/0400_master_daemonset.yaml

This file was deleted.

86 changes: 86 additions & 0 deletions build/assets/master/0400_master_deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: nfd-master
name: nfd-master
spec:
replicas: 1
selector:
matchLabels:
app: nfd-master
template:
metadata:
labels:
app: nfd-master
spec:
serviceAccount: nfd-master
serviceAccountName: nfd-master
dnsPolicy: ClusterFirstWithHostNet
restartPolicy: Always
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Equal
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Equal
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference:
matchExpressions:
- key: node-role.kubernetes.io/master
operator: In
values:
- ""
weight: 1
- preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: In
values:
- ""
weight: 1
containers:
- name: nfd-master
env:
- name: NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: $(NODE_FEATURE_DISCOVERY_IMAGE)
imagePullPolicy: Always
command:
- "nfd-master"
args: []
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
runAsNonRoot: true
volumeMounts: []
livenessProbe:
exec:
command:
- /usr/bin/grpc_health_probe
- -addr=:12000
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
readinessProbe:
exec:
command:
- /usr/bin/grpc_health_probe
- -addr=:12000
failureThreshold: 10
initialDelaySeconds: 5
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
volumes: []
5 changes: 1 addition & 4 deletions build/assets/master/0500_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ kind: Service
metadata:
name: nfd-master
spec:
type: ClusterIP
selector:
app: nfd-master
ports:
- protocol: TCP
port: 12000
targetPort: 12000
name: nfd

type: ClusterIP
42 changes: 0 additions & 42 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,3 @@ resources:
- auth_proxy_role.yaml
- auth_proxy_role_binding.yaml
- auth_proxy_client_clusterrole.yaml

# needed for nfd-worker
# this patch is needed given that
# +kubebuilder does not allow resourceNames
patchesJSON6902:
- target:
kind: ClusterRole
name: manager-role
patch: |-
- op: add
path: /rules/0
value:
apiGroups:
- policy
resources:
- podsecuritypolicies
verbs:
- use
resourceNames:
- nfd-worker
- op: add
path: /rules/1
value:
apiGroups:
- nfd.k8s-sigs.io
resources:
- nodefeaturerules
verbs:
- get
- list
- watch
- op: add
path: /rules/2
value:
apiGroups:
- topology.node.k8s.io
resources:
- noderesourcetopologies
verbs:
- create
- get
- update
Loading

0 comments on commit 90a8681

Please sign in to comment.