mirror of
https://github.com/rancher/types.git
synced 2025-05-09 07:36:18 +00:00
Make ready unknown be an error
This commit is contained in:
parent
10d44ca5c9
commit
8bea13cc6c
@ -37,7 +37,7 @@ var transitioningMap = map[string]string{
|
||||
"Progressing": "updating",
|
||||
"DockerProvisioned": "provisioning",
|
||||
"Provisioned": "provisioning",
|
||||
"Registered": "waiting",
|
||||
"Registered": "registering",
|
||||
"Removed": "removing",
|
||||
"Saved": "saving",
|
||||
"Updated": "updating",
|
||||
@ -66,7 +66,7 @@ var errorMapping = map[string]bool{
|
||||
|
||||
// True ==
|
||||
// False == transitioning
|
||||
// Unknown ==
|
||||
// Unknown == error
|
||||
var doneMap = map[string]string{
|
||||
"Completed": "activating",
|
||||
"Ready": "unavailable",
|
||||
@ -87,6 +87,10 @@ func Set(data map[string]interface{}) {
|
||||
return
|
||||
}
|
||||
|
||||
val, conditionsOk := values.GetValue(data, "status", "conditions")
|
||||
var conditions []condition
|
||||
convert.ToObj(val, &conditions)
|
||||
|
||||
val, ok := values.GetValue(data, "metadata", "removed")
|
||||
if ok && val != "" && val != nil {
|
||||
data["state"] = "removing"
|
||||
@ -96,8 +100,21 @@ func Set(data map[string]interface{}) {
|
||||
if !ok {
|
||||
finalizers, ok = values.GetStringSlice(data, "spec", "finalizers")
|
||||
}
|
||||
|
||||
msg := ""
|
||||
for _, cond := range conditions {
|
||||
if cond.Type == "Removed" && (cond.Status == "Unknown" || cond.Status == "False") && cond.Message != "" {
|
||||
msg = cond.Message
|
||||
}
|
||||
}
|
||||
|
||||
if ok && len(finalizers) > 0 {
|
||||
data["transitioningMessage"] = "Waiting on " + finalizers[0]
|
||||
if len(msg) > 0 {
|
||||
msg = msg + "; waiting on " + finalizers[0]
|
||||
} else {
|
||||
msg = "waiting on " + finalizers[0]
|
||||
}
|
||||
data["transitioningMessage"] = msg
|
||||
if i, err := convert.ToTimestamp(val); err == nil {
|
||||
if time.Unix(i/1000, 0).Add(5 * time.Minute).Before(time.Now()) {
|
||||
data["transitioning"] = "error"
|
||||
@ -108,13 +125,6 @@ func Set(data map[string]interface{}) {
|
||||
return
|
||||
}
|
||||
|
||||
val, conditionsOk := values.GetValue(data, "status", "conditions")
|
||||
var conditions []condition
|
||||
if err := convert.ToObj(val, &conditions); err != nil {
|
||||
// ignore error
|
||||
return
|
||||
}
|
||||
|
||||
state := ""
|
||||
error := false
|
||||
transitioning := false
|
||||
@ -166,6 +176,10 @@ func Set(data map[string]interface{}) {
|
||||
transitioning = true
|
||||
state = newState
|
||||
message = concat(message, c.Message)
|
||||
} else if c.Status == "Unknown" {
|
||||
error = true
|
||||
state = newState
|
||||
message = concat(message, c.Message)
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user