Merge pull request #2411 from jcpunk/hostUsers

feat(helm): Allow control of hostUsers

Author: k8s-ci-robot

deployment/helm/node-feature-discovery/README.md

@@ -175,6 +175,7 @@ NFD.
 | master.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/master-commandline-reference) to pass to nfd-master. |
 | master.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-master container. |
 | master.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| master.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | master.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD master pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy). |
 | master.config | string | `nil` | NFD master [configuration](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/master-configuration-reference). |
 | master.port | int | `8080` | Port on which to serve http for metrics and healthz endpoints. |
@@ -231,6 +232,7 @@ NFD.
 | worker.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/worker-commandline-reference) to pass to nfd-worker. |
 | worker.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-worker container. |
 | worker.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| worker.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | worker.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD worker pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy). |
 | worker.config | string | `nil` | NFD worker [configuration](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/worker-configuration-reference). |
 | worker.port | int | `8080` | Port on which to serve http for metrics and healthz endpoints. |
@@ -277,6 +279,7 @@ NFD.
 | topologyUpdater.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/topology-updater-commandline-reference) to pass to nfd-topology-updater. |
 | topologyUpdater.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-topology-updater container. |
 | topologyUpdater.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| topologyUpdater.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | topologyUpdater.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD topology updater pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy). |
 | topologyUpdater.serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |
 | topologyUpdater.serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations) to add to the service account. |
@@ -323,6 +326,7 @@ NFD.
 | gc.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/gc-commandline-reference) to pass to nfd-gc. |
 | gc.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-gc container. |
 | gc.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| gc.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | gc.replicaCount | int | `1` | The number of desired replicas for the nfd-gc Deployment. |
 | gc.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD gc pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy). |
 | gc.serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |

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

@@ -42,6 +42,9 @@ spec:
       securityContext:
         {{- toYaml .Values.master.podSecurityContext | nindent 8 }}
       hostNetwork: {{ .Values.master.hostNetwork }}
+      {{- if kindIs "bool" .Values.master.hostUsers }}
+      hostUsers: {{ .Values.master.hostUsers }}
+      {{- end }}
       containers:
         - name: master
           securityContext:

deployment/helm/node-feature-discovery/templates/nfd-gc.yaml

@@ -40,6 +40,9 @@ spec:
       securityContext:
         {{- toYaml .Values.gc.podSecurityContext | nindent 8 }}
       hostNetwork: {{ .Values.gc.hostNetwork }}
+      {{- if kindIs "bool" .Values.gc.hostUsers }}
+      hostUsers: {{ .Values.gc.hostUsers }}
+      {{- end }}
       containers:
       - name: gc
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

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

@@ -40,6 +40,9 @@ spec:
       securityContext:
         {{- toYaml .Values.topologyUpdater.podSecurityContext | nindent 8 }}
       hostNetwork: {{ .Values.topologyUpdater.hostNetwork }}
+      {{- if kindIs "bool" .Values.topologyUpdater.hostUsers }}
+      hostUsers: {{ .Values.topologyUpdater.hostUsers }}
+      {{- end }}
       containers:
       - name: topology-updater
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

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

@@ -44,6 +44,9 @@ spec:
       securityContext:
         {{- toYaml .Values.worker.podSecurityContext | nindent 8 }}
       hostNetwork: {{ .Values.worker.hostNetwork }}
+      {{- if kindIs "bool" .Values.worker.hostUsers }}
+      hostUsers: {{ .Values.worker.hostUsers }}
+      {{- end }}
       containers:
       - name: worker
         securityContext:

deployment/helm/node-feature-discovery/values.schema.json

@@ -55,6 +55,13 @@
                     "description": "Run the container in the host's network namespace.",
                     "type": "boolean"
                 },
