Skip to content

Commit cb5d03a

Browse files
cmontemuinocmontemuino
committed
helm: Merge branch 'master' into crds-in-subchart
Signed-off-by: cmontemuino <[email protected]>
2 parents e5ed797 + fd2893e commit cb5d03a

File tree

284 files changed

+1019
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+1019
-201
lines changed

‎deployment/base/rbac/master-clusterrole.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ kind: ClusterRole
33
metadata:
44
name: nfd-master
55
rules:
6+
- apiGroups:
7+
- ""
8+
resources:
9+
- namespaces
10+
verbs:
11+
- watch
12+
- list
613
- apiGroups:
714
- ""
815
resources:

‎deployment/components/master-config/nfd-master.conf.example

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66
# enableTaints: false
77
# labelWhiteList: "foo"
88
# resyncPeriod: "2h"
9+
# restrictions:
10+
# disableLabels: true
11+
# disableTaints: true
12+
# disableExtendedResources: true
13+
# disableAnnotations: true
14+
# allowOverwrite: false
15+
# denyNodeFeatureLabels: true
16+
# nodeFeatureNamespaceSelector:
17+
# matchLabels:
18+
# kubernetes.io/metadata.name: "node-feature-discovery"
19+
# matchExpressions:
20+
# - key: "kubernetes.io/metadata.name"
21+
# operator: "In"
22+
# values:
23+
# - "node-feature-discovery"
924
# klog:
1025
# addDirHeader: false
1126
# alsologtostderr: false

‎deployment/helm/node-feature-discovery/templates/clusterrole.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ metadata:
66
labels:
77
{{- include "node-feature-discovery.labels" . | nindent 4 }}
88
rules:
9+
- apiGroups:
10+
- ""
11+
resources:
12+
- namespaces
13+
verbs:
14+
- watch
15+
- list
916
- apiGroups:
1017
- ""
1118
resources:

‎deployment/helm/node-feature-discovery/templates/master.yaml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,44 @@ spec:
4848
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4949
imagePullPolicy: {{ .Values.image.pullPolicy }}
5050
livenessProbe:
51-
{{- toYaml .Values.master.livenessProbe | nindent 12 }}
51+
grpc:
52+
port: {{ .Values.master.healthPort | default "8082" }}
53+
{{- with .Values.master.livenessProbe.initialDelaySeconds }}
54+
initialDelaySeconds: {{ . }}
55+
{{- end }}
56+
{{- with .Values.master.livenessProbe.failureThreshold }}
57+
failureThreshold: {{ . }}
58+
{{- end }}
59+
{{- with .Values.master.livenessProbe.periodSeconds }}
60+
periodSeconds: {{ . }}
61+
{{- end }}
62+
{{- with .Values.master.livenessProbe.timeoutSeconds }}
63+
timeoutSeconds: {{ . }}
64+
{{- end }}
5265
readinessProbe:
53-
{{- toYaml .Values.master.readinessProbe | nindent 12 }}
66+
grpc:
67+
port: {{ .Values.master.healthPort | default "8082" }}
68+
{{- with .Values.master.readinessProbe.initialDelaySeconds }}
69+
initialDelaySeconds: {{ . }}
70+
{{- end }}
71+
{{- with .Values.master.readinessProbe.failureThreshold }}
72+
failureThreshold: {{ . }}
73+
{{- end }}
74+
{{- with .Values.master.readinessProbe.periodSeconds }}
75+
periodSeconds: {{ . }}
76+
{{- end }}
77+
{{- with .Values.master.readinessProbe.timeoutSeconds }}
78+
timeoutSeconds: {{ . }}
79+
{{- end }}
80+
{{- with .Values.master.readinessProbe.successThreshold }}
81+
successThreshold: {{ . }}
82+
{{- end }}
5483
ports:
5584
- containerPort: {{ .Values.master.port | default "8080" }}
5685
name: grpc
5786
- containerPort: {{ .Values.master.metricsPort | default "8081" }}
5887
name: metrics
59-
- containerPort: {{ .Values.master.healthPort | default "8082" }}
88+
- containerPort: {{ .Values.master.healthPort | default "8082" }}
6089
name: health
6190
env:
6291
- name: NODE_NAME
@@ -116,7 +145,7 @@ spec:
116145
- "-feature-gates={{ $key }}={{ $value }}"
117146
{{- end }}
118147
- "-metrics={{ .Values.master.metricsPort | default "8081" }}"
119-
- "-grpc-health={{ .Values.master.healthPort | default "8082" }}"
148+
- "-grpc-health={{ .Values.master.healthPort | default "8082" }}"
120149
{{- with .Values.master.extraArgs }}
121150
{{- toYaml . | nindent 12 }}
122151
{{- end }}

