From 211dd6b9abb64fb84e6a4ac3bd87c1f4ef9fe675 Mon Sep 17 00:00:00 2001 From: Alexander Dahmen Date: Wed, 3 Jun 2026 10:44:15 +0200 Subject: [PATCH] chore(ske): Update to new ske sdk version Signed-off-by: Alexander Dahmen --- go.mod | 2 +- go.sum | 4 ++-- stackit/internal/services/ske/cluster/resource.go | 11 +++++------ .../internal/services/ske/cluster/resource_test.go | 4 ++-- .../provideroptions/kubernetesversions/datasource.go | 4 +++- .../ske/provideroptions/machineimages/datasource.go | 6 ++++-- .../provideroptions/machineimages/datasource_test.go | 10 +++++----- stackit/internal/services/ske/ske_test.go | 7 +++---- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index b8855d3de..a2e743d93 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.19.0 github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0 github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1 - github.com/stackitcloud/stackit-sdk-go/services/ske v1.15.0 + github.com/stackitcloud/stackit-sdk-go/services/ske v1.16.0 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0 github.com/stackitcloud/stackit-sdk-go/services/telemetryrouter v0.3.0 diff --git a/go.sum b/go.sum index 6eb3a2545..77a7503be 100644 --- a/go.sum +++ b/go.sum @@ -730,8 +730,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0 h1:4ufJ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ= github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1 h1:t1kx4zz/6eHpJGOnWnX0+KsS3KLlPDFo2gE11pZkdqg= github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI= -github.com/stackitcloud/stackit-sdk-go/services/ske v1.15.0 h1:sSuwbqAvh89jUUX2RI9ouj/Fy49ZB4YKWqbKQV1wnZ8= -github.com/stackitcloud/stackit-sdk-go/services/ske v1.15.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4= +github.com/stackitcloud/stackit-sdk-go/services/ske v1.16.0 h1:kbdUYYYPK2jsRDzt8C/extaFD6PJug5kMMB8w0+WXM4= +github.com/stackitcloud/stackit-sdk-go/services/ske v1.16.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4= github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 h1:PwjQeupEnXxhu+uWCUzO/hUfL4yqNblOcZbP2jvaQtU= github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M= github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0 h1:U1mQoCk0TXc8NsSc/Sl9PKMdEyJpWNU2zLnsqmx6wEc= diff --git a/stackit/internal/services/ske/cluster/resource.go b/stackit/internal/services/ske/cluster/resource.go index d9bfc7c09..70aa7a2b0 100644 --- a/stackit/internal/services/ske/cluster/resource.go +++ b/stackit/internal/services/ske/cluster/resource.go @@ -40,7 +40,6 @@ import ( serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api" enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait" - legacySke "github.com/stackitcloud/stackit-sdk-go/services/ske" ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api" skeWait "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api/wait" @@ -1017,12 +1016,12 @@ func (r *clusterResource) createOrUpdateCluster(ctx context.Context, diags *diag // Call tflog.Info here, to log the information of the updated context tflog.Info(ctx, "Triggered create/update cluster") - waitResp, err := skeWait.CreateOrUpdateClusterWaitHandler(ctx, r.skeClient.DefaultAPI, projectId, region, name).WaitWithContext(ctx) + waitResp, err := skeWait.CreateClusterWaitHandler(ctx, r.skeClient.DefaultAPI, projectId, region, name).WaitWithContext(ctx) if err != nil { core.LogAndAddError(ctx, diags, "Error creating/updating cluster", fmt.Sprintf("Cluster creation waiting: %v", err)) return } - if waitResp.Status.Error != nil && waitResp.Status.Error.Message != nil && *waitResp.Status.Error.Code == string(legacySke.RUNTIMEERRORCODE_OBSERVABILITY_INSTANCE_NOT_FOUND) { + if waitResp.Status.Error != nil && waitResp.Status.Error.Message != nil && *waitResp.Status.Error.Code == ske.RUNTIMEERRORCODE_SKE_OBSERVABILITY_INSTANCE_NOT_FOUND { 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)) } @@ -1057,7 +1056,7 @@ func toNodepoolsPayload(ctx context.Context, m *Model, availableMachineVersions ts := []ske.Taint{} for _, v := range taintsModel { t := ske.Taint{ - Effect: v.Effect.ValueString(), + Effect: ske.TaintEffect(v.Effect.ValueString()), Key: v.Key.ValueString(), Value: conversion.StringValueToPointer(v.Value), } @@ -1095,7 +1094,7 @@ func toNodepoolsPayload(ctx context.Context, m *Model, availableMachineVersions } cn := &ske.CRI{ - Name: conversion.StringValueToPointer(nodePool.CRI), + Name: (*ske.NameOfTheCriLibrary)(conversion.StringValueToPointer(nodePool.CRI)), } providedVersionMin := conversion.StringValueToPointer(nodePool.OSVersionMin) @@ -1593,7 +1592,7 @@ func mapNodePools(ctx context.Context, cl *ske.Cluster, model *Model) error { "volume_type": types.StringPointerValue(nodePoolResp.Volume.Type), "volume_size": types.Int32Value(nodePoolResp.Volume.Size), "labels": types.MapNull(types.StringType), - "cri": types.StringPointerValue(nodePoolResp.Cri.Name), + "cri": types.StringPointerValue((*string)(nodePoolResp.Cri.Name)), "availability_zones": types.ListNull(types.StringType), "allow_system_components": types.BoolPointerValue(nodePoolResp.AllowSystemComponents), } diff --git a/stackit/internal/services/ske/cluster/resource_test.go b/stackit/internal/services/ske/cluster/resource_test.go index aec9a8434..cf272de95 100644 --- a/stackit/internal/services/ske/cluster/resource_test.go +++ b/stackit/internal/services/ske/cluster/resource_test.go @@ -110,7 +110,7 @@ func TestMapFields(t *testing.T) { AllowSystemComponents: new(true), AvailabilityZones: []string{"z1", "z2"}, Cri: &ske.CRI{ - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, Labels: &map[string]string{"k": "v"}, Machine: ske.Machine{ @@ -570,7 +570,7 @@ func TestMapFields(t *testing.T) { { AvailabilityZones: []string{"z1", "z2"}, Cri: &ske.CRI{ - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, Labels: &map[string]string{"k": "v"}, Machine: ske.Machine{ diff --git a/stackit/internal/services/ske/provideroptions/kubernetesversions/datasource.go b/stackit/internal/services/ske/provideroptions/kubernetesversions/datasource.go index 5d5afe5d0..a5e35352d 100644 --- a/stackit/internal/services/ske/provideroptions/kubernetesversions/datasource.go +++ b/stackit/internal/services/ske/provideroptions/kubernetesversions/datasource.go @@ -134,7 +134,9 @@ func (d *kubernetesVersionsDataSource) Read(ctx context.Context, req datasource. listProviderOptionsReq := d.client.DefaultAPI.ListProviderOptions(ctx, region) if !utils.IsUndefined(model.VersionState) { - listProviderOptionsReq = listProviderOptionsReq.VersionState(model.VersionState.ValueString()) + listProviderOptionsReq = listProviderOptionsReq.VersionState( + ske.ListProviderOptionsVersionStateParameter(model.VersionState.ValueString()), + ) } optionsResp, err := listProviderOptionsReq.Execute() diff --git a/stackit/internal/services/ske/provideroptions/machineimages/datasource.go b/stackit/internal/services/ske/provideroptions/machineimages/datasource.go index 4eca7acfe..c20ca5e8f 100644 --- a/stackit/internal/services/ske/provideroptions/machineimages/datasource.go +++ b/stackit/internal/services/ske/provideroptions/machineimages/datasource.go @@ -154,7 +154,9 @@ func (d *machineImagesDataSource) Read(ctx context.Context, req datasource.ReadR listProviderOptionsReq := d.client.DefaultAPI.ListProviderOptions(ctx, region) if !utils.IsUndefined(model.VersionState) { - listProviderOptionsReq = listProviderOptionsReq.VersionState(model.VersionState.ValueString()) + listProviderOptionsReq = listProviderOptionsReq.VersionState( + ske.ListProviderOptionsVersionStateParameter(model.VersionState.ValueString()), + ) } optionsResp, err := listProviderOptionsReq.Execute() @@ -208,7 +210,7 @@ func mapFields(ctx context.Context, optionsResp *ske.ProviderOptions, model *Mod criList := make([]types.String, 0) for _, cri := range ver.Cri { if cri.Name != nil { - criList = append(criList, types.StringValue(*cri.Name)) + criList = append(criList, types.StringValue(string(*cri.Name))) } } criVal, diags := types.ListValueFrom(ctx, types.StringType, criList) diff --git a/stackit/internal/services/ske/provideroptions/machineimages/datasource_test.go b/stackit/internal/services/ske/provideroptions/machineimages/datasource_test.go index 57bed4d53..13b0c5bec 100644 --- a/stackit/internal/services/ske/provideroptions/machineimages/datasource_test.go +++ b/stackit/internal/services/ske/provideroptions/machineimages/datasource_test.go @@ -40,7 +40,7 @@ func TestMapFields(t *testing.T) { ExpirationDate: ×tamp, Cri: []ske.CRI{ { - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, }, }, @@ -89,7 +89,7 @@ func TestMapFields(t *testing.T) { ExpirationDate: ×tamp, Cri: []ske.CRI{ { - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, }, }, @@ -155,7 +155,7 @@ func TestMapFields(t *testing.T) { ExpirationDate: ×tamp, Cri: []ske.CRI{ { - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, }, }, @@ -165,7 +165,7 @@ func TestMapFields(t *testing.T) { ExpirationDate: nil, // no expiration Cri: []ske.CRI{ { - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, }, }, @@ -175,7 +175,7 @@ func TestMapFields(t *testing.T) { ExpirationDate: nil, Cri: []ske.CRI{ { - Name: new("containerd"), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, }, }, diff --git a/stackit/internal/services/ske/ske_test.go b/stackit/internal/services/ske/ske_test.go index 838931fff..57bd5565c 100644 --- a/stackit/internal/services/ske/ske_test.go +++ b/stackit/internal/services/ske/ske_test.go @@ -13,7 +13,6 @@ import ( serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api" serviceenablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait" - legacySke "github.com/stackitcloud/stackit-sdk-go/services/ske" ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" @@ -88,7 +87,7 @@ resource "stackit_ske_cluster" "cluster" { ExpirationDate: nil, Cri: []ske.CRI{ { - Name: new(string(legacySke.CRINAME_CONTAINERD)), + Name: new(ske.NameOfTheCriLibrary(ske.NAMEOFTHECRILIBRARY_CONTAINERD)), }, }, }, @@ -203,7 +202,7 @@ resource "stackit_ske_cluster" "cluster" { AvailabilityZones: []string{"eu01-1"}, Name: nodeName, Cri: new(ske.CRI{ - Name: new(string(legacySke.CRINAME_CONTAINERD)), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }), Machine: ske.Machine{ Image: ske.Image{ @@ -283,7 +282,7 @@ resource "stackit_ske_cluster" "cluster" { ExpirationDate: nil, Cri: []ske.CRI{ { - Name: new(string(legacySke.CRINAME_CONTAINERD)), + Name: new(ske.NAMEOFTHECRILIBRARY_CONTAINERD), }, }, },