Skip to content

Commit d98996f

Browse files
SerseusWasTakenSerseusWasTaken
authored
feat(ske): bump sdk version and add load balancer extension support (#1515)
Relates to STACKITCLI-432
1 parent f905bf4 commit d98996f

9 files changed

Lines changed: 19 additions & 29 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2
3636
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0
3737
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0
38-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0
38+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.0
3939
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1
4040
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0
4141
github.com/zalando/go-keyring v0.2.8

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0 h1:TNZH
648648
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ=
649649
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0 h1:JWAFnskRbNKT8x62pZcAMCC+p5hyTEkAyxqFwy39jFA=
650650
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
651-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0 h1:QoKyQPe8FqDqJLNgE5uRlZ/y1c1GUxjV1DDLu5QEBD8=
652-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0/go.mod h1:KhVYCR58wETqdI7Quwhe3OR3BhB2T/b7DzaMsfDnr8g=
651+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.0 h1:eu9PhRdL2GkXpHtf4NN9YBCUYcARdvAwq+g/FW4hmi4=
652+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4=
653653
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1 h1:pjFVw2Tc0cSfAzmyZRiLknuKSADs7nPXNUyrM216CwQ=
654654
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
655655
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0 h1:LMgbzhPunuelsIsfyEj/5O/aYfNcg/eGHsnZ7AZOhYg=

‎internal/cmd/ske/cluster/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
134134
// Wait for async operation, if async mode not enabled
135135
if !model.Async {
136136
err := spinner.Run(params.Printer, "Creating cluster", func() error {
137-
_, err = wait.CreateOrUpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
137+
_, err = wait.CreateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
138138
return err
139139
})
140140
if err != nil {

‎internal/cmd/ske/cluster/create/create_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var testPayload = &ske.CreateOrUpdateClusterPayload{
5555
},
5656
AvailabilityZones: []string{"eu01-3"},
5757
Cri: &ske.CRI{
58-
Name: utils.Ptr("containerd"),
58+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
5959
AdditionalProperties: map[string]any{},
6060
},
6161
AdditionalProperties: map[string]any{},

‎internal/cmd/ske/cluster/update/update.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
9696
// Wait for async operation, if async mode not enabled
9797
if !model.Async {
9898
err := spinner.Run(params.Printer, "Updating cluster", func() error {
99-
_, err = wait.CreateOrUpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
99+
_, err = wait.UpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
100100
return err
101101
})
102102
if err != nil {

‎internal/cmd/ske/cluster/update/update_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var testPayload = ske.CreateOrUpdateClusterPayload{
5454
},
5555
AvailabilityZones: []string{"eu01-3"},
5656
Cri: &ske.CRI{
57-
Name: utils.Ptr("containerd"),
57+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
5858
AdditionalProperties: map[string]any{},
5959
},
6060
AdditionalProperties: map[string]any{},

‎internal/cmd/ske/options/machine_images/machine_images_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func TestOutputResult(t *testing.T) {
186186
{
187187
Cri: []ske.CRI{
188188
{
189-
Name: utils.Ptr("containerd"),
189+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
190190
},
191191
},
192192
ExpirationDate: utils.Ptr(time.Now()),

‎internal/pkg/services/ske/utils/utils.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
)
1919

2020
const (
21-
defaultNodepoolCRI = "containerd"
21+
defaultNodepoolCRI = ske.NAMEOFTHECRILIBRARY_CONTAINERD
2222
defaultNodepoolMachineImageName = "flatcar"
2323
defaultNodepoolMaxUnavailable = 0
2424
defaultNodepoolMinimum = 1
@@ -128,7 +128,7 @@ func getDefaultPayloadNodepool(resp *ske.ProviderOptions) (*ske.Nodepool, error)
128128
output := &ske.Nodepool{
129129
AvailabilityZones: availabilityZones,
130130
Cri: &ske.CRI{
131-
Name: utils.Ptr(defaultNodepoolCRI),
131+
Name: new(defaultNodepoolCRI),
132132
},
133133
Machine: ske.Machine{
134134
Type: machineType,
@@ -137,13 +137,13 @@ func getDefaultPayloadNodepool(resp *ske.ProviderOptions) (*ske.Nodepool, error)
137137
},
138138
},
139139
// there must be as many nodes as availability zones are given
140-
MaxSurge: utils.Ptr(int32(azLen)),
141-
MaxUnavailable: utils.Ptr(int32(defaultNodepoolMaxUnavailable)),
140+
MaxSurge: new(int32(azLen)),
141+
MaxUnavailable: new(int32(defaultNodepoolMaxUnavailable)),
142142
Maximum: int32(azLen),
143143
Minimum: int32(defaultNodepoolMinimum),
144144
Name: defaultNodepoolName,
145145
Volume: ske.Volume{
146-
Type: utils.Ptr(defaultNodepoolVolumeType),
146+
Type: new(defaultNodepoolVolumeType),
147147
Size: int32(defaultNodepoolVolumeSize),
148148
},
149149
}

‎internal/pkg/services/ske/utils/utils_test.go‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
164164
Version: utils.Ptr("1.2.3"),
165165
Cri: []ske.CRI{
166166
{
167-
Name: utils.Ptr("docker"),
168-
},
169-
{
170-
Name: utils.Ptr("containerd"),
167+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
171168
},
172169
},
173170
},
@@ -176,10 +173,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
176173
Version: utils.Ptr("3.2.1"),
177174
Cri: []ske.CRI{
178175
{
179-
Name: utils.Ptr("docker"),
180-
},
181-
{
182-
Name: utils.Ptr("containerd"),
176+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
183177
},
184178
},
185179
},
@@ -193,7 +187,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
193187
Version: utils.Ptr("4.4.4"),
194188
Cri: []ske.CRI{
195189
{
196-
Name: utils.Ptr("containerd"),
190+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
197191
},
198192
},
199193
},
@@ -216,7 +210,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
216210
Version: utils.Ptr("4.4.4"),
217211
Cri: []ske.CRI{
218212
{
219-
Name: utils.Ptr("containerd"),
213+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
220214
},
221215
},
222216
},
@@ -228,11 +222,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
228222
{
229223
State: utils.Ptr("supported"),
230224
Version: utils.Ptr("4.4.4"),
231-
Cri: []ske.CRI{
232-
{
233-
Name: utils.Ptr("docker"),
234-
},
235-
},
225+
Cri: []ske.CRI{},
236226
},
237227
},
238228
},
@@ -263,7 +253,7 @@ func fixtureGetDefaultPayload(mods ...func(*ske.CreateOrUpdateClusterPayload)) *
263253
"eu01-3",
264254
},
265255
Cri: &ske.CRI{
266-
Name: utils.Ptr("containerd"),
256+
Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
267257
},
268258
Machine: ske.Machine{
269259
Type: "b1.2",

0 commit comments

Comments
 (0)