Skip to content

Commit a39108a

Browse files
authored
Merge pull request #319 from vmware/feature/eks_secondary_ip
Feature/eks secondary ip
2 parents fa33d09 + dc8b936 commit a39108a

27 files changed

+1047
-112
lines changed

docs/data-sources/ekscluster.md

+29
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Required:
9393

9494
Optional:
9595

96+
- `addons_config` (Block List, Max: 1) Addons config contains the configuration for all the addons of the cluster, which support customization of addon configuration (see [below for nested schema](#nestedblock--spec--config--addons_config))
9697
- `kubernetes_network_config` (Block List, Max: 1) Kubernetes Network Config (see [below for nested schema](#nestedblock--spec--config--kubernetes_network_config))
9798
- `logging` (Block List, Max: 1) EKS logging configuration (see [below for nested schema](#nestedblock--spec--config--logging))
9899
- `tags` (Map of String) The metadata to apply to the cluster to assist with categorization and organization
@@ -112,6 +113,34 @@ Optional:
112113
- `security_groups` (Set of String) Security groups for the cluster VMs
113114

114115

116+
<a id="nestedblock--spec--config--addons_config"></a>
117+
### Nested Schema for `spec.config.addons_config`
118+
119+
Optional:
120+
121+
- `vpc_cni_config` (Block List, Max: 1) VPC CNI addon config contains the configuration for the VPC CNI addon of the cluster (see [below for nested schema](#nestedblock--spec--config--addons_config--vpc_cni_config))
122+
123+
<a id="nestedblock--spec--config--addons_config--vpc_cni_config"></a>
124+
### Nested Schema for `spec.config.addons_config.vpc_cni_config`
125+
126+
Optional:
127+
128+
- `eni_config` (Block List) ENI config for the VPC CNI addon (see [below for nested schema](#nestedblock--spec--config--addons_config--vpc_cni_config--eni_config))
129+
130+
<a id="nestedblock--spec--config--addons_config--vpc_cni_config--eni_config"></a>
131+
### Nested Schema for `spec.config.addons_config.vpc_cni_config.eni_config`
132+
133+
Required:
134+
135+
- `id` (String) Subnet id for the ENI
136+
137+
Optional:
138+
139+
- `security_groups` (Set of String) Security groups for the ENI
140+
141+
142+
143+
115144
<a id="nestedblock--spec--config--kubernetes_network_config"></a>
116145
### Nested Schema for `spec.config.kubernetes_network_config`
117146

docs/data-sources/helm_charts.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ The Helm charts tab on the Catalog page in the Tanzu Mission Control console sho
2020
```terraform
2121
# Read Tanzu Mission Control helm charts : fetch helm charts details
2222
data "tanzu-mission-control_helm_charts" "get_cluster_helm_repo" {
23-
name = "test_name"
23+
name = "test_name"
2424
25-
chart_metadata_name = "test_metadata_name"
25+
chart_metadata_name = "test_metadata_name"
2626
27-
repository_name = "test_repository_name"
27+
repository_name = "test_repository_name"
2828
}
2929
```
3030
<!-- schema generated by tfplugindocs -->

docs/data-sources/helm_feature.md

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
---
2+
# generated by https://github.com/hashicorp/terraform-plugin-docs
3+
page_title: "tanzu-mission-control_helm_feature Data Source - terraform-provider-tanzu-mission-control"
4+
subcategory: ""
5+
description: |-
6+
7+
---
8+
9+
# tanzu-mission-control_helm_feature (Data Source)
10+
11+
12+
13+
14+
15+
<!-- schema generated by tfplugindocs -->
16+
## Schema
17+
18+
### Required
19+
20+
- `scope` (Block List, Min: 1, Max: 1) Scope for the Helm feature, having one of the valid scopes: cluster, cluster_group. (see [below for nested schema](#nestedblock--scope))
21+
22+
### Optional
23+
24+
- `meta` (Block List, Max: 1) Metadata for the resource (see [below for nested schema](#nestedblock--meta))
25+
26+
### Read-Only
27+
28+
- `id` (String) The ID of this resource.
29+
- `status` (Map of String) Status for the helm feature.
30+
31+
<a id="nestedblock--scope"></a>
32+
### Nested Schema for `scope`
33+
34+
Optional:
35+
36+
- `cluster` (Block List, Max: 1) The schema for cluster full name (see [below for nested schema](#nestedblock--scope--cluster))
37+
- `cluster_group` (Block List, Max: 1) The schema for cluster group full name (see [below for nested schema](#nestedblock--scope--cluster_group))
38+
39+
<a id="nestedblock--scope--cluster"></a>
40+
### Nested Schema for `scope.cluster`
41+
42+
Required:
43+
44+
- `name` (String) Name of this cluster
45+
46+
Optional:
47+
48+
- `management_cluster_name` (String) Name of the management cluster
49+
- `provisioner_name` (String) Provisioner of the cluster
50+
51+
52+
<a id="nestedblock--scope--cluster_group"></a>
53+
### Nested Schema for `scope.cluster_group`
54+
55+
Required:
56+
57+
- `name` (String) Name of the cluster group
58+
59+
60+
61+
<a id="nestedblock--meta"></a>
62+
### Nested Schema for `meta`
63+
64+
Optional:
65+
66+
- `annotations` (Map of String) Annotations for the resource
67+
- `description` (String) Description of the resource
68+
- `labels` (Map of String) Labels for the resource
69+
70+
Read-Only:
71+
72+
- `resource_version` (String) Resource version of the resource
73+
- `uid` (String) UID of the resource

docs/data-sources/helm_repository.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ The Available tab on the Catalog page in the Tanzu Mission Control console shows
2020
```terraform
2121
# Read Tanzu Mission Control helm repository : fetch helm repository details
2222
data "tanzu-mission-control_helm_repository" "get_cluster_helm_repo" {
23-
name = "test-helm-repository_name"
23+
name = "test-helm-repository_name"
2424
25-
metadata_name = "test_namespace_name"
25+
metadata_name = "test_namespace_name"
2626
2727
scope {
2828
cluster {
29-
name = "testcluster" # Required
29+
name = "testcluster" # Required
3030
provisioner_name = "attached" # Default: attached
3131
management_cluster_name = "attached" # Default: attached
3232
}

docs/resources/custom_policy.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Description: |-
88

99
The `tanzu-mission-control_custom_policy` resource enables you to attach one of the pre-defined custom policy recipes to a particular scope for management through Tanzu Mission Control.
1010

11+
1112
## Input Recipe
1213

1314
In the Tanzu Mission Control custom policy resource, there are six system defined types of custom templates that you can use:
@@ -1082,7 +1083,7 @@ resource "tanzu-mission-control_custom_policy" "organization_scoped_tmc-require-
10821083
### Required
10831084

10841085
- `name` (String) Name of the custom policy
1085-
- `scope` (Block List, Min: 1, Max: 1) Scope for the custom, security, image, network and namespace quota policy, having one of the valid scopes for custom, security and namespace quota policy: cluster, cluster_group or organization and valid scopes for image and network policy: workspace or organization. (see [below for nested schema](#nestedblock--scope))
1086+
- `scope` (Block List, Min: 1, Max: 1) Scope for the custom, security, image, network, namespace quota and mutation policy, having one of the valid scopes for custom, security, mutation, and namespace quota policy: cluster, cluster_group or organization and valid scopes for image and network policy: workspace or organization. (see [below for nested schema](#nestedblock--scope))
10861087
- `spec` (Block List, Min: 1, Max: 1) Spec for the custom policy (see [below for nested schema](#nestedblock--spec))
10871088

10881089
### Optional
@@ -1101,6 +1102,7 @@ Optional:
11011102
- `cluster` (Block List, Max: 1) The schema for cluster policy full name (see [below for nested schema](#nestedblock--scope--cluster))
11021103
- `cluster_group` (Block List, Max: 1) The schema for cluster group policy full name (see [below for nested schema](#nestedblock--scope--cluster_group))
11031104
- `organization` (Block List, Max: 1) The schema for organization policy full name (see [below for nested schema](#nestedblock--scope--organization))
1105+
- `workspace` (Block List, Max: 1) The schema for workspace policy full name (see [below for nested schema](#nestedblock--scope--workspace))
11041106

11051107
<a id="nestedblock--scope--cluster"></a>
11061108
### Nested Schema for `scope.cluster`
@@ -1131,6 +1133,14 @@ Required:
11311133
- `organization` (String) ID of this organization
11321134

11331135

1136+
<a id="nestedblock--scope--workspace"></a>
1137+
### Nested Schema for `scope.workspace`
1138+
1139+
Required:
1140+
1141+
- `workspace` (String) Name of this workspace
1142+
1143+
11341144

11351145
<a id="nestedblock--spec"></a>
11361146
### Nested Schema for `spec`

docs/resources/ekscluster.md

+46
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,23 @@ resource "tanzu-mission-control_ekscluster" "tf_eks_cluster" {
7979
"subnet-06897e1063cc0cf4e",
8080
]
8181
}
82+
83+
addons_config {
84+
vpc_cni_config {
85+
eni_config {
86+
id = "subnet-0a680171b6330619f" // Required, should belong to the same VPC as the cluster
87+
security_groups = [
88+
"sg-00c96ad9d02a22522",
89+
]
90+
}
91+
eni_config {
92+
id = "subnet-06feb0bb0451cda78" // Required, should belong to the same VPC as the cluster
93+
security_groups = [
94+
"sg-00c96ad9d02a22522",
95+
]
96+
}
97+
}
98+
}
8299
}
83100
84101
nodepool {
@@ -241,6 +258,7 @@ Required:
241258

242259
Optional:
243260

261+
- `addons_config` (Block List, Max: 1) Addons config contains the configuration for all the addons of the cluster, which support customization of addon configuration (see [below for nested schema](#nestedblock--spec--config--addons_config))
244262
- `kubernetes_network_config` (Block List, Max: 1) Kubernetes Network Config (see [below for nested schema](#nestedblock--spec--config--kubernetes_network_config))
245263
- `logging` (Block List, Max: 1) EKS logging configuration (see [below for nested schema](#nestedblock--spec--config--logging))
246264
- `tags` (Map of String) The metadata to apply to the cluster to assist with categorization and organization
@@ -260,6 +278,34 @@ Optional:
260278
- `security_groups` (Set of String) Security groups for the cluster VMs
261279

262280

281+
<a id="nestedblock--spec--config--addons_config"></a>
282+
### Nested Schema for `spec.config.addons_config`
283+
284+
Optional:
285+
286+
- `vpc_cni_config` (Block List, Max: 1) VPC CNI addon config contains the configuration for the VPC CNI addon of the cluster. (see [below for nested schema](#nestedblock--spec--config--addons_config--vpc_cni_config))
287+
288+
<a id="nestedblock--spec--config--addons_config--vpc_cni_config"></a>
289+
### Nested Schema for `spec.config.addons_config.vpc_cni_config`
290+
291+
Optional:
292+
293+
- `eni_config` (Block List) ENI config is the VPC CNI Elastic Network Interface config for providing the configuration of subnet and security groups for pods in each AZ. Subnets need not be in the same VPC as the cluster. The subnets provided across eniConfigs should be in different availability zones. Nodepool subnets need to be in the same AZ as the AZs used in ENIConfig. (see [below for nested schema](#nestedblock--spec--config--addons_config--vpc_cni_config--eni_config))
294+
295+
<a id="nestedblock--spec--config--addons_config--vpc_cni_config--eni_config"></a>
296+
### Nested Schema for `spec.config.addons_config.vpc_cni_config.eni_config`
297+
298+
Required:
299+
300+
- `id` (String) Subnet Id for the pods running in all Nodes in a given AZ.
301+
302+
Optional:
303+
304+
- `security_groups` (Set of String) List of security group is optional and if not provided default security group created by EKS will be used.
305+
306+
307+
308+
263309
<a id="nestedblock--spec--config--kubernetes_network_config"></a>
264310
### Nested Schema for `spec.config.kubernetes_network_config`
265311

docs/resources/image_policy.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ resource "tanzu-mission-control_image_policy" "organization_scoped_require-diges
439439
### Required
440440

441441
- `name` (String) Name of the image policy
442-
- `scope` (Block List, Min: 1, Max: 1) Scope for the custom, security, image, network and namespace quota policy, having one of the valid scopes for custom, security and namespace quota policy: cluster, cluster_group or organization and valid scopes for image and network policy: workspace or organization. (see [below for nested schema](#nestedblock--scope))
442+
- `scope` (Block List, Min: 1, Max: 1) Scope for the custom, security, image, network, namespace quota and mutation policy, having one of the valid scopes for custom, security, mutation, and namespace quota policy: cluster, cluster_group or organization and valid scopes for image and network policy: workspace or organization. (see [below for nested schema](#nestedblock--scope))
443443
- `spec` (Block List, Min: 1, Max: 1) Spec for the image policy (see [below for nested schema](#nestedblock--spec))
444444

445445
### Optional
@@ -455,9 +455,31 @@ resource "tanzu-mission-control_image_policy" "organization_scoped_require-diges
455455

456456
Optional:
457457

458+
- `cluster` (Block List, Max: 1) The schema for cluster policy full name (see [below for nested schema](#nestedblock--scope--cluster))
459+
- `cluster_group` (Block List, Max: 1) The schema for cluster group policy full name (see [below for nested schema](#nestedblock--scope--cluster_group))
458460
- `organization` (Block List, Max: 1) The schema for organization policy full name (see [below for nested schema](#nestedblock--scope--organization))
459461
- `workspace` (Block List, Max: 1) The schema for workspace policy full name (see [below for nested schema](#nestedblock--scope--workspace))
460462

463+
<a id="nestedblock--scope--cluster"></a>
464+
### Nested Schema for `scope.cluster`
465+
466+
Required:
467+
468+
- `name` (String) Name of this cluster
469+
470+
Optional:
471+
472+
- `management_cluster_name` (String) Name of the management cluster
473+
- `provisioner_name` (String) Provisioner of the cluster
474+
475+
476+
<a id="nestedblock--scope--cluster_group"></a>
477+
### Nested Schema for `scope.cluster_group`
478+
479+
Required:
480+
481+
- `cluster_group` (String) Name of this cluster group
482+
461483

462484
<a id="nestedblock--scope--organization"></a>
463485
### Nested Schema for `scope.organization`

0 commit comments

Comments
 (0)