Merge pull request #1270 from duplocloud/hotfix/0.11.30

Hotfix Release v0.11.30

Author: Duplo-nikv

Makefile

@@ -8,7 +8,7 @@ NAMESPACE=duplocloud
 
 NAME=duplocloud
 BINARY=terraform-provider-${NAME}
-VERSION=0.11.29
+VERSION=0.11.30
 #mac
 #OS_ARCH=darwin_amd64
 #OS_ARCH=linux_amd64

docs/data-sources/duplo_service_lbconfigs.md

@@ -53,7 +53,6 @@ Read-Only:
 - `cloud_name` (String)
 - `custom_cidr` (List of String)
 - `dns_name` (String)
-- `eip_allocations` (List of String)
 - `external_port` (Number)
 - `external_traffic_policy` (String)
 - `extra_selector_label` (List of Object) (see [below for nested schema](#nestedobjatt--services--lbconfigs--extra_selector_label))

docs/data-sources/ecs_service.md

@@ -23,13 +23,16 @@ description: |-
 ### Read-Only
 
 - `capacity_provider_strategy` (List of Object) (see [below for nested schema](#nestedatt--capacity_provider_strategy))
+- `deployment_configuration` (List of Object) (see [below for nested schema](#nestedatt--deployment_configuration))
 - `dns_prfx` (String) The DNS prefix to assign to this service's load balancer.
 - `health_check_grace_period_seconds` (Number)
 - `id` (String) The ID of this resource.
 - `index` (Number) The index of the ecs service.
 - `is_target_group_only` (Boolean)
 - `load_balancer` (List of Object) Zero or more load balancer configurations to associate with this service. (see [below for nested schema](#nestedatt--load_balancer))
 - `old_task_definition_buffer_size` (Number) The number of older task definitions to retain in AWS.
+- `placement_constraint` (List of Object) Rules that are taken into consideration during task placement. Maximum number of `placement_constraints` is `10` (see [below for nested schema](#nestedatt--placement_constraint))
+- `placement_strategy` (List of Object) Service level strategy rules that are taken into consideration during task placement. List from top to bottom in order of precedence. The maximum number of `placement_strategy` blocks is `5` (see [below for nested schema](#nestedatt--placement_strategy))
 - `replicas` (Number) The number of container replicas to create.
 - `target_group_arns` (Set of String)
 - `task_definition` (String) The ARN of the task definition to use.
@@ -45,6 +48,28 @@ Read-Only:
 - `weight` (Number)
 
 
+<a id="nestedatt--deployment_configuration"></a>
+### Nested Schema for `deployment_configuration`
+
+Read-Only:
+
+- `alarms` (List of Object) (see [below for nested schema](#nestedobjatt--deployment_configuration--alarms))
+- `enable_circuit_breaker` (Boolean)
+- `maximum_percent` (Number)
+- `minimum_healthy_percent` (Number)
+- `rollback_circuit_breaker` (Boolean)
+
+<a id="nestedobjatt--deployment_configuration--alarms"></a>
+### Nested Schema for `deployment_configuration.alarms`
+
+Read-Only:
+
+- `enable` (Boolean)
+- `names` (List of String)
+- `rollback` (Boolean)
+
+
+
 <a id="nestedatt--load_balancer"></a>
 ### Nested Schema for `load_balancer`
 
@@ -82,3 +107,22 @@ Read-Only:
 - `healthy_threshold_count` (Number)
 - `http_success_code` (String)
 - `unhealthy_threshold_count` (Number)
+
+
+
+<a id="nestedatt--placement_constraint"></a>
+### Nested Schema for `placement_constraint`
+
+Read-Only:
+
+- `expression` (String)
+- `type` (String)
+
+
+<a id="nestedatt--placement_strategy"></a>
+### Nested Schema for `placement_strategy`
+
+Read-Only:
+
+- `field` (String)
+- `type` (String)

docs/data-sources/ecs_services.md

@@ -30,13 +30,16 @@ description: |-
 Read-Only:
 
 - `capacity_provider_strategy` (List of Object) (see [below for nested schema](#nestedobjatt--services--capacity_provider_strategy))
+- `deployment_configuration` (List of Object) (see [below for nested schema](#nestedobjatt--services--deployment_configuration))
 - `dns_prfx` (String)
 - `health_check_grace_period_seconds` (Number)
 - `index` (Number)
 - `is_target_group_only` (Boolean)
 - `load_balancer` (List of Object) (see [below for nested schema](#nestedobjatt--services--load_balancer))
 - `name` (String)
 - `old_task_definition_buffer_size` (Number)
+- `placement_constraint` (List of Object) (see [below for nested schema](#nestedobjatt--services--placement_constraint))
+- `placement_strategy` (List of Object) (see [below for nested schema](#nestedobjatt--services--placement_strategy))
 - `replicas` (Number)
 - `target_group_arns` (Set of String)
 - `task_definition` (String)
@@ -52,6 +55,28 @@ Read-Only:
 - `weight` (Number)
 
 
+<a id="nestedobjatt--services--deployment_configuration"></a>
+### Nested Schema for `services.deployment_configuration`
+
+Read-Only:
+
+- `alarms` (List of Object) (see [below for nested schema](#nestedobjatt--services--deployment_configuration--alarms))
+- `enable_circuit_breaker` (Boolean)
+- `maximum_percent` (Number)
+- `minimum_healthy_percent` (Number)
+- `rollback_circuit_breaker` (Boolean)
+
+<a id="nestedobjatt--services--deployment_configuration--alarms"></a>
+### Nested Schema for `services.deployment_configuration.alarms`
+
+Read-Only:
+
+- `enable` (Boolean)
+- `names` (List of String)
+- `rollback` (Boolean)
+
+
+
 <a id="nestedobjatt--services--load_balancer"></a>
 ### Nested Schema for `services.load_balancer`
 
@@ -89,3 +114,22 @@ Read-Only:
 - `healthy_threshold_count` (Number)
 - `http_success_code` (String)
 - `unhealthy_threshold_count` (Number)
+
+
+
+<a id="nestedobjatt--services--placement_constraint"></a>
+### Nested Schema for `services.placement_constraint`
+
+Read-Only:
+
+- `expression` (String)
+- `type` (String)
+
+
+<a id="nestedobjatt--services--placement_strategy"></a>
+### Nested Schema for `services.placement_strategy`
+
+Read-Only:
+
+- `field` (String)
+- `type` (String)

docs/data-sources/native_host_image.md

@@ -10,7 +10,17 @@ description: |-
 
 `duplocloud_native_host_image` retrieves details of a specific image for a given tenant.
 
-
+## Example Usage
+
+```terraform
+data "duplocloud_native_host_image" "img" {
+  tenant_id   = "f4bf01f0-5077-489e-aa51-95fb77049608"
+  name        = "EKS-Oregon-1.32"
+  os          = "AmazonLinux2023"
+  k8s_version = "1.32"
+  arch        = "amd64"
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -21,19 +31,19 @@ description: |-
 
 ### Optional
 
-- `arch` (String)
-- `is_kubernetes` (Boolean)
-- `name` (String)
+- `arch` (String) Architecture of the native host
+- `is_kubernetes` (Boolean, Deprecated) This field is deprecated. Use k8s_version for precise filtering
+- `k8s_version` (String) K8 version of the native host
+- `name` (String) Name of the Duplocloud native host
+- `os` (String) OS of native host
+- `username` (String) username associated to native host
 
 ### Read-Only
 
 - `id` (String) The ID of this resource.
 - `image_id` (String)
-- `k8s_version` (String)
-- `os` (String)
 - `region` (String)
 - `tags` (List of Object) (see [below for nested schema](#nestedatt--tags))
-- `username` (String)
 
 <a id="nestedatt--tags"></a>
 ### Nested Schema for `tags`

docs/resources/duplo_service_lbconfigs.md

@@ -148,9 +148,6 @@ Optional:
 - `backend_protocol_version` (String) Is used for communication between the load balancer and the target instances. This field is used to set protocol version for ALB load balancer. Only applicable when protocol is HTTP or HTTPS. The protocol version. Specify GRPC to send requests to targets using gRPC. Specify HTTP2 to send requests to targets using HTTP/2. The default is HTTP1, which sends requests to targets using HTTP/1.1
 - `certificate_arn` (String) The ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS.
 - `custom_cidr` (List of String) Specify CIDR Values. This is applicable only for Network Load Balancer if `lb_type` is `6`.
-- `eip_allocations` (List of String) Allocate Elastic IP to load balancer, which is configured under plan configuration.
-
-Note: This field can only be set for non internal lbtype NLB(6)
 - `external_port` (Number) The frontend port associated with this load balancer configuration. Required if `lb_type` is not `7`.
 - `external_traffic_policy` (String) Only for K8S Node Port (`lb_type = 4`) or load balancers in Kubernetes.  Set the kubernetes service `externalTrafficPolicy` attribute.
 - `extra_selector_label` (Block List) Only for K8S services or load balancers in Kubernetes.  Sets an additional selector label to narrow which pods can receive traffic. (see [below for nested schema](#nestedblock--lbconfigs--extra_selector_label))

docs/resources/ecs_service.md

@@ -53,6 +53,55 @@ resource "duplocloud_ecs_service" "myservice" {
     capacity_provider = "<asg-fullname>"
   }
 }
+
+
+resource "duplocloud_ecs_service" "myservice" {
+  tenant_id       = duplocloud_tenant.myapp.tenant_id
+  name            = "myservice"
+  task_definition = duplocloud_ecs_task_definition.myservice.arn
+  replicas        = 1
+  capacity_provider_strategy {
+    base              = 0
+    weight            = 1
+    capacity_provider = "<asg-fullname>"
+  }
+  deployment_configuration {
+    minimum_healthy_percent  = 20
+    maximum_percent          = 100
+    enable_circuit_breaker   = true
+    rollback_circuit_breaker = true
+    alarms {
+      enable   = true
+      rollback = true
+      names    = ["<cloudwatch-alarm-name>"]
+    }
+  }
+}
+
+resource "duplocloud_ecs_service" "myservice" {
+  tenant_id       = duplocloud_tenant.myapp.tenant_id
+  name            = "myservice"
+  task_definition = duplocloud_ecs_task_definition.myservice.arn
+  replicas        = 1
+  capacity_provider_strategy {
+    base              = 0
+    weight            = 1
+    capacity_provider = "duploservices-sep8-forecs"
+  }
+  placement_strategy {
+    type  = "binpack"
+    field = "cpu"
+  }
+  placement_strategy {
+    type  = "spread"
+    field = "instanceId"
+  }
+
+  placement_constraint {
+    type       = "memberOf"
+    expression = "attribute:ecs.instance-type =~ t3.*"
+  }
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -68,11 +117,14 @@ resource "duplocloud_ecs_service" "myservice" {
 ### Optional
 
 - `capacity_provider_strategy` (Block List) (see [below for nested schema](#nestedblock--capacity_provider_strategy))
+- `deployment_configuration` (Block List, Max: 1) (see [below for nested schema](#nestedblock--deployment_configuration))
 - `dns_prfx` (String) The DNS prefix to assign to this service's load balancer.
 - `health_check_grace_period_seconds` (Number) Defaults to `0`.
 - `is_target_group_only` (Boolean) Defaults to `false`.
 - `load_balancer` (Block List) Zero or more load balancer configurations to associate with this service. (see [below for nested schema](#nestedblock--load_balancer))
 - `old_task_definition_buffer_size` (Number) The number of older task definitions to retain in AWS. Defaults to `10`.
+- `placement_constraint` (Block List, Max: 10) Rules that are taken into consideration during task placement. Maximum number of `placement_constraints` is `10` (see [below for nested schema](#nestedblock--placement_constraint))
+- `placement_strategy` (Block List, Max: 5) Service level strategy rules that are taken into consideration during task placement. List from top to bottom in order of precedence. The maximum number of `placement_strategy` blocks is `5` (see [below for nested schema](#nestedblock--placement_strategy))
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `wait_until_targets_ready` (Boolean) Whether or not to wait until all target groups are created for ecs service, after creation. Defaults to `true`.
 
@@ -98,6 +150,28 @@ Optional:
 - `weight` (Number) The relative percentage of the total number of launched tasks that should use the specified capacity provider.
 
 
+<a id="nestedblock--deployment_configuration"></a>
+### Nested Schema for `deployment_configuration`
+
+Optional:
+
+- `alarms` (Block List) (see [below for nested schema](#nestedblock--deployment_configuration--alarms))
+- `enable_circuit_breaker` (Boolean) Enables ECS deployment circuit breaker to stop deployments on failures. Defaults to `false`.
+- `maximum_percent` (Number) Specifies the maximum percentage of tasks that can run at once during a deployment.
+- `minimum_healthy_percent` (Number) Specifies the minimum percentage of tasks that must remain in the RUNNING state during a deployment
+- `rollback_circuit_breaker` (Boolean) Enables automatic rollback when the circuit breaker detects a failed deployment. Defaults to `false`.
+
+<a id="nestedblock--deployment_configuration--alarms"></a>
+### Nested Schema for `deployment_configuration.alarms`
+
+Optional:
+
+- `enable` (Boolean) Enables or disables CloudWatch alarm monitoring during deployments. Defaults to `false`.
+- `names` (List of String) Names of CloudWatch alarms that ECS monitors during deployments.
+- `rollback` (Boolean) Automatically rolls back the deployment if any configured CloudWatch alarm enters ALARM state. Defaults to `false`.
+
+
+
 <a id="nestedblock--load_balancer"></a>
 ### Nested Schema for `load_balancer`
 
@@ -149,6 +223,30 @@ Optional:
 
 
 
+<a id="nestedblock--placement_constraint"></a>
+### Nested Schema for `placement_constraint`
+
+Required:
+
+- `type` (String) Type of constraint. The only valid values at this time are `memberOf` and `distinctInstance`
+
+Optional:
+
+- `expression` (String) Cluster Query Language expression to apply to the constraint. Does not need to be specified for the distinctInstance type. For more information, see [Cluster Query Language in the Amazon EC2 Container Service Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/cluster-query-language.html).
+
+
+<a id="nestedblock--placement_strategy"></a>
+### Nested Schema for `placement_strategy`
+
+Required:
+
+- `type` (String) Type of placement strategy. Must be one of: `binpack`, `random`, or `spread`
+
+Optional:
+
+- `field` (String) For the spread placement strategy, valid values are instanceId, or any platform or custom attribute that is applied to a container instance. For the binpack type, valid values are memory and cpu. For the random type, this attribute is not needed. For more information, see [PlacementStrategy](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PlacementStrategy.html)
+
+
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
 

docs/resources/k8_config_map.md

@@ -25,8 +25,9 @@ resource "duplocloud_k8_config_map" "myapp" {
 
   data = jsonencode({ foo = "bar2" })
   labels = {
-    ke1 = "val1"
-    ke2 = "val3"
+    ke1                           = "val1"
+    ke2                           = "val3"
+    "app.duplocloud.net/app-name" = "<appname>"
   }
 }
 ```

docs/resources/k8_ingress.md

@@ -54,6 +54,7 @@ resource "duplocloud_duplo_service_lbconfigs" "echo_config" {
     protocol         = "tcp"
     health_check_url = "/"
   }
+
 }
 
 resource "duplocloud_duplo_service" "echo2" {
@@ -118,6 +119,9 @@ resource "duplocloud_k8_ingress" "ingress" {
     service_name = duplocloud_duplo_service.echo2.name
     port         = 5678
   }
+  labels = {
+    "app.duplocloud.net/app-name" = "tfapp"
+  }
 
   depends_on = [time_sleep.wait_45_seconds]
 }

docs/resources/k8_secret.md

@@ -25,8 +25,9 @@ resource "duplocloud_k8_secret" "myapp" {
   secret_type = "Opaque"
   secret_data = jsonencode({ foo = "bar2" })
   secret_labels = {
-    KeyA = "ValueA"
-    KeyB = "ValueB"
+    KeyA                          = "ValueA"
+    KeyB                          = "ValueB"
+    "app.duplocloud.net/app-name" = "<appname>"
   }
   secret_annotations = {
     annotA = "ValueA"