Merge pull request #31 from beclab/fix/nats

fix: loss nats config when upgrade
beclab · Nov 28, 2024 · e165839 · e165839
2 parents ac1d3ac + 1d4b706
commit e165839
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/cmd/middleware/operator/middleware-request/controller_config.go b/cmd/middleware/operator/middleware-request/controller_config.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"time"
 
 	workload_nats "bytetrade.io/web3os/tapr/pkg/workload/nats"
@@ -80,15 +81,7 @@ func (c *configmapController) handleAddObject(obj interface{}) {
 }
 
 func (c *configmapController) handleUpdateObject(obj interface{}) {
-	cm, ok := obj.(*corev1.ConfigMap)
-	if !ok {
-		klog.Infof("Not a ConfigMap")
-		return
-	}
-	if cm.Name != "nats-config" {
-		return
-	}
-	c.enqueue(enqueueObj{UPDATE, obj})
+	return
 }
 
 func (c *configmapController) Run(workers int) error {
@@ -157,12 +150,16 @@ func (c *configmapController) handler(action Action, obj interface{}) error {
 		return errors.New("invalid configmap object")
 	}
 
+	if _, err := os.Stat(workload_nats.ConfPath); err == nil {
+		return nil
+	}
+
 	natsConf, exists := cm.Data["nats.conf"]
 	if !exists {
 		klog.Infof("nats.conf not found in configmap data")
 		return errors.New("nats.conf not found in configmap data")
 	}
-	err := os.MkdirAll("/dbdata/nats_data/config", 0755)
+	err := os.MkdirAll(filepath.Dir(workload_nats.ConfPath), 0755)
 	if err != nil {
 		klog.Infof("mkdirall err=%v", err)
 		return err

diff --git a/pkg/workload/nats/conf.go b/pkg/workload/nats/conf.go
@@ -2,13 +2,12 @@ package nats
 
 import (
 	"bytes"
-	"context"
+	"io/ioutil"
 	"strings"
 	"text/template"
 
 	"github.com/mitchellh/mapstructure"
 	load "github.com/nats-io/nats-server/conf"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 )
 
@@ -79,16 +78,7 @@ func RenderConfigFile(config *Config) error {
 	if err != nil {
 		return err
 	}
-	clientSet, err := newClientSet()
-	if err != nil {
-		return err
-	}
-	cm, err := clientSet.CoreV1().ConfigMaps("os-system").Get(context.TODO(), "nats-config", metav1.GetOptions{})
-	if err != nil {
-		return err
-	}
-	cm.Data["nats.conf"] = string(data)
-	_, err = clientSet.CoreV1().ConfigMaps("os-system").Update(context.TODO(), cm, metav1.UpdateOptions{})
+	err = ioutil.WriteFile(ConfPath, data, 0644)
 	if err != nil {
 		return err
 	}