From 7428b958373abdef7628773dfff8fbb924f8484a Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Thu, 28 Jan 2021 10:51:09 -0600 Subject: [PATCH] Remove taints from spotinst ocean terraform resource This field isn't being set anywhere and is causing problems with the terraform HCL2 serialization. If we do end up setting it we can redefine the struct type ourselves with the necessary field tags. --- upup/pkg/fi/cloudup/spotinsttasks/ocean.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/upup/pkg/fi/cloudup/spotinsttasks/ocean.go b/upup/pkg/fi/cloudup/spotinsttasks/ocean.go index 7bd4683b1c6d5..a0e0ce2004577 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/ocean.go +++ b/upup/pkg/fi/cloudup/spotinsttasks/ocean.go @@ -27,7 +27,6 @@ import ( "github.com/spotinst/spotinst-sdk-go/service/ocean/providers/aws" "github.com/spotinst/spotinst-sdk-go/spotinst/client" "github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil" - corev1 "k8s.io/api/core/v1" "k8s.io/klog/v2" "k8s.io/kops/pkg/resources/spotinst" "k8s.io/kops/upup/pkg/fi" @@ -1041,7 +1040,6 @@ type terraformOcean struct { IAMInstanceProfile *terraform.Literal `json:"iam_instance_profile,omitempty" cty:"iam_instance_profile"` KeyName *terraform.Literal `json:"key_name,omitempty" cty:"key_name"` SecurityGroups []*terraform.Literal `json:"security_groups,omitempty" cty:"security_groups"` - Taints []*corev1.Taint `json:"taints,omitempty" cty:"taints"` Labels []*terraformKV `json:"labels,omitempty" cty:"labels"` Headrooms []*terraformAutoScalerHeadroom `json:"autoscale_headrooms,omitempty" cty:"autoscale_headrooms"` }