Skip to content

Commit 60fccfe

Browse files
committed
--amend
Signed-off-by: rongfu.leng <lenronfu@gmail.com>
1 parent db3f337 commit 60fccfe

File tree

7 files changed

+170
-301
lines changed

7 files changed

+170
-301
lines changed

charts/metax-operator/custom.sh

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,27 @@ echo "Extracted helm complete"
3636
#' metax-operator/values.yaml
3737

3838
yq -i "
39-
.registry=\"release.daocloud.io/metax\" |
40-
.image.registry=\"release.daocloud.io/metax\" |
41-
.gpuLabel.image.name=\"gpu-label\" |
39+
.registry=\"release.daocloud.io\" |
40+
.image.registry=\"release.daocloud.io\" |
41+
.gpuLabel.image.name=\"metax/gpu-label\" |
4242
.gpuLabel.image.version=\"$MX_VERSION\" |
43-
.driver.image.name=\"driver-manager\" |
43+
.driver.image.name=\"metax/driver-manager\" |
4444
.driver.image.version=\"$MX_VERSION\" |
45-
.driver.payload.name=\"driver-image\" |
45+
.driver.payload.name=\"metax/driver-image\" |
4646
.driver.payload.version=\"2.25.2.8\" |
4747
.maca.payload.registry=\"\" |
48-
.maca.payload.name=\"cr.metax-tech.com/library/maca-c500\" |
48+
.maca.payload.name=\"metax/cr.metax-tech.com/library/maca-c500\" |
4949
.maca.payload.version=\"2.20.2.19-ubuntu22.04-amd64\" |
50-
.maca.image.name=\"driver-manager\" |
50+
.maca.image.name=\"metax/driver-manager\" |
5151
.maca.image.version=\"$MX_VERSION\" |
52-
.runtime.image.name=\"container-runtime\" |
52+
.runtime.image.name=\"metax/container-runtime\" |
5353
.runtime.image.version=\"$MX_VERSION\" |
54-
.gpuDevice.image.name=\"gpu-device\" |
54+
.gpuDevice.image.name=\"metax/gpu-device\" |
5555
.gpuDevice.image.version=\"$MX_VERSION\" |
56-
.dataExporter.image.name=\"mx-exporter\" |
56+
.dataExporter.image.name=\"metax/mx-exporter\" |
5757
.dataExporter.image.version=\"$MX_VERSION\" |
58-
.controller.image.version=\"$MX_VERSION\"
58+
.controller.image.version=\"$MX_VERSION\" |
59+
.controller.image.name=\"metax/operator-controller\"
5960
" metax-operator/values.yaml
6061

6162

@@ -69,7 +70,7 @@ elif [ $os == "Linux" ]; then
6970
fi
7071

7172

72-
helm schema-gen metax-operator/values.yaml > metax-operator/values.schema.json
73+
helm schema-gen parent/values-schema.yaml > metax-operator/values.schema.json
7374
cp -rf parent/ metax-operator/
7475

7576
echo rm -rf ./metax-gpu-k8s-package.${MX_VERSION}

charts/metax-operator/metax-operator/.relok8s-images.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
- "{{ .image.registry }}/{{ .runtime.image.name }}:{{ .runtime.image.version }}"
66
- "{{ .image.registry }}/{{ .gpuDevice.image.name }}:{{ .gpuDevice.image.version }}"
77
- "{{ .image.registry }}/{{ .dataExporter.image.name }}:{{ .dataExporter.image.version }}"
8-
- "{{ .image.registry }}/{{ .controller.name }}:{{ .controller.image.version }}"
8+
- "{{ .image.registry }}/{{ .controller.image.name }}:{{ .controller.image.version }}"
99
- "{{ .image.registry }}/{{ .maca.payload.name }}:{{ .maca.payload.version}}"
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Default values for metax-operator.
2+
# This is a YAML-formatted file.
3+
# Declare variables to be passed into your templates.
4+
5+
registry: release.daocloud.io
6+
pullPolicy: IfNotPresent
7+
controller:
8+
replicaCount: 1
9+
name: operator-controller
10+
image:
11+
version: 0.9.0
12+
name: metax/operator-controller
13+
gpuLabel:
14+
log:
15+
image:
16+
name: metax/gpu-label
17+
version: 0.9.0
18+
# kernel module driver config
19+
driver:
20+
deployPolicy: "PreferCloud"
21+
# fw upgrade
22+
payload:
23+
name: "metax/driver-image"
24+
version: "2.25.2.8"
25+
image:
26+
name: metax/driver-manager
27+
version: 0.9.0
28+
# maca config
29+
maca:
30+
image:
31+
name: metax/driver-manager
32+
version: 0.9.0
33+
# container runtime config
34+
runtime:
35+
image:
36+
name: metax/container-runtime
37+
version: 0.9.0
38+
# device plugin config
39+
gpuDevice:
40+
image:
41+
name: metax/gpu-device
42+
version: 0.9.0
43+
# data exporter config
44+
dataExporter:
45+
deploy: false
46+
service:
47+
type: ClusterIP
48+
port: 30445
49+
image:
50+
version: "0.9.0"
51+
name: metax/mx-exporter
52+
image:
53+
registry: release.daocloud.io

0 commit comments

Comments
 (0)