Skip to content

Commit

Permalink
Merge pull request #10822 from hakman/automated-cherry-pick-of-#10819…
Browse files Browse the repository at this point in the history 
…-upstream-release-1.20

Automated cherry pick of #10819: fix(spot/ocean): replace corev1.Taint to fix hcl2
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Feb 14, 2021
2 parents 19e2f37 + b688d38 commit 68e3062
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 35 deletions.
17 changes: 4 additions & 13 deletions upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,6 @@ type terraformElastigroup struct {
EphemeralBlockDevice []*terraformElastigroupBlockDevice `json:"ephemeral_block_device,omitempty" cty:"ephemeral_block_device"`
Integration *terraformElastigroupIntegration `json:"integration_kubernetes,omitempty" cty:"integration_kubernetes"`
Tags []*terraformKV `json:"tags,omitempty" cty:"tags"`
Lifecycle *terraformLifecycle `json:"lifecycle,omitempty" cty:"lifecycle"`

MinSize *int64 `json:"min_size,omitempty" cty:"min_size"`
MaxSize *int64 `json:"max_size,omitempty" cty:"max_size"`
Expand Down Expand Up @@ -1435,8 +1434,10 @@ type terraformKV struct {
Value *string `json:"value" cty:"value"`
}

type terraformLifecycle struct {
IgnoreChanges []string `json:"ignore_changes,omitempty" cty:"ignore_changes"`
type terraformTaint struct {
Key *string `json:"key" cty:"key"`
Value *string `json:"value" cty:"value"`
Effect *string `json:"effect" cty:"effect"`
}

func (_ *Elastigroup) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Elastigroup) error {
Expand Down Expand Up @@ -1646,16 +1647,6 @@ func (_ *Elastigroup) RenderTerraform(t *terraform.TerraformTarget, a, e, change
})
}
}

// Ignore capacity changes because the auto scaler updates the
// desired capacity overtime.
if fi.BoolValue(tf.Integration.Enabled) {
tf.Lifecycle = &terraformLifecycle{
IgnoreChanges: []string{
"desired_capacity",
},
}
}
}
}
}
Expand Down
16 changes: 16 additions & 0 deletions upup/pkg/fi/cloudup/spotinsttasks/launch_spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ type terraformLaunchSpec struct {
InstanceTypes []string `json:"instance_types,omitempty" cty:"instance_types"`
SubnetIDs []*terraform.Literal `json:"subnet_ids,omitempty" cty:"subnet_ids"`
SecurityGroups []*terraform.Literal `json:"security_groups,omitempty" cty:"security_groups"`
Taints []*terraformTaint `json:"taints,omitempty" cty:"taints"`
Labels []*terraformKV `json:"labels,omitempty" cty:"labels"`
Tags []*terraformKV `json:"tags,omitempty" cty:"tags"`
Headrooms []*terraformAutoScalerHeadroom `json:"autoscale_headrooms,omitempty" cty:"autoscale_headrooms"`
Expand Down Expand Up @@ -883,6 +884,21 @@ func (_ *LaunchSpec) RenderTerraform(t *terraform.TerraformTarget, a, e, changes
})
}
}

// Taints.
if len(opts.Taints) > 0 {
tf.Taints = make([]*terraformTaint, len(opts.Taints))
for i, taint := range opts.Taints {
t := &terraformTaint{
Key: fi.String(taint.Key),
Effect: fi.String(string(taint.Effect)),
}
if taint.Value != "" {
t.Value = fi.String(taint.Value)
}
tf.Taints[i] = t
}
}
}
}

Expand Down
31 changes: 9 additions & 22 deletions upup/pkg/fi/cloudup/spotinsttasks/ocean.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,6 @@ type terraformOcean struct {
SubnetIDs []*terraform.Literal `json:"subnet_ids,omitempty" cty:"subnet_ids"`
AutoScaler *terraformAutoScaler `json:"autoscaler,omitempty" cty:"autoscaler"`
Tags []*terraformKV `json:"tags,omitempty" cty:"tags"`
Lifecycle *terraformLifecycle `json:"lifecycle,omitempty" cty:"lifecycle"`

MinSize *int64 `json:"min_size,omitempty" cty:"min_size"`
MaxSize *int64 `json:"max_size,omitempty" cty:"max_size"`
Expand All @@ -1031,17 +1030,15 @@ type terraformOcean struct {
DrainingTimeout *int64 `json:"draining_timeout,omitempty" cty:"draining_timeout"`
GracePeriod *int64 `json:"grace_period,omitempty" cty:"grace_period"`

Monitoring *bool `json:"monitoring,omitempty" cty:"monitoring"`
EBSOptimized *bool `json:"ebs_optimized,omitempty" cty:"ebs_optimized"`
ImageID *string `json:"image_id,omitempty" cty:"image_id"`
AssociatePublicIPAddress *bool `json:"associate_public_ip_address,omitempty" cty:"associate_public_ip_address"`
RootVolumeSize *int32 `json:"root_volume_size,omitempty" cty:"root_volume_size"`
UserData *terraform.Literal `json:"user_data,omitempty" cty:"user_data"`
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"`
Labels []*terraformKV `json:"labels,omitempty" cty:"labels"`
Headrooms []*terraformAutoScalerHeadroom `json:"autoscale_headrooms,omitempty" cty:"autoscale_headrooms"`
Monitoring *bool `json:"monitoring,omitempty" cty:"monitoring"`
EBSOptimized *bool `json:"ebs_optimized,omitempty" cty:"ebs_optimized"`
ImageID *string `json:"image_id,omitempty" cty:"image_id"`
AssociatePublicIPAddress *bool `json:"associate_public_ip_address,omitempty" cty:"associate_public_ip_address"`
RootVolumeSize *int32 `json:"root_volume_size,omitempty" cty:"root_volume_size"`
UserData *terraform.Literal `json:"user_data,omitempty" cty:"user_data"`
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"`
}

func (_ *Ocean) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Ocean) error {
Expand Down Expand Up @@ -1201,16 +1198,6 @@ func (_ *Ocean) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Oce
MaxMemory: limits.MaxVCPU,
}
}

// Ignore capacity changes because the auto scaler updates the
// desired capacity overtime.
if fi.BoolValue(tf.AutoScaler.Enabled) {
tf.Lifecycle = &terraformLifecycle{
IgnoreChanges: []string{
"desired_capacity",
},
}
}
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions upup/pkg/fi/cloudup/terraform/target_hcl2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/gocty"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/upup/pkg/fi"
)

Expand Down Expand Up @@ -99,6 +100,12 @@ func (t *TerraformTarget) finishHCL2(taskMap map[string]fi.Task) error {
"source": cty.StringVal("hashicorp/aws"),
"version": cty.StringVal(">= 2.46.0"),
})
if featureflag.Spotinst.Enabled() {
writeMap(requiredProvidersBody, "spotinst", map[string]cty.Value{
"source": cty.StringVal("spotinst/spotinst"),
"version": cty.StringVal(">= 1.33.0"),
})
}
}

bytes := hclwrite.Format(f.Bytes())
Expand Down

0 comments on commit 68e3062

Please sign in to comment.