Skip to content

Commit fa33d09

Browse files
author
Erki Koop
authored
Merge pull request #346 from ekoop-terasky/fix_management_cluster_registration_documentation
Fix management cluster registration documentation
2 parents 86071c1 + 97b504b commit fa33d09

7 files changed

+33
-33
lines changed

‎docs/resources/management_cluster.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
3737
name = "tf-registration-test" // Required
3838
3939
spec {
40-
default_cluster_group = "default" // Required
40+
cluster_group = "default" // Required
4141
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
4242
}
4343
}
@@ -57,12 +57,12 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
5757
name = "tf-registration-test" // Required
5858
5959
spec {
60-
default_cluster_group = "default" // Required
61-
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
62-
image_registry = "image_registry_value"// Optional - only allowed with TKGm - if supplied this should be the name of a pre configured local image registry configured in TMC to pull images from
63-
workload_cluster_image_registry = "workload_cluster_image_registry_value"// Optional - only allowed with TKGm - only allowed if image_registry is not empty
64-
proxy_name = "proxy_name_value"// Optional - name of proxy configuration to use which is already configured in TMC
65-
workload_cluster_proxy_name = "workload_cluster_proxy_name_value"// Optional - only allowed if proxy_name is not empty
60+
cluster_group = "default" // Required
61+
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
62+
image_registry = "image_registry_value"// Optional - only allowed with TKGm - if supplied this should be the name of a pre configured local image registry configured in TMC to pull images from
63+
managed_workload_cluster_image_registry = "workload_cluster_image_registry_value"// Optional - only allowed with TKGm - only allowed if image_registry is not empty
64+
management_proxy_name = "proxy_name_value"// Optional - name of proxy configuration to use which is already configured in TMC
65+
managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value"// Optional - only allowed if proxy_name is not empty
6666
}
6767
}
6868
```
@@ -77,13 +77,13 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
7777
name = "tf-registration-test" // Required
7878
7979
spec {
80-
default_cluster_group = "default" // Required
80+
cluster_group = "default" // Required
8181
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
8282
}
8383
8484
register_management_cluster {
8585
tkgm_kubeconfig_file = "<kube-config-path>" // Required
86-
description = "optional description about the kube-config provided" // Optional
86+
tkgm_description = "optional description about the kube-config provided" // Optional
8787
}
8888
8989
ready_wait_timeout = "15m" // Optional , default value is 15m
@@ -100,13 +100,13 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
100100
name = "tf-registration-test" // Required
101101
102102
spec {
103-
default_cluster_group = "default" // Required
103+
cluster_group = "default" // Required
104104
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
105105
}
106106
107107
register_management_cluster {
108108
tkgm_kubeconfig_raw = var.kubeconfig // Required
109-
description = "optional description about the kube-config provided" // Optional
109+
tkgm_description = "optional description about the kube-config provided" // Optional
110110
}
111111
112112
ready_wait_timeout = "15m" // Optional , default value is 15m
@@ -133,7 +133,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
133133
name = "tf-registration-test" // Required
134134
135135
spec {
136-
default_cluster_group = "default" // Required
136+
cluster_group = "default" // Required
137137
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
138138
}
139139
}
@@ -153,10 +153,10 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
153153
name = "tf-registration-test" // Required
154154
155155
spec {
156-
default_cluster_group = "default" // Required
157-
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
158-
proxy_name = "proxy_name_value"// Optional - name of proxy configuration to use which is already configured in TMC
159-
workload_cluster_proxy_name = "workload_cluster_proxy_name_value"// Optional - only allowed if proxy_name is not empty
156+
cluster_group = "default" // Required
157+
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
158+
management_proxy_name = "proxy_name_value"// Optional - name of proxy configuration to use which is already configured in TMC
159+
managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value"// Optional - only allowed if proxy_name is not empty
160160
}
161161
}
162162
```

‎examples/resources/management_cluster/resource_management_cluster_registration_minimal_tkgm.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
22
name = "tf-registration-test" // Required
33

44
spec {
5-
default_cluster_group = "default" // Required
5+
cluster_group = "default" // Required
66
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
77
}
88
}

‎examples/resources/management_cluster/resource_management_cluster_registration_minimal_tkgs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
22
name = "tf-registration-test" // Required
33

44
spec {
5-
default_cluster_group = "default" // Required
5+
cluster_group = "default" // Required
66
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
77
}
88
}

‎examples/resources/management_cluster/resource_management_cluster_registration_tkgm.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
22
name = "tf-registration-test" // Required
33

44
spec {
5-
default_cluster_group = "default" // Required
6-
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
7-
image_registry = "image_registry_value" // Optional - only allowed with TKGm - if supplied this should be the name of a pre configured local image registry configured in TMC to pull images from
8-
workload_cluster_image_registry = "workload_cluster_image_registry_value" // Optional - only allowed with TKGm - only allowed if image_registry is not empty
9-
proxy_name = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC
10-
workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty
5+
cluster_group = "default" // Required
6+
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
7+
image_registry = "image_registry_value" // Optional - only allowed with TKGm - if supplied this should be the name of a pre configured local image registry configured in TMC to pull images from
8+
managed_workload_cluster_image_registry = "workload_cluster_image_registry_value" // Optional - only allowed with TKGm - only allowed if image_registry is not empty
9+
management_proxy_name = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC
10+
managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty
1111
}
1212
}

‎examples/resources/management_cluster/resource_management_cluster_registration_tkgs.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
22
name = "tf-registration-test" // Required
33

44
spec {
5-
default_cluster_group = "default" // Required
6-
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
7-
proxy_name = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC
8-
workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty
5+
cluster_group = "default" // Required
6+
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID_SERVICE" // Required
7+
management_proxy_name = "proxy_name_value" // Optional - name of proxy configuration to use which is already configured in TMC
8+
managed_workload_cluster_proxy_name = "workload_cluster_proxy_name_value" // Optional - only allowed if proxy_name is not empty
99
}
1010
}

‎examples/resources/management_cluster/resource_management_cluster_registration_with_kubeconfig_file_path.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
22
name = "tf-registration-test" // Required
33

44
spec {
5-
default_cluster_group = "default" // Required
5+
cluster_group = "default" // Required
66
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
77
}
88

99
register_management_cluster {
10-
tkgm_kubeconfig_file = "<kube-config-path>" // Required
11-
description = "optional description about the kube-config provided" // Optional
10+
tkgm_kubeconfig_file = "<kube-config-path>" // Required
11+
tkgm_description = "optional description about the kube-config provided" // Optional
1212
}
1313

1414
ready_wait_timeout = "15m" // Optional , default value is 15m

‎examples/resources/management_cluster/resource_management_cluster_registration_with_kubeconfig_raw_input.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ resource "tanzu-mission-control_management_cluster" "management_cluster_registra
22
name = "tf-registration-test" // Required
33

44
spec {
5-
default_cluster_group = "default" // Required
5+
cluster_group = "default" // Required
66
kubernetes_provider_type = "VMWARE_TANZU_KUBERNETES_GRID" // Required
77
}
88

99
register_management_cluster {
1010
tkgm_kubeconfig_raw = var.kubeconfig // Required
11-
description = "optional description about the kube-config provided" // Optional
11+
tkgm_description = "optional description about the kube-config provided" // Optional
1212
}
1313

1414
ready_wait_timeout = "15m" // Optional , default value is 15m

0 commit comments

Comments
 (0)