From 7839acb2fe47bab5c65ebd89286c10aed49a625a Mon Sep 17 00:00:00 2001 From: Daniel Simionato Date: Mon, 20 Nov 2023 18:18:16 +0100 Subject: [PATCH 1/3] Re-generated docs. --- helm/cluster-aws/README.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/helm/cluster-aws/README.md b/helm/cluster-aws/README.md index 8577b4b41..993d6389c 100644 --- a/helm/cluster-aws/README.md +++ b/helm/cluster-aws/README.md @@ -121,15 +121,6 @@ Properties within the `.controlPlane` top-level object | `controlPlane.subnetTags[*]` | **Subnet tag**|**Type:** `object`
| | `controlPlane.subnetTags[*].*` | **Tag value**|**Type:** `string`
**Value pattern:** `^[ a-zA-Z0-9\._:/=+-@]+$`
| -### Global properties -Properties within the `.global` top-level object -Properties that are available to all charts and subcharts. - -| **Property** | **Description** | **More Details** | -| :----------- | :-------------- | :--------------- | -| `global.metadata` | **Metadata**|**Type:** `object`
| -| `global.metadata.preventDeletion` | **Prevent cluster deletion**|**Type:** `boolean`
**Default:** `false`| - ### Internal Properties within the `.internal` top-level object For Giant Swarm internal use only, not stable, or not supported by UIs. @@ -207,6 +198,13 @@ Properties within the `.metadata` top-level object | `metadata.organization` | **Organization**|**Type:** `string`
| | `metadata.servicePriority` | **Service priority** - The relative importance of this cluster.|**Type:** `string`
**Default:** `"highest"`| +### Metadata +Properties within the `.global.metadata` object + +| **Property** | **Description** | **More Details** | +| :----------- | :-------------- | :--------------- | +| `global.metadata.preventDeletion` | **Prevent cluster deletion**|**Type:** `boolean`
**Default:** `false`| + ### Node pools Properties within the `.nodePools` top-level object Node pools of the cluster. If not specified, this defaults to the value of `internal.nodePools`. From 63dacc8baca91c1ce714c0d1655bc54b1d2f7610 Mon Sep 17 00:00:00 2001 From: Daniel Simionato Date: Tue, 21 Nov 2023 12:18:43 +0100 Subject: [PATCH 2/3] moved metadata.preventDeletion in metadata section in docs --- helm/cluster-aws/README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/helm/cluster-aws/README.md b/helm/cluster-aws/README.md index 993d6389c..ef89c10a4 100644 --- a/helm/cluster-aws/README.md +++ b/helm/cluster-aws/README.md @@ -197,13 +197,7 @@ Properties within the `.metadata` top-level object | `metadata.name` | **Cluster name** - Unique identifier, cannot be changed after creation.|**Type:** `string`
| | `metadata.organization` | **Organization**|**Type:** `string`
| | `metadata.servicePriority` | **Service priority** - The relative importance of this cluster.|**Type:** `string`
**Default:** `"highest"`| - -### Metadata -Properties within the `.global.metadata` object - -| **Property** | **Description** | **More Details** | -| :----------- | :-------------- | :--------------- | -| `global.metadata.preventDeletion` | **Prevent cluster deletion**|**Type:** `boolean`
**Default:** `false`| +| `metadata.preventDeletion` | **Prevent cluster deletion**|**Type:** `boolean`
**Default:** `false`| ### Node pools Properties within the `.nodePools` top-level object From 8af71f0cee4707951618f0727924806e6825de85 Mon Sep 17 00:00:00 2001 From: Daniel Simionato Date: Tue, 21 Nov 2023 12:26:12 +0100 Subject: [PATCH 3/3] Reverted changes --- helm/cluster-aws/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helm/cluster-aws/README.md b/helm/cluster-aws/README.md index ef89c10a4..d7ad5c4f2 100644 --- a/helm/cluster-aws/README.md +++ b/helm/cluster-aws/README.md @@ -188,6 +188,13 @@ Properties within the `.kubectlImage` top-level object | `kubectlImage.registry` | **Registry**|**Type:** `string`
**Default:** `"quay.io"`| | `kubectlImage.tag` | **Tag**|**Type:** `string`
**Default:** `"1.23.5"`| +### Metadata +Properties within the `.global.metadata` object + +| **Property** | **Description** | **More Details** | +| :----------- | :-------------- | :--------------- | +| `global.metadata.preventDeletion` | **Prevent cluster deletion**|**Type:** `boolean`
**Default:** `false`| + ### Metadata Properties within the `.metadata` top-level object @@ -197,7 +204,6 @@ Properties within the `.metadata` top-level object | `metadata.name` | **Cluster name** - Unique identifier, cannot be changed after creation.|**Type:** `string`
| | `metadata.organization` | **Organization**|**Type:** `string`
| | `metadata.servicePriority` | **Service priority** - The relative importance of this cluster.|**Type:** `string`
**Default:** `"highest"`| -| `metadata.preventDeletion` | **Prevent cluster deletion**|**Type:** `boolean`
**Default:** `false`| ### Node pools Properties within the `.nodePools` top-level object