‎deployment/helm/node-feature-discovery/templates/topologyupdater.yaml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,38 @@ spec:
4545
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4646
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
4747
livenessProbe:
48-
{{- toYaml .Values.topologyUpdater.livenessProbe | nindent 10 }}
48+
grpc:
49+
port: {{ .Values.topologyUpdater.healthPort | default "8082" }}
50+
{{- with .Values.topologyUpdater.livenessProbe.initialDelaySeconds }}
51+
initialDelaySeconds: {{ . }}
52+
{{- end }}
53+
{{- with .Values.topologyUpdater.livenessProbe.failureThreshold }}
54+
failureThreshold: {{ . }}
55+
{{- end }}
56+
{{- with .Values.topologyUpdater.livenessProbe.periodSeconds }}
57+
periodSeconds: {{ . }}
58+
{{- end }}
59+
{{- with .Values.topologyUpdater.livenessProbe.timeoutSeconds }}
60+
timeoutSeconds: {{ . }}
61+
{{- end }}
4962
readinessProbe:
50-
{{- toYaml .Values.topologyUpdater.readinessProbe | nindent 10 }}
63+
grpc:
64+
port: {{ .Values.topologyUpdater.healthPort | default "8082" }}
65+
{{- with .Values.topologyUpdater.readinessProbe.initialDelaySeconds }}
66+
initialDelaySeconds: {{ . }}
67+
{{- end }}
68+
{{- with .Values.topologyUpdater.readinessProbe.failureThreshold }}
69+
failureThreshold: {{ . }}
70+
{{- end }}
71+
{{- with .Values.topologyUpdater.readinessProbe.periodSeconds }}
72+
periodSeconds: {{ . }}
73+
{{- end }}
74+
{{- with .Values.topologyUpdater.readinessProbe.timeoutSeconds }}
75+
timeoutSeconds: {{ . }}
76+
{{- end }}
77+
{{- with .Values.topologyUpdater.readinessProbe.successThreshold }}
78+
successThreshold: {{ . }}
79+
{{- end }}
5180
env:
5281
- name: NODE_NAME
5382
valueFrom:
@@ -90,14 +119,14 @@ spec:
90119
- "-kubelet-state-dir="
91120
{{- end }}
92121
- "-metrics={{ .Values.topologyUpdater.metricsPort | default "8081"}}"
93-
- "-grpc-health={{ .Values.topologyUpdater.healthPort | default "8082" }}"
122+
- "-grpc-health={{ .Values.topologyUpdater.healthPort | default "8082" }}"
94123
{{- with .Values.topologyUpdater.extraArgs }}
95124
{{- toYaml . | nindent 10 }}
96125
{{- end }}
97126
ports:
98127
- containerPort: {{ .Values.topologyUpdater.metricsPort | default "8081"}}
99128
name: metrics
100-
- containerPort: {{ .Values.topologyUpdater.healthPort | default "8082" }}
129+
- containerPort: {{ .Values.topologyUpdater.healthPort | default "8082" }}
101130
name: health
102131
volumeMounts:
103132
{{- if .Values.topologyUpdater.kubeletConfigPath | empty | not }}

