From 290a4d96555d653ab6969faa8e8517624b4888e1 Mon Sep 17 00:00:00 2001
From: Ivan Stankov <ivan@cast.ai>
Date: Tue, 14 Nov 2023 11:59:31 +0200
Subject: [PATCH] Revert "Fix rebalancing schedules and phase 1 clusters"
This reverts commit 29b198004e5104c3a23695b4f672b52f87173302.
---
...st.go => resource_rebalancing_job_test.go} | 45 +++++++++----------
castai/sdk/api.gen.go | 19 ++------
2 files changed, 25 insertions(+), 39 deletions(-)
rename castai/{resource_rebalancing_job_eks_test.go => resource_rebalancing_job_test.go} (50%)
diff --git a/castai/resource_rebalancing_job_eks_test.go b/castai/resource_rebalancing_job_test.go
similarity index 50%
rename from castai/resource_rebalancing_job_eks_test.go
rename to castai/resource_rebalancing_job_test.go
index 934ebbb0..af37fd7a 100644
--- a/castai/resource_rebalancing_job_eks_test.go
+++ b/castai/resource_rebalancing_job_test.go
@@ -2,22 +2,19 @@ package castai
import (
"fmt"
- "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
"testing"
)
-func TestAccResourceRebalancingJob_eks(t *testing.T) {
- rName := fmt.Sprintf("%v-rebalancing-job-%v", ResourcePrefix, acctest.RandString(8))
- clusterName := "core-tf-acc"
+func TestAccResourceRebalancingJob_basic(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: providerFactories,
Steps: []resource.TestStep{
{
- Config: makeInitialRebalancingJobConfig(rName, clusterName),
+ Config: makeInitialRebalancingJobConfig(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("castai_rebalancing_job.test", "enabled", "true"),
),
@@ -25,32 +22,33 @@ func TestAccResourceRebalancingJob_eks(t *testing.T) {
{
ResourceName: "castai_rebalancing_job.test",
ImportStateIdFunc: func(s *terraform.State) (string, error) {
- clusterID := s.RootModule().Resources["castai_eks_cluster.test"].Primary.ID
- return fmt.Sprintf("%v/%v", clusterID, rName), nil
+ clusterID := s.RootModule().Resources["castai_eks_clusterid.test"].Primary.ID
+ rebalancingScheduleName := "test"
+ return fmt.Sprintf("%v/%v", clusterID, rebalancingScheduleName), nil
},
ImportState: true,
ImportStateVerify: true,
},
{
- Config: makeUpdatedRebalancingJobConfig(rName, clusterName),
+ Config: makeUpdatedRebalancingJobConfig(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("castai_rebalancing_job.test", "enabled", "false"),
),
},
},
- ExternalProviders: map[string]resource.ExternalProvider{
- "aws": {
- Source: "hashicorp/aws",
- VersionConstraint: "~> 4.0",
- },
- },
})
}
-func makeRebalancingJobConfig(rName, config string) string {
+func makeRebalancingJobConfig(config string) string {
template := `
+resource "castai_eks_clusterid" "test" {
+ account_id = "fake"
+ region = "eu-central-1"
+ cluster_name = "fake"
+}
+
resource "castai_rebalancing_schedule" "test" {
- name = %[1]q
+ name = "test"
schedule {
cron = "5 4 * * *"
}
@@ -66,18 +64,17 @@ resource "castai_rebalancing_schedule" "test" {
}
resource "castai_rebalancing_job" "test" {
- cluster_id = castai_eks_cluster.test.id
+ cluster_id = castai_eks_clusterid.test.id
rebalancing_schedule_id = castai_rebalancing_schedule.test.id
- %[2]s
+ %s
}
`
- return fmt.Sprintf(template, rName, config)
+ return fmt.Sprintf(template, config)
}
-func makeInitialRebalancingJobConfig(rName, clusterName string) string {
- return ConfigCompose(testAccEKSClusterConfig(rName, clusterName), makeRebalancingJobConfig(rName, ""))
+func makeInitialRebalancingJobConfig() string {
+ return makeRebalancingJobConfig("")
}
-
-func makeUpdatedRebalancingJobConfig(rName, clusterName string) string {
- return ConfigCompose(testAccEKSClusterConfig(rName, clusterName), makeRebalancingJobConfig(rName, "enabled=false"))
+func makeUpdatedRebalancingJobConfig() string {
+ return makeRebalancingJobConfig("enabled=false")
}
diff --git a/castai/sdk/api.gen.go b/castai/sdk/api.gen.go
index 36195bf0..f67c9075 100644
--- a/castai/sdk/api.gen.go
+++ b/castai/sdk/api.gen.go
@@ -99,13 +99,6 @@ const (
Unspecified NodeconfigV1ContainerRuntime = "unspecified"
)
-// Defines values for NodetemplatesV1AvailableInstanceTypeOs.
-const (
- NodetemplatesV1AvailableInstanceTypeOsLinux NodetemplatesV1AvailableInstanceTypeOs = "linux"
- NodetemplatesV1AvailableInstanceTypeOsUnknown NodetemplatesV1AvailableInstanceTypeOs = "unknown"
- NodetemplatesV1AvailableInstanceTypeOsWindows NodetemplatesV1AvailableInstanceTypeOs = "windows"
-)
-
// Defines values for NodetemplatesV1AvailableInstanceTypeStorageOptimizedOption.
const (
Always NodetemplatesV1AvailableInstanceTypeStorageOptimizedOption = "Always"
@@ -121,10 +114,10 @@ const (
// Defines values for PoliciesV1EvictorStatus.
const (
- PoliciesV1EvictorStatusCompatible PoliciesV1EvictorStatus = "Compatible"
- PoliciesV1EvictorStatusIncompatible PoliciesV1EvictorStatus = "Incompatible"
- PoliciesV1EvictorStatusMissing PoliciesV1EvictorStatus = "Missing"
- PoliciesV1EvictorStatusUnknown PoliciesV1EvictorStatus = "Unknown"
+ Compatible PoliciesV1EvictorStatus = "Compatible"
+ Incompatible PoliciesV1EvictorStatus = "Incompatible"
+ Missing PoliciesV1EvictorStatus = "Missing"
+ Unknown PoliciesV1EvictorStatus = "Unknown"
)
// Defines values for PoliciesV1SpotInterruptionPredictionsType.
@@ -1605,7 +1598,6 @@ type NodetemplatesV1AvailableInstanceType struct {
IsComputeOptimized *bool `json:"isComputeOptimized,omitempty"`
Memory *string `json:"memory,omitempty"`
Name *string `json:"name,omitempty"`
- Os *NodetemplatesV1AvailableInstanceTypeOs `json:"os,omitempty"`
StorageOptimizedOption *NodetemplatesV1AvailableInstanceTypeStorageOptimizedOption `json:"storageOptimizedOption,omitempty"`
}
@@ -1616,9 +1608,6 @@ type NodetemplatesV1AvailableInstanceTypeGPUDevice struct {
Name *string `json:"name,omitempty"`
}
-// NodetemplatesV1AvailableInstanceTypeOs defines model for nodetemplates.v1.AvailableInstanceType.Os.
-type NodetemplatesV1AvailableInstanceTypeOs string
-
// NodetemplatesV1AvailableInstanceTypeStorageOptimizedOption defines model for nodetemplates.v1.AvailableInstanceType.StorageOptimizedOption.
type NodetemplatesV1AvailableInstanceTypeStorageOptimizedOption string