check typecasts of k0sConfig.spec.api.port

for proper handling of nil values Signed-off-by: erdii <me@erdii.engineering>
k0sproject · Aug 10, 2021 · 105df2e · 105df2e
1 parent 5421b2f
commit 105df2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/phase/install_controllers.go b/phase/install_controllers.go
@@ -79,10 +79,11 @@ func (p *InstallControllers) Run() error {
 }
 
 func (p *InstallControllers) waitJoined(h *cluster.Host) error {
-	port := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int)
-	if port == 0 {
-		port = 6443
+	port := 6443
+	if p, ok := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int); ok {
+		port = p
 	}
+
 	log.Infof("%s: waiting for kubernetes api to respond", h)
 	return h.WaitKubeAPIReady(port)
 }
diff --git a/phase/upgrade_controllers.go b/phase/upgrade_controllers.go
@@ -63,9 +63,9 @@ func (p *UpgradeControllers) Run() error {
 		if err := h.WaitK0sServiceRunning(); err != nil {
 			return err
 		}
-		port := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int)
-		if port == 0 {
-			port = 6443
+		port := 6443
+		if p, ok := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int); ok {
+			port = p
 		}
 		if err := h.WaitKubeAPIReady(port); err != nil {
 			return err