Merge pull request #46 from openinfradev/develop

20241002 release from develop

Author: ktkfree

cmd/server/cluster_status.go

@@ -45,6 +45,13 @@ func processClusterStatus() error {
 				switch workflow.Status.Phase {
 				case "Running":
 					newStatus = domain.ClusterStatus_INSTALLING
+
+					paused, err := argowfClient.IsPausedWorkflow(context.TODO(), "argo", workflowId)
+					if err == nil && paused {
+						newStatus = domain.ClusterStatus_STOPPED
+					}
+				case "Stopped":
+					newStatus = domain.ClusterStatus_STOPPED
 				case "Succeeded":
 					newStatus = domain.ClusterStatus_RUNNING
 				case "Failed":

go.mod

@@ -49,7 +49,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/openinfradev/tks-api v0.0.0-20240509015017-73cfae88477f // indirect
+	github.com/openinfradev/tks-api v0.0.0-20240702055309-610554b9f520 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect

go.sum

@@ -142,12 +142,8 @@ github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
 github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
 github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
 github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
-github.com/openinfradev/tks-api v0.0.0-20240411053710-5b8a434e8797 h1:DQ5naso3RdA0XxQ2Fj70xZ4O3vBhtWYR9Kpdy7LQqRE=
-github.com/openinfradev/tks-api v0.0.0-20240411053710-5b8a434e8797/go.mod h1:Ph4lPgdWg06R1GUNCtmXfzHNlNCW/XjUAvei+m5DD2o=
-github.com/openinfradev/tks-api v0.0.0-20240508035732-2495843420e9 h1:UWP8YleZKOq4RBvcquMSKZdguvwcnQOsj/bJgjSoLW0=
-github.com/openinfradev/tks-api v0.0.0-20240508035732-2495843420e9/go.mod h1:d7dJJYRDarGe73yxJ6UKxYgQuiftPhqNVGYcH13nmIk=
-github.com/openinfradev/tks-api v0.0.0-20240509015017-73cfae88477f h1:G1HC9OHMJb6aGMzM3xouE3P5YCQTj9xHSKAioUH26+4=
-github.com/openinfradev/tks-api v0.0.0-20240509015017-73cfae88477f/go.mod h1:d7dJJYRDarGe73yxJ6UKxYgQuiftPhqNVGYcH13nmIk=
+github.com/openinfradev/tks-api v0.0.0-20240702055309-610554b9f520 h1:h57Bw+UYtVIpmtmBgYyXPNS9E9JsC5i3hFfu/WE+J2Q=
+github.com/openinfradev/tks-api v0.0.0-20240702055309-610554b9f520/go.mod h1:01x6TpTcRwEFo89/+f+6MHPri562UoxflwhiacIm978=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=

internal/cluster/cluster.go

@@ -18,6 +18,7 @@ type Cluster struct {
 	Status         domain.ClusterStatus
 	StatusDesc     string
 	IsStack        bool
+	CloudService   string
 }
 
 // Accessor accesses cluster info in DB.