Use cluster.StorageType() for ValidateEtcdMembers phase (#823)

kke · web-flow · commit 929602e5d575 · 2025-01-20T15:07:53.000+02:00
Signed-off-by: Kimmo Lehto &lt;klehto@mirantis.com&gt;
diff --git a/phase/validate_etcd_members.go b/phase/validate_etcd_members.go
@@ -42,13 +42,10 @@ func (p *ValidateEtcdMembers) ShouldRun() bool {
 		return false
 	}
 
-	if len(p.Config.Spec.K0s.Config) > 0 {
-		storageType := p.Config.Spec.K0s.Config.DigString("spec", "storage", "type")
-		if storageType != "" && storageType != "etcd" {
-			log.Debugf("%s: storage type is %q, not k0s managed etcd", p.Config.Spec.K0sLeader(), storageType)
-			return false
-		}
+	if s := p.Config.StorageType(); s != "etcd" {
+		log.Debugf("%s: storage type is %q, not k0s managed etcd", p.Config.Spec.K0sLeader(), s)
 	}
+
 	return len(p.hosts) > 0
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,10 @@ func (p *ValidateEtcdMembers) ShouldRun() bool {`
`42`	`42`	`return false`
`43`	`43`	`}`
`44`	`44`
`45`		`- if len(p.Config.Spec.K0s.Config) > 0 {`
`46`		`- storageType := p.Config.Spec.K0s.Config.DigString("spec", "storage", "type")`
`47`		`- if storageType != "" && storageType != "etcd" {`
`48`		`- log.Debugf("%s: storage type is %q, not k0s managed etcd", p.Config.Spec.K0sLeader(), storageType)`
`49`		`- return false`
`50`		`- }`
	`45`	`+ if s := p.Config.StorageType(); s != "etcd" {`
	`46`	`+ log.Debugf("%s: storage type is %q, not k0s managed etcd", p.Config.Spec.K0sLeader(), s)`
`51`	`47`	`}`
	`48`	`+`
`52`	`49`	`return len(p.hosts) > 0`
`53`	`50`	`}`
`54`	`51`