Skip to content

Commit 541d5e7

Browse files
kr3vkr3v
committed
Merge remote-tracking branch 'origin/master' into fix-clm-enabled-set-to-false
2 parents 6568128 + b1a2ce4 commit 541d5e7

25 files changed

+2753
-142
lines changed

‎castai/provider.go‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -43,48 +43,50 @@ func Provider(version string) *schema.Provider {
4343
},
4444

4545
ResourcesMap: map[string]*schema.Resource{
46-
"castai_eks_cluster": resourceEKSCluster(),
47-
"castai_eks_clusterid": resourceEKSClusterID(),
48-
"castai_gke_cluster": resourceGKECluster(),
49-
"castai_gke_cluster_id": resourceGKEClusterId(),
50-
"castai_aks_cluster": resourceAKSCluster(),
51-
"castai_autoscaler": resourceAutoscaler(),
52-
"castai_evictor_advanced_config": resourceEvictionConfig(),
53-
"castai_node_template": resourceNodeTemplate(),
54-
"castai_rebalancing_schedule": resourceRebalancingSchedule(),
55-
"castai_rebalancing_job": resourceRebalancingJob(),
56-
"castai_node_configuration": resourceNodeConfiguration(),
57-
"castai_node_configuration_default": resourceNodeConfigurationDefault(),
58-
"castai_eks_user_arn": resourceEKSClusterUserARN(),
59-
"castai_reservations": resourceReservations(),
60-
"castai_commitments": resourceCommitments(),
61-
"castai_organization_members": resourceOrganizationMembers(),
62-
"castai_sso_connection": resourceSSOConnection(),
63-
"castai_service_account": resourceServiceAccount(),
64-
"castai_service_account_key": resourceServiceAccountKey(),
65-
"castai_workload_scaling_policy": resourceWorkloadScalingPolicy(),
66-
"castai_workload_scaling_policy_order": resourceWorkloadScalingPolicyOrder(),
67-
"castai_organization_group": resourceOrganizationGroup(),
68-
"castai_role_bindings": resourceRoleBindings(),
69-
"castai_hibernation_schedule": resourceHibernationSchedule(),
70-
"castai_security_runtime_rule": resourceSecurityRuntimeRule(),
71-
"castai_allocation_group": resourceAllocationGroup(),
72-
"castai_enterprise_group": resourceEnterpriseGroup(),
73-
"castai_enterprise_role_binding": resourceEnterpriseRoleBinding(),
74-
"castai_cache_group": resourceCacheGroup(),
75-
"castai_cache_configuration": resourceCacheConfiguration(),
76-
"castai_cache_rule": resourceCacheRule(),
46+
"castai_eks_cluster": resourceEKSCluster(),
47+
"castai_eks_clusterid": resourceEKSClusterID(),
48+
"castai_gke_cluster": resourceGKECluster(),
49+
"castai_gke_cluster_id": resourceGKEClusterId(),
50+
"castai_aks_cluster": resourceAKSCluster(),
51+
"castai_autoscaler": resourceAutoscaler(),
52+
"castai_evictor_advanced_config": resourceEvictionConfig(),
53+
"castai_node_template": resourceNodeTemplate(),
54+
"castai_rebalancing_schedule": resourceRebalancingSchedule(),
55+
"castai_rebalancing_job": resourceRebalancingJob(),
56+
"castai_node_configuration": resourceNodeConfiguration(),
57+
"castai_node_configuration_default": resourceNodeConfigurationDefault(),
58+
"castai_eks_user_arn": resourceEKSClusterUserARN(),
59+
"castai_reservations": resourceReservations(),
60+
"castai_commitments": resourceCommitments(),
61+
"castai_organization_members": resourceOrganizationMembers(),
62+
"castai_sso_connection": resourceSSOConnection(),
63+
"castai_service_account": resourceServiceAccount(),
64+
"castai_service_account_key": resourceServiceAccountKey(),
65+
"castai_organization_group": resourceOrganizationGroup(),
66+
"castai_role_bindings": resourceRoleBindings(),
67+
"castai_hibernation_schedule": resourceHibernationSchedule(),
68+
"castai_security_runtime_rule": resourceSecurityRuntimeRule(),
69+
"castai_allocation_group": resourceAllocationGroup(),
70+
"castai_enterprise_group": resourceEnterpriseGroup(),
71+
"castai_enterprise_role_binding": resourceEnterpriseRoleBinding(),
72+
"castai_cache_group": resourceCacheGroup(),
73+
"castai_cache_configuration": resourceCacheConfiguration(),
74+
"castai_cache_rule": resourceCacheRule(),
75+
76+
"castai_workload_scaling_policy": resourceWorkloadScalingPolicy(),
77+
"castai_workload_scaling_policy_order": resourceWorkloadScalingPolicyOrder(),
78+
"castai_workload_custom_metrics_data_source": resourceWorkloadCustomMetricsDataSource(),
7779
},
7880

