Skip to content

Commit 96cf5d3

Browse files
yansun1996sajmera-pensando
authored andcommitted
[Build] resolve compile conflicts during syncup staging
Signed-off-by: yansun1996 <[email protected]>
1 parent ccff1e4 commit 96cf5d3

17 files changed

+69
-12
lines changed

docs/test/auto-unhealthy-device-test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ in the above example ```35824``` is the GPU's KFD ID reported by amd-smi (in roc
175175
* ```namespace``` is the namespace where the test runner is running.
176176
* ```labels``` contains all the information regarding the event and is helpful for filtering the event.
177177

178-
```yaml
178+
```json
179179
"labels": {
180180
"testrunner.amd.com/category": "gpu_health_check",
181181
"testrunner.amd.com/gpu.id.0": "35824",

docs/test/pre-start-job-test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ LAST SEEN TYPE REASON OBJECT
143143
More detailed information about test result events can be found in [this section](./auto-unhealthy-device-test.md#check-test-result-event).
144144

145145
## Advanced Configuration - ConfigMap
146-
You can create a config map to customize the test triggger and recipe configs. For the example config map and explanation please check [this section](./auto-unhealthy-device-test.md#advanced-test-configuration).
146+
You can create a config map to customize the test trigger and recipe configs. For the example config map and explanation please check [this section](./manual-test.md#advanced-configuration---configmap).
147147

148148
After creating the config map, you can specify the volume and volume mount to mount the config map into test runner container.
149149

example/metricsExporter/configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
data:
77
config.json: |
88
{
9+
"ServerPort": 5000,
910
"GPUConfig": {
1011
"Fields": [
1112
"GPU_NODES_TOTAL",

hack/k8s-patch/template-patch/gpu-nfd-default-rule.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ metadata:
66
# the PCI info is from these websites:
77
# source1: https://admin.pci-ids.ucw.cz/read/PC/1002
88
# source2: https://devicehunt.com/view/type/pci/vendor/1002
9-
# Please refre to ROCm official website
10-
# vfor the driver compatibility matrix for different GPU models
119
spec:
1210
rules:
1311
- name: amd-vgpu

hack/k8s-patch/template-patch/metrics-exporter-rbac-proxy-rbac.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ rules:
1919
- subjectaccessreviews
2020
verbs:
2121
- create
22+
- apiGroups:
23+
- ""
24+
resources:
25+
- pods
26+
verbs:
27+
- get
28+
- list
29+
- watch
2230
- apiGroups:
2331
- ""
2432
resources:

hack/k8s-patch/template-patch/metrics-exporter-rbac.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ metadata:
77
app.kubernetes.io/part-of: amd-gpu
88
{{- include "helm-charts-k8s.labels" . | nindent 4 }}
99
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- pods
14+
verbs:
15+
- get
16+
- list
17+
- watch
1018
- apiGroups:
1119
- ""
1220
resources:

hack/openshift-patch/template-patch/metrics-exporter-rbac-proxy-rbac.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ rules:
2727
- subjectaccessreviews
2828
verbs:
2929
- create
30+
- apiGroups:
31+
- ""
32+
resources:
33+
- pods
34+
verbs:
35+
- get
36+
- list
3037
- apiGroups:
3138
- ""
3239
resources:

hack/openshift-patch/template-patch/metrics-exporter-rbac.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ metadata:
77
app.kubernetes.io/part-of: amd-gpu
88
{{- include "helm-charts-openshift.labels" . | nindent 4 }}
99
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- pods
14+
verbs:
15+
- get
16+
- list
1017
- apiGroups:
1118
- ""
1219
resources:

helm-charts-k8s/Chart.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ dependencies:
66
repository: file://./charts/kmm
77
version: v1.0.0
88
digest: sha256:f9a315dd2ce3d515ebf28c8e9a6a82158b493ca2686439ec381487761261b597
9-
generated: "2025-08-20T02:11:16.094989493Z"
9+
generated: "2025-08-20T11:56:52.623672453Z"

helm-charts-k8s/templates/gpu-nfd-default-rule.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ metadata:
66
# the PCI info is from these websites:
77
# source1: https://admin.pci-ids.ucw.cz/read/PC/1002
88
# source2: https://devicehunt.com/view/type/pci/vendor/1002
9-
# Please refre to ROCm official website
10-
# vfor the driver compatibility matrix for different GPU models
119
spec:
1210
rules:
1311
- name: amd-vgpu

0 commit comments

Comments
 (0)