Skip to content

fix(ske): make generate cluster payload work for eu02 #1008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(ske): make generate cluster payload work for eu02 #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
064a1d0
fix(ske): make generate cluster payload work for eu02
rubenhoenle Sep 26, 2025
b9ca14b
filter out AZs where not all flavors are available
rubenhoenle Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions internal/pkg/services/ske/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"maps"
"os"
"path/filepath"
"regexp"
"strconv"

"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
Expand All @@ -16,13 +17,9 @@ import (
)

const (
defaultNodepoolAvailabilityZone = "eu01-3"
defaultNodepoolCRI = ske.CRINAME_CONTAINERD
defaultNodepoolMachineType = "b1.2"
defaultNodepoolMachineImageName = "flatcar"
defaultNodepoolMaxSurge = 1
defaultNodepoolMaxUnavailable = 0
defaultNodepoolMaximum = 2
defaultNodepoolMinimum = 1
defaultNodepoolName = "pool-default"
defaultNodepoolVolumeType = "storage_premium_perf2"
Expand Down Expand Up @@ -110,22 +107,38 @@ func getDefaultPayloadKubernetes(resp *ske.ProviderOptions) (*ske.Kubernetes, er
}

func getDefaultPayloadNodepool(resp *ske.ProviderOptions) (*ske.Nodepool, error) {
if resp.AvailabilityZones == nil || len(*resp.AvailabilityZones) == 0 {
return nil, fmt.Errorf("no availability zones found")
}
var availabilityZones []string
for i := range *resp.AvailabilityZones {
azName := (*resp.AvailabilityZones)[i].GetName()
// don't include availability zones like eu01-m, eu02-m, not all flavors are available there
if !regexp.MustCompile(`\w{2}\d{2}-m`).MatchString(azName) {
availabilityZones = append(availabilityZones, azName)
}
}

if resp.MachineTypes == nil || len(*resp.MachineTypes) == 0 {
return nil, fmt.Errorf("no machine types found")
}
machineType := (*resp.MachineTypes)[0].GetName()

output := &ske.Nodepool{
AvailabilityZones: &[]string{
defaultNodepoolAvailabilityZone,
},
AvailabilityZones: &availabilityZones,
Cri: &ske.CRI{
Name: utils.Ptr(defaultNodepoolCRI),
},
Machine: &ske.Machine{
Type: utils.Ptr(defaultNodepoolMachineType),
Type: &machineType,
Image: &ske.Image{
Name: utils.Ptr(defaultNodepoolMachineImageName),
},
},
MaxSurge: utils.Ptr(int64(defaultNodepoolMaxSurge)),
// there must be as many nodes as availability zones are given
MaxSurge: utils.Ptr(int64(len(availabilityZones))),
MaxUnavailable: utils.Ptr(int64(defaultNodepoolMaxUnavailable)),
Maximum: utils.Ptr(int64(defaultNodepoolMaximum)),
Maximum: utils.Ptr(int64(len(availabilityZones))),
Minimum: utils.Ptr(int64(defaultNodepoolMinimum)),
Name: utils.Ptr(defaultNodepoolName),
Volume: &ske.Volume{
Expand Down
45 changes: 43 additions & 2 deletions internal/pkg/services/ske/utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,17 @@ func TestClusterExists(t *testing.T) {

func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOptions {
providerOptions := &ske.ProviderOptions{
AvailabilityZones: &[]ske.AvailabilityZone{
{Name: utils.Ptr("eu01-m")},
{Name: utils.Ptr("eu01-1")},
{Name: utils.Ptr("eu01-2")},
{Name: utils.Ptr("eu01-3")},
},
MachineTypes: &[]ske.MachineType{
{
Name: utils.Ptr("b1.2"),
},
},
KubernetesVersions: &[]ske.KubernetesVersion{
{
State: utils.Ptr("supported"),
Expand Down Expand Up @@ -263,6 +274,8 @@ func fixtureGetDefaultPayload(mods ...func(*ske.CreateOrUpdateClusterPayload)) *
Nodepools: &[]ske.Nodepool{
{
AvailabilityZones: &[]string{
"eu01-1",
"eu01-2",
"eu01-3",
},
Cri: &ske.CRI{
Expand All @@ -275,9 +288,9 @@ func fixtureGetDefaultPayload(mods ...func(*ske.CreateOrUpdateClusterPayload)) *
Name: utils.Ptr("flatcar"),
},
},
MaxSurge: utils.Ptr(int64(1)),
MaxSurge: utils.Ptr(int64(3)),
MaxUnavailable: utils.Ptr(int64(0)),
Maximum: utils.Ptr(int64(2)),
Maximum: utils.Ptr(int64(3)),
Minimum: utils.Ptr(int64(1)),
Name: utils.Ptr("pool-default"),
Volume: &ske.Volume{
Expand Down Expand Up @@ -312,6 +325,34 @@ func TestGetDefaultPayload(t *testing.T) {
listProviderOptionsFails: true,
isValid: false,
},
{
description: "availability zones nil",
listProviderOptionsResp: fixtureProviderOptions(func(po *ske.ProviderOptions) {
po.AvailabilityZones = nil
}),
isValid: false,
},
{
description: "no availability zones",
listProviderOptionsResp: fixtureProviderOptions(func(po *ske.ProviderOptions) {
po.AvailabilityZones = &[]ske.AvailabilityZone{}
}),
isValid: false,
},
{
description: "machine types nil",
listProviderOptionsResp: fixtureProviderOptions(func(po *ske.ProviderOptions) {
po.MachineTypes = nil
}),
isValid: false,
},
{
description: "no machine types",
listProviderOptionsResp: fixtureProviderOptions(func(po *ske.ProviderOptions) {
po.MachineTypes = &[]ske.MachineType{}
}),
isValid: false,
},
{
description: "no Kubernetes versions 1",
listProviderOptionsResp: fixtureProviderOptions(func(po *ske.ProviderOptions) {
Expand Down
Loading