Skip to content

Commit 6c6aa3f

Browse files
FyuselFyusel
authored
chore(ske): Update to new ske sdk version 1.18.0 (#1502)
Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>
1 parent 74c6141 commit 6c6aa3f

8 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.19.0
4343
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0
4444
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1
45-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.15.0
45+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.18.0
4646
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0
4747
github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0
4848
github.com/stackitcloud/stackit-sdk-go/services/telemetryrouter v0.3.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,8 +730,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0 h1:4ufJ
730730
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ=
731731
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1 h1:t1kx4zz/6eHpJGOnWnX0+KsS3KLlPDFo2gE11pZkdqg=
732732
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
733-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.15.0 h1:sSuwbqAvh89jUUX2RI9ouj/Fy49ZB4YKWqbKQV1wnZ8=
734-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.15.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4=
733+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.18.0 h1:6Umom7V12bVa7D3dnMJAKj/GWg7wqR9FpqmZ8TjsO1Q=
734+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.18.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4=
735735
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 h1:PwjQeupEnXxhu+uWCUzO/hUfL4yqNblOcZbP2jvaQtU=
736736
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
737737
github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0 h1:U1mQoCk0TXc8NsSc/Sl9PKMdEyJpWNU2zLnsqmx6wEc=

‎stackit/internal/services/ske/cluster/resource.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import (
4040

4141
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
4242
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
43-
legacySke "github.com/stackitcloud/stackit-sdk-go/services/ske"
4443
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
4544
skeWait "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api/wait"
4645

@@ -1017,12 +1016,12 @@ func (r *clusterResource) createOrUpdateCluster(ctx context.Context, diags *diag
10171016
// Call tflog.Info here, to log the information of the updated context
10181017
tflog.Info(ctx, "Triggered create/update cluster")
10191018

1020-
waitResp, err := skeWait.CreateOrUpdateClusterWaitHandler(ctx, r.skeClient.DefaultAPI, projectId, region, name).WaitWithContext(ctx)
1019+
waitResp, err := skeWait.CreateClusterWaitHandler(ctx, r.skeClient.DefaultAPI, projectId, region, name).WaitWithContext(ctx)
10211020
if err != nil {
10221021
core.LogAndAddError(ctx, diags, "Error creating/updating cluster", fmt.Sprintf("Cluster creation waiting: %v", err))
10231022
return
10241023
}
1025-
if waitResp.Status.Error != nil && waitResp.Status.Error.Message != nil && *waitResp.Status.Error.Code == string(legacySke.RUNTIMEERRORCODE_OBSERVABILITY_INSTANCE_NOT_FOUND) {
1024+
if waitResp.Status.Error != nil && waitResp.Status.Error.Message != nil && *waitResp.Status.Error.Code == ske.RUNTIMEERRORCODE_SKE_OBSERVABILITY_INSTANCE_NOT_FOUND {
10261025
core.LogAndAddWarning(ctx, diags, "Warning during creating/updating cluster", fmt.Sprintf("Cluster is in Impaired state due to an invalid observability instance id, the cluster is usable but metrics won't be forwarded: %s", *waitResp.Status.Error.Message))
10271026
}
10281027

@@ -1057,7 +1056,7 @@ func toNodepoolsPayload(ctx context.Context, m *Model, availableMachineVersions
10571056
ts := []ske.Taint{}
10581057
for _, v := range taintsModel {
10591058
t := ske.Taint{
1060-
Effect: v.Effect.ValueString(),
1059+
Effect: ske.TaintEffect(v.Effect.ValueString()),
10611060
Key: v.Key.ValueString(),
10621061
Value: conversion.StringValueToPointer(v.Value),
10631062
}
@@ -1095,7 +1094,7 @@ func toNodepoolsPayload(ctx context.Context, m *Model, availableMachineVersions
10951094
}
10961095

10971096
cn := &ske.CRI{
1098-
Name: conversion.StringValueToPointer(nodePool.CRI),
1097+
Name: (*ske.NameOfTheCriLibrary)(conversion.StringValueToPointer(nodePool.CRI)),
10991098
}
11001099

11011100
providedVersionMin := conversion.StringValueToPointer(nodePool.OSVersionMin)
@@ -1593,7 +1592,7 @@ func mapNodePools(ctx context.Context, cl *ske.Cluster, model *Model) error {
15931592
"volume_type": types.StringPointerValue(nodePoolResp.Volume.Type),
15941593
"volume_size": types.Int32Value(nodePoolResp.Volume.Size),
15951594
"labels": types.MapNull(types.StringType),
1596-
"cri": types.StringPointerValue(nodePoolResp.Cri.Name),
1595+
"cri": types.StringPointerValue((*string)(nodePoolResp.Cri.Name)),
15971596
"availability_zones": types.ListNull(types.StringType),
15981597
"allow_system_components": types.BoolPointerValue(nodePoolResp.AllowSystemComponents),
15991598
}

‎stackit/internal/services/ske/cluster/resource_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestMapFields(t *testing.T) {
110110
AllowSystemComponents: new(true),
111111
AvailabilityZones: []string{"z1", "z2"},
112112
Cri: &ske.CRI{
113-
Name: new("containerd"),
113+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
114114
},
115115
Labels: &map[string]string{"k": "v"},
116116
Machine: ske.Machine{
@@ -570,7 +570,7 @@ func TestMapFields(t *testing.T) {
570570
{
571571
AvailabilityZones: []string{"z1", "z2"},
572572
Cri: &ske.CRI{
573-
Name: new("containerd"),
573+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
574574
},
575575
Labels: &map[string]string{"k": "v"},
576576
Machine: ske.Machine{

‎stackit/internal/services/ske/provideroptions/kubernetesversions/datasource.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ func (d *kubernetesVersionsDataSource) Read(ctx context.Context, req datasource.
134134
listProviderOptionsReq := d.client.DefaultAPI.ListProviderOptions(ctx, region)
135135

136136
if !utils.IsUndefined(model.VersionState) {
137-
listProviderOptionsReq = listProviderOptionsReq.VersionState(model.VersionState.ValueString())
137+
listProviderOptionsReq = listProviderOptionsReq.VersionState(
138+
ske.ListProviderOptionsVersionStateParameter(model.VersionState.ValueString()),
139+
)
138140
}
139141

140142
optionsResp, err := listProviderOptionsReq.Execute()

‎stackit/internal/services/ske/provideroptions/machineimages/datasource.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ func (d *machineImagesDataSource) Read(ctx context.Context, req datasource.ReadR
154154
listProviderOptionsReq := d.client.DefaultAPI.ListProviderOptions(ctx, region)
155155

156156
if !utils.IsUndefined(model.VersionState) {
157-
listProviderOptionsReq = listProviderOptionsReq.VersionState(model.VersionState.ValueString())
157+
listProviderOptionsReq = listProviderOptionsReq.VersionState(
158+
ske.ListProviderOptionsVersionStateParameter(model.VersionState.ValueString()),
159+
)
158160
}
159161

160162
optionsResp, err := listProviderOptionsReq.Execute()
@@ -208,7 +210,7 @@ func mapFields(ctx context.Context, optionsResp *ske.ProviderOptions, model *Mod
208210
criList := make([]types.String, 0)
209211
for _, cri := range ver.Cri {
210212
if cri.Name != nil {
211-
criList = append(criList, types.StringValue(*cri.Name))
213+
criList = append(criList, types.StringValue(string(*cri.Name)))
212214
}
213215
}
214216
criVal, diags := types.ListValueFrom(ctx, types.StringType, criList)

‎stackit/internal/services/ske/provideroptions/machineimages/datasource_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestMapFields(t *testing.T) {
4040
ExpirationDate: &timestamp,
4141
Cri: []ske.CRI{
4242
{
43-
Name: new("containerd"),
43+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
4444
},
4545
},
4646
},
@@ -89,7 +89,7 @@ func TestMapFields(t *testing.T) {
8989
ExpirationDate: &timestamp,
9090
Cri: []ske.CRI{
9191
{
92-
Name: new("containerd"),
92+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
9393
},
9494
},
9595
},
@@ -155,7 +155,7 @@ func TestMapFields(t *testing.T) {
155155
ExpirationDate: &timestamp,
156156
Cri: []ske.CRI{
157157
{
158-
Name: new("containerd"),
158+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
159159
},
160160
},
161161
},
@@ -165,7 +165,7 @@ func TestMapFields(t *testing.T) {
165165
ExpirationDate: nil, // no expiration
166166
Cri: []ske.CRI{
167167
{
168-
Name: new("containerd"),
168+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
169169
},
170170
},
171171
},
@@ -175,7 +175,7 @@ func TestMapFields(t *testing.T) {
175175
ExpirationDate: nil,
176176
Cri: []ske.CRI{
177177
{
178-
Name: new("containerd"),
178+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
179179
},
180180
},
181181
},

‎stackit/internal/services/ske/ske_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
1515
serviceenablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
16-
legacySke "github.com/stackitcloud/stackit-sdk-go/services/ske"
1716
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
1817

1918
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil"
@@ -88,7 +87,7 @@ resource "stackit_ske_cluster" "cluster" {
8887
ExpirationDate: nil,
8988
Cri: []ske.CRI{
9089
{
91-
Name: new(string(legacySke.CRINAME_CONTAINERD)),
90+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
9291
},
9392
},
9493
},
@@ -203,7 +202,7 @@ resource "stackit_ske_cluster" "cluster" {
203202
AvailabilityZones: []string{"eu01-1"},
204203
Name: nodeName,
205204
Cri: new(ske.CRI{
206-
Name: new(string(legacySke.CRINAME_CONTAINERD)),
205+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
207206
}),
208207
Machine: ske.Machine{
209208
Image: ske.Image{
@@ -283,7 +282,7 @@ resource "stackit_ske_cluster" "cluster" {
283282
ExpirationDate: nil,
284283
Cri: []ske.CRI{
285284
{
286-
Name: new(string(legacySke.CRINAME_CONTAINERD)),
285+
Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD),
287286
},
288287
},
289288
},

0 commit comments

Comments
 (0)