7981
DataSourcesMap: map[string]*schema.Resource{
80-
"castai_eks_settings": dataSourceEKSSettings(),
81-
"castai_gke_user_policies": dataSourceGKEPolicies(),
82-
"castai_organization": dataSourceOrganization(),
83-
"castai_rebalancing_schedule": dataSourceRebalancingSchedule(),
84-
"castai_hibernation_schedule": dataSourceHibernationSchedule(),
85-
"castai_workload_scaling_policy_order": dataSourceWorkloadScalingPolicyOrder(),
86-
"castai_cache_group": dataSourceCacheGroup(),
87-
"castai_impersonation_service_account": dataSourceImpersonationServiceAccount(),
82+
"castai_eks_settings": dataSourceEKSSettings(),
83+
"castai_gke_user_policies": dataSourceGKEPolicies(),
84+
"castai_organization": dataSourceOrganization(),
85+
"castai_rebalancing_schedule": dataSourceRebalancingSchedule(),
86+
"castai_hibernation_schedule": dataSourceHibernationSchedule(),
87+
"castai_workload_scaling_policy_order": dataSourceWorkloadScalingPolicyOrder(),
88+
"castai_cache_group": dataSourceCacheGroup(),
89+
"castai_impersonation_service_account": dataSourceImpersonationServiceAccount(),
8890
},
8991

9092
ConfigureContextFunc: providerConfigure(version),

‎castai/resource_edge_location.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func (r *edgeLocationResource) Create(ctx context.Context, req resource.CreateRe
383383

384384
createReq := omni.EdgeLocationsAPICreateEdgeLocationJSONRequestBody{
385385
Name: plan.Name.ValueString(),
386-
Region: lo.ToPtr(plan.Region.ValueString()),
386+
Region: plan.Region.ValueStringPointer(),
387387
Zones: lo.ToPtr(r.toZones(plan.Zones)),
388388
}
389389

‎castai/resource_node_configuration.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func resourceNodeConfiguration() *schema.Resource {
114114
Type: schema.TypeInt,
115115
Optional: true,
116116
Default: 0,
117-
ValidateDiagFunc: validation.ToDiagFunc(validation.IntBetween(0, 3600)),
117+
ValidateDiagFunc: validation.ToDiagFunc(validation.IntBetween(0, 10800)),
118118
Description: "Timeout in seconds for draining the node. Defaults to 0",
119119
},
120120
FieldNodeConfigurationMinDiskSize: {

‎castai/resource_omni_cluster.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
1111
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
1212
"github.com/hashicorp/terraform-plugin-framework/types"
13+
14+
"github.com/castai/terraform-provider-castai/castai/sdk/omni"
1315
)
1416

1517
var (
@@ -93,7 +95,7 @@ func (r *omniClusterResource) Create(ctx context.Context, req resource.CreateReq
9395
organizationID := plan.OrganizationID.ValueString()
9496
clusterID := plan.ClusterID.ValueString()
9597

96-
apiResp, err := client.ClustersAPIRegisterClusterWithResponse(ctx, organizationID, clusterID)
98+
apiResp, err := client.ClustersAPIRegisterClusterWithResponse(ctx, organizationID, clusterID, omni.ClustersAPIRegisterClusterJSONRequestBody{})
9799
if err != nil {
98100
resp.Diagnostics.AddError("Failed to register omni cluster", err.Error())
99101
return

0 commit comments

Comments
 (0)