‎deployment/helm/node-feature-discovery/templates/worker.yaml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,38 @@ spec:
4747
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4848
imagePullPolicy: {{ .Values.image.pullPolicy }}
4949
livenessProbe:
50-
{{- toYaml .Values.worker.livenessProbe | nindent 12 }}
50+
grpc:
51+
port: {{ .Values.worker.healthPort | default "8082" }}
52+
{{- with .Values.worker.livenessProbe.initialDelaySeconds }}
53+
initialDelaySeconds: {{ . }}
54+
{{- end }}
55+
{{- with .Values.worker.livenessProbe.failureThreshold }}
56+
failureThreshold: {{ . }}
57+
{{- end }}
58+
{{- with .Values.worker.livenessProbe.periodSeconds }}
59+
periodSeconds: {{ . }}
60+
{{- end }}
61+
{{- with .Values.worker.livenessProbe.timeoutSeconds }}
62+
timeoutSeconds: {{ . }}
63+
{{- end }}
5164
readinessProbe:
52-
{{- toYaml .Values.worker.readinessProbe | nindent 12 }}
65+
grpc:
66+
port: {{ .Values.worker.healthPort | default "8082" }}
67+
{{- with .Values.worker.readinessProbe.initialDelaySeconds }}
68+
initialDelaySeconds: {{ . }}
69+
{{- end }}
70+
{{- with .Values.worker.readinessProbe.failureThreshold }}
71+
failureThreshold: {{ . }}
72+
{{- end }}
73+
{{- with .Values.worker.readinessProbe.periodSeconds }}
74+
periodSeconds: {{ . }}
75+
{{- end }}
76+
{{- with .Values.worker.readinessProbe.timeoutSeconds }}
77+
timeoutSeconds: {{ . }}
78+
{{- end }}
79+
{{- with .Values.worker.readinessProbe.successThreshold }}
80+
successThreshold: {{ . }}
81+
{{- end }}
5382
env:
5483
- name: NODE_NAME
5584
valueFrom:
@@ -84,14 +113,14 @@ spec:
84113
- "-feature-gates={{ $key }}={{ $value }}"
85114
{{- end }}
86115
- "-metrics={{ .Values.worker.metricsPort | default "8081"}}"
87-
- "-grpc-health={{ .Values.worker.healthPort | default "8082" }}"
116+
- "-grpc-health={{ .Values.worker.healthPort | default "8082" }}"
88117
{{- with .Values.gc.extraArgs }}
89118
{{- toYaml . | nindent 8 }}
90119
{{- end }}
91120
ports:
92121
- containerPort: {{ .Values.worker.metricsPort | default "8081"}}
93122
name: metrics
94-
- containerPort: {{ .Values.worker.healthPort | default "8082" }}
123+
- containerPort: {{ .Values.worker.healthPort | default "8082" }}
95124
name: health
96125
volumeMounts:
97126
- name: host-boot

‎deployment/helm/node-feature-discovery/values.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,21 @@ master:
3737
# enableTaints: false
3838
# labelWhiteList: "foo"
3939
# resyncPeriod: "2h"
40+
# restrictions:
41+
# disableLabels: true
42+
# disableTaints: true
43+
# disableExtendedResources: true
44+
# disableAnnotations: true
45+
# allowOverwrite: false
46+
# denyNodeFeatureLabels: true
47+
# nodeFeatureNamespaceSelector:
48+
# matchLabels:
49+
# kubernetes.io/metadata.name: "node-feature-discovery"
50+
# matchExpressions:
51+
# - key: "kubernetes.io/metadata.name"
52+
# operator: "In"
53+
# values:
54+
# - "node-feature-discovery"
4055
# klog:
4156
# addDirHeader: false
4257
# alsologtostderr: false
@@ -157,12 +172,15 @@ master:
157172
initialDelaySeconds: 10
158173
# failureThreshold: 3
159174
# periodSeconds: 10
175+
# timeoutSeconds: 1
160176
readinessProbe:
161177
grpc:
162178
port: 8082
163179
initialDelaySeconds: 5
164180
failureThreshold: 10
165181
# periodSeconds: 10
182+
# timeoutSeconds: 1
183+
# successThreshold: 1
166184

167185
worker:
168186
enable: true
@@ -433,12 +451,15 @@ worker:
433451
initialDelaySeconds: 10
434452
# failureThreshold: 3
435453
# periodSeconds: 10
454+
# timeoutSeconds: 1
436455
readinessProbe:
437456
grpc:
438457
port: 8082
439458
initialDelaySeconds: 5
440459
failureThreshold: 10
441460
# periodSeconds: 10
461+
# timeoutSeconds: 1
462+
# successThreshold: 1
442463

443464
serviceAccount:
444465
# Specifies whether a service account should be created.
@@ -527,12 +548,15 @@ topologyUpdater:
527548
initialDelaySeconds: 10
528549
# failureThreshold: 3
529550
# periodSeconds: 10
551+
# timeoutSeconds: 1
530552
readinessProbe:
531553
grpc:
532554
port: 8082
533555
initialDelaySeconds: 5
534556
failureThreshold: 10
535557
# periodSeconds: 10
558+
# timeoutSeconds: 1
559+
# successThreshold: 1
536560

537561
resources:
538562
limits:

0 commit comments

Comments
 (0)