+                "hostUsers": {
+                    "description": "Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.",
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
                 "interval": {
                     "description": "Time between periodic garbage collector runs.",
                     "type": "string"
@@ -353,6 +360,13 @@
                     "description": "Run the container in the host's network namespace.",
                     "type": "boolean"
                 },
+                "hostUsers": {
+                    "description": "Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.",
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
                 "instance": {
                     "description": "Instance name. Used to separate annotation namespaces for multiple parallel deployments.",
                     "type": [
@@ -695,6 +709,13 @@
                     "description": "Run the container in the host's network namespace.",
                     "type": "boolean"
                 },
+                "hostUsers": {
+                    "description": "Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.",
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
                 "kubeletConfigPath": {
                     "description": "Host path for the kubelet config file.",
                     "type": [
@@ -953,6 +974,13 @@
                     "description": "Run the container in the host's network namespace.",
                     "type": "boolean"
                 },
+                "hostUsers": {
+                    "description": "Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.",
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
                 "labels": {
                     "description": "[Labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to add to the nfd-worker pods.",
                     "$ref": "#/$defs/_definitions.json/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels",

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

@@ -65,6 +65,10 @@ master:
   # -- Run the container in the host's network namespace.
   # @section -- NFD-Master
   hostNetwork: false
+  # @schema type: [boolean, null]
+  # -- (bool) Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.
+  # @section -- NFD-Master
+  hostUsers: ~  # @schema type: [boolean, null]
   # @enum: [Default, ClusterFirst, ClusterFirstWithHostNet, None]
   # -- NFD master pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy).
   # @section -- NFD-Master
@@ -370,6 +374,10 @@ worker:
   # -- Run the container in the host's network namespace.
   # @section -- NFD-Worker
   hostNetwork: false
+  # @schema type: [boolean, null]
+  # -- (bool) Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.
+  # @section -- NFD-Worker
+  hostUsers: ~  # @schema type: [boolean, null]
   # @enum: [Default, ClusterFirst, ClusterFirstWithHostNet, None]
   # -- NFD worker pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy).
   # @section -- NFD-Worker
@@ -824,6 +832,10 @@ topologyUpdater:
   # -- Run the container in the host's network namespace.
   # @section -- NFD-Topology-Updater
   hostNetwork: false
+  # @schema type: [boolean, null]
+  # -- (bool) Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.
+  # @section -- NFD-Topology-Updater
+  hostUsers: ~  # @schema type: [boolean, null]
   # @enum: [Default, ClusterFirst, ClusterFirstWithHostNet, None]
   # -- NFD topology updater pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy).
   # @section -- NFD-Topology-Updater
@@ -1020,6 +1032,10 @@ gc:
   # -- Run the container in the host's network namespace.
   # @section -- NFD-GC
   hostNetwork: false
+  # @schema type: [boolean, null]
+  # -- (bool) Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true.
+  # @section -- NFD-GC
+  hostUsers: ~  # @schema type: [boolean, null]
   # -- The number of desired replicas for the nfd-gc Deployment.
   # @section -- NFD-GC
   replicaCount: 1

docs/deployment/helm.md

@@ -193,6 +193,7 @@ NFD.
 | master.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/master-commandline-reference) to pass to nfd-master. |
 | master.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-master container. |
 | master.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| master.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | master.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD master pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy). |
 | master.config | string | `nil` | NFD master [configuration](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/master-configuration-reference). |
 | master.port | int | `8080` | Port on which to serve http for metrics and healthz endpoints. |
@@ -249,6 +250,7 @@ NFD.
 | worker.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/worker-commandline-reference) to pass to nfd-worker. |
 | worker.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-worker container. |
 | worker.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| worker.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | worker.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD worker pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy). |
 | worker.config | string | `nil` | NFD worker [configuration](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/worker-configuration-reference). |
 | worker.port | int | `8080` | Port on which to serve http for metrics and healthz endpoints. |
@@ -295,6 +297,7 @@ NFD.
 | topologyUpdater.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/topology-updater-commandline-reference) to pass to nfd-topology-updater. |
 | topologyUpdater.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-topology-updater container. |
 | topologyUpdater.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| topologyUpdater.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | topologyUpdater.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD topology updater pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy). |
 | topologyUpdater.serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |
 | topologyUpdater.serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations) to add to the service account. |
@@ -341,6 +344,7 @@ NFD.
 | gc.extraArgs | list | `[]` | Additional [command line arguments](https://kubernetes-sigs.github.io/node-feature-discovery/master/reference/gc-commandline-reference) to pass to nfd-gc. |
 | gc.extraEnvs | list | `[]` | Additional environment variables to set in the nfd-gc container. |
 | gc.hostNetwork | bool | `false` | Run the container in the host's network namespace. |
+| gc.hostUsers | bool | `nil` | Run the container with host user ids. NOTE: if hostNetwork is true, hostUsers should be true. |
 | gc.replicaCount | int | `1` | The number of desired replicas for the nfd-gc Deployment. |
 | gc.dnsPolicy | string | `"ClusterFirstWithHostNet"` | NFD gc pod [dnsPolicy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-policy). |
 | gc.serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |