support deploy website

Signed-off-by: wanghai01 <[email protected]>
Signed-off-by: YLShiJustFly <[email protected]>

Author: SeanHai

.github/workflows/go.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Generate SSH key
         run: ssh-keygen -f ~/.ssh/id_rsa -P ""
       - name: Test
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Set dependencies
         run: sudo apt update && sudo apt install musl-tools
       - name: Build

Makefile

@@ -62,6 +62,7 @@ build:
 
 debug:
 	$(GOENV) $(GO) build -o $(OUTPUT) $(DEBUG_FLAGS) $(PACKAGES)
+	$(GOENV) $(GO) build -o $(SERVER_OUTPUT) $(DEBUG_FLAGS) $(SERVER_PACKAGES)
 
 test:
 	$(GO_TEST) $(TEST_FLAGS) ./...

cli/cli/cli.go

@@ -377,6 +377,11 @@ func (curveadm *CurveAdm) GetServiceId(dcId string) string {
 	return utils.MD5Sum(serviceId)[:12]
 }
 
+// website is cluster-independent
+func (curveadm *CurveAdm) GetWebsiteServiceId(wcId string) string {
+	return utils.MD5Sum(wcId)[:12]
+}
+
 func (curveadm *CurveAdm) GetContainerId(serviceId string) (string, error) {
 	containerId, err := curveadm.Storage().GetContainerId(serviceId)
 	if err != nil {

cli/command/cmd.go

@@ -33,11 +33,12 @@ import (
 	"github.com/opencurve/curveadm/cli/command/config"
 	"github.com/opencurve/curveadm/cli/command/disks"
 	"github.com/opencurve/curveadm/cli/command/hosts"
-	"github.com/opencurve/curveadm/cli/command/monitor"
 	"github.com/opencurve/curveadm/cli/command/http"
+	"github.com/opencurve/curveadm/cli/command/monitor"
 	"github.com/opencurve/curveadm/cli/command/pfs"
 	"github.com/opencurve/curveadm/cli/command/playground"
 	"github.com/opencurve/curveadm/cli/command/target"
+	"github.com/opencurve/curveadm/cli/command/website"
 	"github.com/opencurve/curveadm/internal/errno"
 	tools "github.com/opencurve/curveadm/internal/tools/upgrade"
 	cliutil "github.com/opencurve/curveadm/internal/utils"
@@ -70,6 +71,7 @@ func addSubCommands(cmd *cobra.Command, curveadm *cli.CurveAdm) {
 		pfs.NewPFSCommand(curveadm),               // curveadm pfs ...
 		monitor.NewMonitorCommand(curveadm),       // curveadm monitor ...
 		http.NewHttpCommand(curveadm),             // curveadm http
+		website.NewWebsiteCommand(curveadm),       // curveadm website ...
 
 		NewAuditCommand(curveadm),      // curveadm audit
 		NewCleanCommand(curveadm),      // curveadm clean

cli/command/disks/commit.go

@@ -174,12 +174,12 @@ func syncDiskRecords(data string, dcs []*disks.DiskConfig,
 		if !slient {
 			diff := utils.Diff(oldDiskRecordsString, newDiskRecordsString)
 			curveadm.WriteOutln(diff)
-		}
 
-		pass := tuicomm.ConfirmYes("Disk changes are showing above. Do you want to continue?")
-		if !pass {
-			curveadm.WriteOut(tuicomm.PromptCancelOpetation("commit disk table"))
-			return errno.ERR_CANCEL_OPERATION
+			pass := tuicomm.ConfirmYes("Disk changes are showing above. Do you want to continue?")
+			if !pass {
+				curveadm.WriteOut(tuicomm.PromptCancelOpetation("commit disk table"))
+				return errno.ERR_CANCEL_OPERATION
+			}
 		}
 	}
 

cli/command/monitor/deploy.go

@@ -42,7 +42,7 @@ const (
 )
 
 var (
-	MONITOR_DEPLOY_STEPS = []int{
+	DEPLOY_PLAYBOOK_STEPS = []int{
 		playbook.PULL_MONITOR_IMAGE,
 		playbook.CREATE_MONITOR_CONTAINER,
 		playbook.SYNC_MONITOR_CONFIG,
@@ -86,7 +86,7 @@ func NewDeployCommand(curveadm *cli.CurveAdm) *cobra.Command {
 
 func genDeployPlaybook(curveadm *cli.CurveAdm,
 	mcs []*configure.MonitorConfig) (*playbook.Playbook, error) {
-	steps := MONITOR_DEPLOY_STEPS
+	steps := DEPLOY_PLAYBOOK_STEPS
 	pb := playbook.NewPlaybook(curveadm)
 	for _, step := range steps {
 		if step == playbook.CLEAN_CONFIG_CONTAINER {

cli/command/monitor/reload.go

@@ -34,7 +34,8 @@ import (
 )
 
 var (
-	MONITOR_RELOAD_STEPS = []int{
+	RELOAD_PLAYBOOK_STEPS = []int{
+		playbook.PULL_MONITOR_IMAGE,
 		playbook.CREATE_MONITOR_CONTAINER,
 		playbook.SYNC_MONITOR_CONFIG,
 		playbook.CLEAN_CONFIG_CONTAINER,
@@ -80,7 +81,7 @@ func genReloadPlaybook(curveadm *cli.CurveAdm,
 		return nil, errno.ERR_NO_SERVICES_MATCHED
 	}
 
-	steps := MONITOR_RELOAD_STEPS
+	steps := RELOAD_PLAYBOOK_STEPS
 	pb := playbook.NewPlaybook(curveadm)
 	for _, step := range steps {
 		if step == playbook.CREATE_MONITOR_CONTAINER || step == playbook.CLEAN_CONFIG_CONTAINER {

cli/command/monitor/restart.go

@@ -33,7 +33,7 @@ import (
 )
 
 var (
-	MONITOR_RESTART_STEPS = []int{
+	RESTART_PLAYBOOK_STEPS = []int{
 		playbook.RESTART_MONITOR_SERVICE,
 	}
 )
@@ -76,7 +76,7 @@ func genRestartPlaybook(curveadm *cli.CurveAdm,
 		return nil, errno.ERR_NO_SERVICES_MATCHED
 	}
 
-	steps := MONITOR_RESTART_STEPS
+	steps := RESTART_PLAYBOOK_STEPS
 	pb := playbook.NewPlaybook(curveadm)
 	for _, step := range steps {
 		pb.AddStep(&playbook.PlaybookStep{

cli/command/monitor/start.go

@@ -33,7 +33,7 @@ import (
 )
 
 var (
-	MONITOR_START_STEPS = []int{
+	START_PLAYBOOK_STEPS = []int{
 		playbook.START_MONITOR_SERVICE,
 	}
 )
@@ -76,7 +76,7 @@ func genStartPlaybook(curveadm *cli.CurveAdm,
 		return nil, errno.ERR_NO_SERVICES_MATCHED
 	}
 
-	steps := MONITOR_START_STEPS
+	steps := START_PLAYBOOK_STEPS
 	pb := playbook.NewPlaybook(curveadm)
 	for _, step := range steps {
 		pb.AddStep(&playbook.PlaybookStep{

cli/command/monitor/status.go

@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	GET_MONITOR_STATUS_PLAYBOOK_STEPS = []int{
+	STATUS_PLAYBOOK_STEPS = []int{
 		playbook.INIT_MONITOR_STATUS,
 		playbook.GET_MONITOR_STATUS,
 	}
@@ -93,7 +93,7 @@ func genStatusPlaybook(curveadm *cli.CurveAdm,
 		return nil, errno.ERR_NO_SERVICES_MATCHED
 	}
 
-	steps := GET_MONITOR_STATUS_PLAYBOOK_STEPS
+	steps := STATUS_PLAYBOOK_STEPS
 	pb := playbook.NewPlaybook(curveadm)
 	for _, step := range steps {
 		pb.AddStep(&playbook.PlaybookStep{
@@ -109,7 +109,7 @@ func genStatusPlaybook(curveadm *cli.CurveAdm,
 	return pb, nil
 }
 
-func displayStatus(curveadm *cli.CurveAdm, dcs []*configure.MonitorConfig, options statusOptions) {
+func displayStatus(curveadm *cli.CurveAdm, mcs []*configure.MonitorConfig, options statusOptions) {
 	statuses := []monitor.MonitorStatus{}
 	value := curveadm.MemStorage().Get(comm.KEY_MONITOR_STATUS)
 	if value != nil {
@@ -122,7 +122,7 @@ func displayStatus(curveadm *cli.CurveAdm, dcs []*configure.MonitorConfig, optio
 	output := tui.FormatMonitorStatus(statuses, options.verbose)
 	curveadm.WriteOutln("")
 	curveadm.WriteOutln("cluster name      : %s", curveadm.ClusterName())
-	curveadm.WriteOutln("cluster kind      : %s", dcs[0].GetKind())
+	curveadm.WriteOutln("cluster kind      : %s", mcs[0].GetKind())
 	curveadm.WriteOutln("")
 	curveadm.WriteOut("%s", output)
 }