feat: add cluster arch for helm values (#44)

beclab · Jul 26, 2024 · 6d1cb0e · 6d1cb0e
1 parent 60bbbeb
commit 6d1cb0e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/pkg/appinstaller/helm.go b/pkg/appinstaller/helm.go
@@ -412,6 +412,18 @@ func (h *HelmOps) setValues() (values map[string]interface{}, err error) {
 	values["svcs"] = svcs
 	klog.Info("svcs: ", svcs)
 
+	var arch string
+	nodes, err := kClient.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		return values, err
+	}
+	for _, node := range nodes.Items {
+		arch = node.Labels["kubernetes.io/arch"]
+		break
+	}
+	values["cluster"] = map[string]interface{}{
+		"arch": arch,
+	}
 	gpuType, err := utils.FindGpuTypeFromNodes(h.ctx, kClient)
 	if err != nil {
 		return values, err

diff --git a/pkg/users/userspace/v1/create.go b/pkg/users/userspace/v1/create.go
@@ -232,6 +232,19 @@ func (c *Creator) installSysApps(ctx context.Context, bflPod *corev1.Pod) error
 	}
 	vals["os"] = osVals
 
+	var arch string
+	nodes, err := c.clientSet.KubeClient.Kubernetes().CoreV1().Nodes().List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return err
+	}
+	for _, node := range nodes.Items {
+		arch = node.Labels["kubernetes.io/arch"]
+		break
+	}
+	vals["cluster"] = map[string]interface{}{
+		"arch": arch,
+	}
+
 	clientSet, err := kubernetes.NewForConfig(c.k8sConfig)
 	if err != nil {
 		return err

diff --git a/pkg/utils/helm.go b/pkg/utils/helm.go
@@ -126,6 +126,7 @@ func GetResourceListFromChart(chartPath string) (resources kube.ResourceList, er
 	}
 
 	values["domain"] = map[string]string{}
+	values["cluster"] = map[string]string{}
 	values["dep"] = map[string]interface{}{}
 	values["postgres"] = map[string]interface{}{
 		"databases": map[string]interface{}{},