Merge pull request #1415 from AhmedGrati/feat-add-parameters-to-diable-master-and-worker

k8s-ci-robot · web-flow · commit 6424f196929b · 2023-10-11T22:31:56.000+02:00
feat: add parameters in helm to disable/enable nfd-master and nfd-worker
diff --git a/deployment/helm/node-feature-discovery/templates/cert-manager-certs.yaml b/deployment/helm/node-feature-discovery/templates/cert-manager-certs.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.tls.certManager }}
+{{- if .Values.master.enable }}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
@@ -21,8 +22,9 @@ spec:
     name: nfd-ca-issuer
     kind: Issuer
     group: cert-manager.io
-
+{{- end }}
 ---
+{{- if .Values.worker.enable }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -40,6 +42,7 @@ spec:
     name: nfd-ca-issuer
     kind: Issuer
     group: cert-manager.io
+{{- end }}
 
 {{- if .Values.topologyUpdater.enable }}
 ---
diff --git a/deployment/helm/node-feature-discovery/templates/clusterrole.yaml b/deployment/helm/node-feature-discovery/templates/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.master.rbac.create }}
+{{- if and .Values.master.enable .Values.master.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml b/deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.master.rbac.create }}
+{{- if and .Values.master.enable .Values.master.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.master.enable }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -141,3 +142,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
+{{- end }}
diff --git a/deployment/helm/node-feature-discovery/templates/nfd-master-conf.yaml b/deployment/helm/node-feature-discovery/templates/nfd-master-conf.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.master.enable }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,3 +9,4 @@ metadata:
 data:
   nfd-master.conf: |-
     {{- .Values.master.config | toYaml | nindent 4 }}
+{{- end }}
diff --git a/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml b/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.worker.enable }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,3 +9,4 @@ metadata:
 data:
   nfd-worker.conf: |-
     {{- .Values.worker.config | toYaml | nindent 4 }}
+{{- end }}
diff --git a/deployment/helm/node-feature-discovery/templates/role.yaml b/deployment/helm/node-feature-discovery/templates/role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.worker.rbac.create }}
+{{- if and .Values.worker.enable .Values.worker.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/deployment/helm/node-feature-discovery/templates/rolebinding.yaml b/deployment/helm/node-feature-discovery/templates/rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.worker.rbac.create }}
+{{- if and .Values.worker.enable .Values.worker.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
diff --git a/deployment/helm/node-feature-discovery/templates/service.yaml b/deployment/helm/node-feature-discovery/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.enableNodeFeatureApi }}
+{{- if and (not .Values.enableNodeFeatureApi) .Values.master.enable }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/deployment/helm/node-feature-discovery/templates/serviceaccount.yaml b/deployment/helm/node-feature-discovery/templates/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.master.serviceAccount.create -}}
+{{- if and .Values.master.enable .Values.master.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -42,7 +42,7 @@ metadata:
   {{- end }}
 {{- end }}
 
-{{- if .Values.worker.serviceAccount.create }}
+{{- if and .Values.worker.enable .Values.worker.serviceAccount.create }}
 ---
 apiVersion: v1
 kind: ServiceAccount
diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.worker.enable }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -150,3 +151,4 @@ spec:
     {{- with .Values.worker.priorityClassName }}
       priorityClassName: {{ . | quote }}
     {{- end }}
+{{- end }}
diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
@@ -13,6 +13,7 @@ namespaceOverride: ""
 enableNodeFeatureApi: true
 
 master:
+  enable: true
   config: ### <NFD-MASTER-CONF-START-DO-NOT-REMOVE>
     # noPublish: false
     # extraLabelNs: ["added.ns.io","added.kubernets.io"]
@@ -132,6 +133,7 @@ master:
                 values: [""]
 
 worker:
+  enable: true
   config: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
     #core:
     #  labelWhiteList:
diff --git a/docs/deployment/helm.md b/docs/deployment/helm.md
@@ -114,6 +114,7 @@ API's you need to install the prometheus operator in your cluster.
 | Name                        | Type    | Default                                 | description                                                                                                                              |
 |-----------------------------|---------|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------|
 | `master.*`                  | dict    |                                         | NFD master deployment configuration                                                                                                      |
+| `master.enable`            | bool    | true                                    | Specifies whether nfd-master should be deployed |
 | `master.port`               | integer |                                         | Specifies the TCP port that nfd-master listens for incoming requests. **NOTE**: this parameter is related to the deprecated gRPC API and will be removed with it in a future release    |
 | `master.metricsPort`        | integer |   8081                                  | Port on which to expose metrics from components to prometheus operator |
 | `master.instance`           | string  |                                         | Instance name. Used to separate annotation namespaces for multiple parallel deployments                                                  |
@@ -146,6 +147,7 @@ API's you need to install the prometheus operator in your cluster.
 | Name | Type | Default | description |
 | ---- | ---- | ------- | ----------- |
 | `worker.*` | dict |  | NFD worker daemonset configuration |
+| `worker.enable` | bool | true | Specifies whether nfd-worker should be deployed |
 | `worker.metricsPort*` | integer | 8081 | Port on which to expose metrics from components to prometheus operator |
 | `worker.config` | dict |  | NFD worker [configuration](../reference/worker-configuration-reference) |
 | `worker.podSecurityContext` | dict | {} | [PodSecurityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) holds pod-level security attributes and common container settings |

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.master.rbac.create }}`
	`1`	`+{{- if and .Values.master.enable .Values.master.rbac.create }}`
`2`	`2`	`apiVersion: rbac.authorization.k8s.io/v1`
`3`	`3`	`kind: ClusterRole`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.worker.rbac.create }}`
	`1`	`+{{- if and .Values.worker.enable .Values.worker.rbac.create }}`
`2`	`2`	`apiVersion: rbac.authorization.k8s.io/v1`
`3`	`3`	`kind: Role`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if not .Values.enableNodeFeatureApi }}`
	`1`	`+{{- if and (not .Values.enableNodeFeatureApi) .Values.master.enable }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: Service`
`4`	`4`	`metadata:`