From 928481d26fc6dff4eda86ad559de3634e5cfc6f6 Mon Sep 17 00:00:00 2001 From: Tim Tkachev Date: Mon, 19 Jun 2023 16:05:27 +0300 Subject: [PATCH] 4.2.1 --- CHANGELOG.md | 10 +++------- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/service/cloudapi/k8s/resource_k8s.go | 6 +----- internal/service/cloudapi/k8s/resource_k8s_cp.go | 6 +----- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a93e12..d504fca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,4 @@ -## Version 4.2.0 +## Version 4.2.1 -## Features -- Added "decort_k8s_cp" resource: - - Used to create k8s cluster and manage control plane, therefore does not contain any info about worker nodes - - Use decort_k8s_wg to add/delete/manage worker nodes with decort_k8s_cp -- Added "ignore_k8s" field to "decort_kvmvm_list" data source. - - Set to true to list all computes not associated with any k8s cluster. +## Bug Fixes +- Fixed "with_lb" param false value ignore in k8s/create (resource_k8s, resource_k8s_cp) diff --git a/Makefile b/Makefile index 3cd440b..d3a289d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ ZIPDIR = ./zip BINARY=${NAME}.exe WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} MAINPATH = ./cmd/decort/ -VERSION=4.2.0 +VERSION=4.2.1 #OS_ARCH=darwin_amd64 OS_ARCH=windows_amd64 #OS_ARCH=linux_amd64 diff --git a/go.mod b/go.mod index 966a4b2..555b722 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1 github.com/sirupsen/logrus v1.9.0 golang.org/x/net v0.5.0 - repository.basistech.ru/BASIS/decort-golang-sdk v1.4.4 + repository.basistech.ru/BASIS/decort-golang-sdk v1.4.5 ) require ( diff --git a/go.sum b/go.sum index 8dd3576..fef5c7a 100644 --- a/go.sum +++ b/go.sum @@ -332,5 +332,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -repository.basistech.ru/BASIS/decort-golang-sdk v1.4.4 h1:qoot6a9UPOihncfhmhmyzMd0nGVAzY/b1Gvs+AFk1/k= -repository.basistech.ru/BASIS/decort-golang-sdk v1.4.4/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE= +repository.basistech.ru/BASIS/decort-golang-sdk v1.4.5 h1:PO80n6pvFdfVFEtmX//unRJLIkAW+SFqEXDerRJw5XU= +repository.basistech.ru/BASIS/decort-golang-sdk v1.4.5/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE= diff --git a/internal/service/cloudapi/k8s/resource_k8s.go b/internal/service/cloudapi/k8s/resource_k8s.go index 8c2f13b..092b520 100644 --- a/internal/service/cloudapi/k8s/resource_k8s.go +++ b/internal/service/cloudapi/k8s/resource_k8s.go @@ -143,11 +143,7 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{ } } - if withLB, ok := d.GetOk("with_lb"); ok { - createReq.WithLB = withLB.(bool) - } else { - createReq.WithLB = true - } + createReq.WithLB = d.Get("with_lb").(bool) if extNet, ok := d.GetOk("extnet_id"); ok { createReq.ExtNetID = uint64(extNet.(int)) diff --git a/internal/service/cloudapi/k8s/resource_k8s_cp.go b/internal/service/cloudapi/k8s/resource_k8s_cp.go index 6f11de0..9dbfcff 100644 --- a/internal/service/cloudapi/k8s/resource_k8s_cp.go +++ b/internal/service/cloudapi/k8s/resource_k8s_cp.go @@ -127,11 +127,7 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac createReq.MasterSEPPool = sepPool.(string) } - if withLB, ok := d.GetOk("with_lb"); ok { - createReq.WithLB = withLB.(bool) - } else { - createReq.WithLB = true - } + createReq.WithLB = d.Get("with_lb").(bool) if extNet, ok := d.GetOk("extnet_id"); ok { createReq.ExtNetID = uint64(extNet.(int))