fix: fix some upgrades to make it work with kfddistribution, fix upgr…

…ades path
sighupio · Jan 4, 2024 · de5af15 · de5af15
1 parent be0fefc
commit de5af15
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/configs/upgrades/ekscluster/1.25.8-1.25.9/pre-infrastructure.sh.tpl b/configs/upgrades/ekscluster/1.25.8-1.25.9/pre-infrastructure.sh.tpl
@@ -6,7 +6,7 @@ terraformbin="{{ .paths.terraform }}"
 
 {{ $hasVpnEnabled := (
     and
-        (index .spec.infrastructure "vpn")
+        (and (index .spec "infrastructure") (index .spec.infrastructure "vpn"))
         (
             or
                 (not (index .spec.infrastructure.vpn "instances"))

diff --git a/configs/upgrades/onpremises/1.25.9-1.26.4/pre-kubernetes.sh.tpl b/configs/upgrades/onpremises/1.25.9-1.26.4/pre-kubernetes.sh.tpl
@@ -2,6 +2,8 @@
 
 set -e
 
+{{- if index .spec "kubernetes" }}
+
 ## master upgrades - only one at a time
 {{- range $h := .spec.kubernetes.masters.hosts }}
 ansible-playbook 55.upgrade-control-plane.yml --limit "{{ $h.name }}" --become
@@ -12,3 +14,5 @@ ansible-playbook 55.upgrade-control-plane.yml --limit "{{ $h.name }}" --become
 ansible-playbook 56.upgrade-worker-nodes.yml --limit "{{ $h.name }}"
     {{- end }}
 {{- end }}
+
+{{- end }}
diff --git a/configs/upgrades/onpremises/1.26.4-1.27.0/pre-kubernetes.sh.tpl b/configs/upgrades/onpremises/1.26.4-1.27.0/pre-kubernetes.sh.tpl
@@ -2,6 +2,8 @@
 
 set -e
 
+{{- if index .spec "kubernetes" }}
+
 ## master upgrades - only one at a time
 {{- range $h := .spec.kubernetes.masters.hosts }}
 ansible-playbook 55.upgrade-control-plane.yml --limit "{{ $h.name }}" --become
@@ -12,3 +14,5 @@ ansible-playbook 55.upgrade-control-plane.yml --limit "{{ $h.name }}" --become
 ansible-playbook 56.upgrade-worker-nodes.yml --limit "{{ $h.name }}"
     {{- end }}
 {{- end }}
+
+{{- end }}
diff --git a/internal/apis/kfd/v1alpha2/common/create/preupgrade.go b/internal/apis/kfd/v1alpha2/common/create/preupgrade.go
@@ -126,7 +126,7 @@ func (p *PreUpgrade) Exec() error {
 		return fmt.Errorf("error writing config file: %w", err)
 	}
 
-	upgradesPath := p.externalUpgradesPath
+	var upgradesPath string
 
 	if p.externalUpgradesPath == "" {
 		subFS, err := fs.Sub(configs.Tpl, path.Join("upgrades", strings.ToLower(p.kind)))
@@ -146,11 +146,13 @@ func (p *PreUpgrade) Exec() error {
 		defer os.RemoveAll(tmpUpgradesFolder)
 
 		upgradesPath = tmpUpgradesFolder
+	} else {
+		upgradesPath = path.Join(p.externalUpgradesPath, strings.ToLower(p.kind))
 	}
 
 	templateModel, err := template.NewTemplateModel(
 		upgradesPath,
-		path.Join(p.Path),
+		p.Path,
 		confPath,
 		outDirPath1,
 		p.furyctlConfPath,