fix: json format

beclab · Jul 27, 2024 · 5a31258 · 5a31258
1 parent 2063cfd
commit 5a31258
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/pkg/kubesphere/plugins/kscore_config.go b/pkg/kubesphere/plugins/kscore_config.go
@@ -175,8 +175,10 @@ type PatchKsCoreStatus struct {
 
 func (t *PatchKsCoreStatus) Execute(runtime connector.Runtime) error {
 	// ! todo need test on linux
-	// var jsonPath = fmt.Sprintf(`{\"status\": {\"core\": {\"status\": \"enabled\", \"enabledTime\": \"%s\"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
-	var jsonPath = fmt.Sprintf(`{"status": {"core": {"status": "enabled", "enabledTime": "%s"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
+	var jsonPath = fmt.Sprintf(`{\"status\": {\"core\": {\"status\": \"enabled\", \"enabledTime\": \"%s\"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
+	if runtime.GetRunner().Host.GetMinikube() {
+		jsonPath = fmt.Sprintf(`{"status": {"core": {"status": "enabled", "enabledTime": "%s"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
+	}
 	var cmd = fmt.Sprintf("/usr/local/bin/kubectl patch cc ks-installer --type merge -p '%s' -n %s", jsonPath, common.NamespaceKubesphereSystem)
 
 	_, err := runtime.GetRunner().SudoCmd(cmd, false, true)

diff --git a/pkg/kubesphere/plugins/redis.go b/pkg/kubesphere/plugins/redis.go
@@ -111,13 +111,13 @@ type PatchRedisStatus struct {
 }
 
 func (t *PatchRedisStatus) Execute(runtime connector.Runtime) error {
-	// var jsonPatch = fmt.Sprintf(`{\"status\": {\"redis\": {\"status\": \"enabled\", \"enabledTime\": \"%s\"}}}`,
-	// 	time.Now().Format("2006-01-02T15:04:05Z"))
-	// if runtime.GetRunner().Host.GetMinikube() {
-
-	// }
+	var jsonPatch = fmt.Sprintf(`{\"status\": {\"redis\": {\"status\": \"enabled\", \"enabledTime\": \"%s\"}}}`,
+		time.Now().Format("2006-01-02T15:04:05Z"))
+	if runtime.GetRunner().Host.GetMinikube() {
+		jsonPatch = fmt.Sprintf(`{"status": {"redis": {"status": "enabled", "enabledTime": "%s"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
+	}
 	// todo fix
-	var jsonPatch = fmt.Sprintf(`{"status": {"redis": {"status": "enabled", "enabledTime": "%s"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
+	// var jsonPatch = fmt.Sprintf(`{"status": {"redis": {"status": "enabled", "enabledTime": "%s"}}}`, time.Now().Format("2006-01-02T15:04:05Z"))
 	var cmd = fmt.Sprintf("/usr/local/bin/kubectl patch cc ks-installer --type merge -p '%s' -n %s", jsonPatch, common.NamespaceKubesphereSystem)
 
 	_, err := runtime.GetRunner().SudoCmd(cmd, false, true)