Skip to content

Commit 11e02d2

Browse files
committed
helm: surface the --expose-pcie-root option
Now that the pcie root reporting is opt-in, and will be so till at least 1.38, we need to pass through the flag through helm. Since the feature is a strict superset of the old behavior, make sure to enable it on CI. Signed-off-by: Francesco Romani <fromani@redhat.com>
1 parent f0b8b51 commit 11e02d2

5 files changed

Lines changed: 12 additions & 1 deletion

File tree

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ endif
204204
--set image.pullPolicy=IfNotPresent \
205205
--set args.logLevel=6 \
206206
--set args.cpuDeviceMode=${DRACPU_E2E_CPU_DEVICE_MODE} \
207-
--set-string args.reservedCPUs=${DRACPU_E2E_RESERVED_CPUS}
207+
--set-string args.reservedCPUs=${DRACPU_E2E_RESERVED_CPUS} \
208+
--set args.exposePCIeRoots=true
208209
hack/ci/wait-resourcelices.sh
209210

210211
build-test-image: ## build tests image

deployment/helm/dra-driver-cpu/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ helm install dra-driver-cpu ./deployment/helm/dra-driver-cpu -n kube-system -f m
3030
| Key | Type | Default | Description |
3131
|-----|------|---------|-------------|
3232
| args.cpuDeviceMode | string | `"grouped"` | CPU exposure mode: `grouped` (expose NUMA nodes or sockets as devices) or `individual` (expose each CPU as a device) |
33+
| args.exposePCIeRoots | bool | `false` | Discover and expose PCIe roots as device attributes. Requires the `DRAListTypeAttributes=true` feature gate in the cluster |
3334
| args.groupBy | string | `"numanode"` | Grouping criteria when `cpuDeviceMode=grouped`: `numanode` or `socket` |
3435
| args.hostnameOverride | string | `""` | Override the node name the driver registers under; omitted when empty |
3536
| args.logLevel | int | `4` | Log verbosity level passed as `--v` |

deployment/helm/dra-driver-cpu/templates/daemonset.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ spec:
6464
{{- if .Values.args.hostnameOverride }}
6565
- --hostname-override={{ .Values.args.hostnameOverride }}
6666
{{- end }}
67+
{{- if .Values.args.exposePCIeRoots }}
68+
- --expose-pcie-roots
69+
{{- end }}
6770
image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
6871
imagePullPolicy: {{ .Values.image.pullPolicy }}
6972
ports:

deployment/helm/dra-driver-cpu/values.schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
"reservedCPUs": {
3939
"description": "CPUs reserved for the OS and kubelet, excluded from DRA management (e.g. `\"0-1\"`); omitted when empty",
4040
"type": "string"
41+
},
42+
"exposePCIeRoots": {
43+
"description": "Discover and expose PCIe roots as device attributes. Requires the `DRAListTypeAttributes=true` feature gate in the cluster",
44+
"type": "boolean"
4145
}
4246
},
4347
"additionalProperties": false

deployment/helm/dra-driver-cpu/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ args:
7171
reservedCPUs: ""
7272
# -- Override the node name the driver registers under; omitted when empty
7373
hostnameOverride: ""
74+
# -- Discover and expose PCIe roots as device attributes. Requires the `DRAListTypeAttributes=true` feature gate in the cluster
75+
exposePCIeRoots: false # @schema type:boolean
7476

7577
# -- Path for liveness and readiness probes
7678
healthzPath: /healthz

0 commit comments

Comments
 (0)