Update docs and CHANGELOG.md

CHANGELOG.md

@@ -1,4 +1,17 @@
 
+## [v1.0.40](https://github.com/civo/terraform-provider-civo/releases/tag/v1.0.40) (29 April 2024)
+
+### Merged
+- [#201](https://github.com/civo/terraform-provider-civo/pull/201) - VLAN Support
+- [#207](https://github.com/civo/terraform-provider-civo/pull/207) - Update private key variable in release.yml
+- [#206](https://github.com/civo/terraform-provider-civo/pull/206) - Add environment variable for release job in release.yml
+- [#205](https://github.com/civo/terraform-provider-civo/pull/205) - Fix GitHub Actions configuration in release.yml
+- [#204](https://github.com/civo/terraform-provider-civo/pull/204) - Support Reserved IP for Instance create operation
+- [#200](https://github.com/civo/terraform-provider-civo/pull/200) - Add CIDR and Nameservers support in network
+- [#198](https://github.com/civo/terraform-provider-civo/pull/198) - Add Labels and Taints to Node Pool configurations
+- [#196](https://github.com/civo/terraform-provider-civo/pull/196) - Refactor Civo Kubernetes node pool configuration and organize code in their own folders per service
+- [#195](https://github.com/civo/terraform-provider-civo/pull/195) - Remove spaces in the applications string
+
 ## [v1.0.39](https://github.com/civo/terraform-provider-civo/releases/tag/v1.0.39) (16 October 2023)
 
 ### Merged

docs/data-sources/kubernetes_cluster.md

@@ -68,10 +68,21 @@ Read-Only:
 
 Read-Only:
 
-- `instance_names` (Set of String)
+- `instance_names` (List of String)
 - `label` (String)
+- `labels` (Map of String)
 - `node_count` (Number)
 - `public_ip_node_pool` (Boolean)
 - `size` (String)
+- `taint` (Set of Object) (see [below for nested schema](#nestedobjatt--pools--taint))
+
+<a id="nestedobjatt--pools--taint"></a>
+### Nested Schema for `pools.taint`
+
+Read-Only:
+
+- `effect` (String)
+- `key` (String)
+- `value` (String)
 
 

docs/data-sources/network.md

@@ -22,6 +22,8 @@ Networks may be looked up by id or label, and you can optionally pass region if
 data "civo_network" "test" {
     label = "test-network"
     region = "LON1"
+    cidr_v4        = "10.0.0.0/24"
+    nameservers_v4 = ["8.8.8.8", "8.8.4.4", "1.1.1.1"]
 }
 ```
 

docs/resources/instance.md

@@ -59,6 +59,7 @@ resource "civo_instance" "foo" {
 - `notes` (String) Add some notes to the instance
 - `public_ip_required` (String) This should be either 'none' or 'create' (default: 'create')
 - `region` (String) The region for the instance, if not declare we use the region in declared in the provider
+- `reserved_ipv4` (String) Can be either the UUID, name, or the IP address of the reserved IP
 - `reverse_dns` (String) A fully qualified domain name that should be used as the instance's IP's reverse DNS (optional, uses the hostname if unspecified)
 - `script` (String) The contents of a script that will be uploaded to /usr/local/bin/civo-user-init-script on your instance, read/write/executable only by root and then will be executed at the end of the cloud initialization
 - `size` (String) The name of the size, from the current list, e.g. g3.xsmall

docs/resources/kubernetes_cluster.md

@@ -128,12 +128,24 @@ Required:
 Optional:
 
 - `label` (String) Node pool label, if you don't provide one, we will generate one for you
+- `labels` (Map of String)
 - `public_ip_node_pool` (Boolean) Node pool belongs to the public ip node pool
+- `taint` (Block Set) (see [below for nested schema](#nestedblock--pools--taint))
 
 Read-Only:
 
 - `instance_names` (List of String) Instance names in the nodepool
 
+<a id="nestedblock--pools--taint"></a>
+### Nested Schema for `pools.taint`
+
+Required:
+
+- `effect` (String)
+- `key` (String)
+- `value` (String)
+
+
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/resources/kubernetes_node_pool.md

@@ -30,7 +30,7 @@ resource "civo_kubernetes_cluster" "my-cluster" {
     name = "my-cluster"
     applications = "Portainer,Linkerd:Linkerd & Jaeger"
     firewall_id = civo_firewall.my-firewall.id
-    node_pool {
+    pools {
         size = element(data.civo_size.xsmall.sizes, 0).name
         node_count = 3
     }
@@ -52,15 +52,14 @@ resource "civo_kubernetes_node_pool" "back-end" {
 ### Required
 
 - `cluster_id` (String) The ID of your cluster
-- `region` (String) The region of the node pool, has to match that of the cluster
+- `node_count` (Number) Number of nodes in the nodepool
+- `size` (String) Size of the nodes in the nodepool
 
 ### Optional
 
 - `label` (String) Node pool label, if you don't provide one, we will generate one for you
 - `labels` (Map of String)
-- `node_count` (Number) the number of instances to create (optional, the default at the time of writing is 3)
 - `public_ip_node_pool` (Boolean) Node pool belongs to the public ip node pool
-- `size` (String) the size of each node (optional, the default is currently g4s.kube.medium)
 - `taint` (Block Set) (see [below for nested schema](#nestedblock--taint))
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
@@ -119,7 +118,7 @@ resource "civo_kubernetes_cluster" "my-cluster" {
     applications = "Portainer,Linkerd:Linkerd & Jaeger"
     firewall_id = civo_firewall.my-firewall.id
     
-    node_pool {
+    pools {
         size = element(data.civo_size.xsmall.sizes, 0).name
         node_count = 3
     }

docs/resources/network.md

@@ -27,7 +27,15 @@ resource "civo_network" "custom_net" {
 
 ### Optional
 
+- `cidr_v4` (String) The CIDR block for the network
+- `nameservers_v4` (List of String) List of nameservers for the network
 - `region` (String) The region of the network
+- `vlan_allocation_pool_v4_end` (String) End of the IPv4 allocation pool for VLAN
+- `vlan_allocation_pool_v4_start` (String) Start of the IPv4 allocation pool for VLAN
+- `vlan_cidr_v4` (String) CIDR for VLAN IPv4
+- `vlan_gateway_ip_v4` (String) Gateway IP for VLAN IPv4
+- `vlan_hardware_addr` (String) Hardware address for VLAN
+- `vlan_id` (Number) VLAN ID for the network
 
 ### Read-Only