support param masters in cce cluster #885
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ShiChangkuo
reviewed
Jan 30, 2021
docs/resources/cce_cluster.md
Outdated
| @@ -145,6 +145,12 @@ versions are available, choose Dashboard > Buy Cluster on the CCE console. Chang | |||
|
|
|||
| * `enterprise_project_id` - (Optional, String, ForceNew) The enterprise project id of the cce cluster. Changing this creates a new cluster. | |||
|
|
|||
| * `masters` - (Optional, List, ForceNew) Advanced configuration of master nodes. Changing this creates a new cluster. Conflicts with `multi_az`. | |||
There was a problem hiding this comment.
seems masters and multi_az have the same logical function, so please put them together.
docs/resources/cce_cluster.md
Outdated
| @@ -134,7 +134,7 @@ versions are available, choose Dashboard > Buy Cluster on the CCE console. Chang | |||
| * `authenticating_proxy_ca` - (Optional, String, ForceNew) CA root certificate provided in the authenticating_proxy mode. The CA root certificate | |||
| is encoded to the Base64 format. Changing this parameter will create a new cluster resource. | |||
|
|
|||
| * `multi_az` - (Optional, Bool, ForceNew) Enable multiple AZs for the cluster, only when using HA flavors. Changing this parameter will create a new cluster resource. | |||
| * `multi_az` - (Optional, Bool, ForceNew) Enable multiple AZs for the cluster, only when using HA flavors. Changing this parameter will create a new cluster resource. Conflicts with `masters`. | |||
There was a problem hiding this comment.
two small tips:
- if the paramter conflicts with others, please use the following template:
This parameter andxxxare alternative. - In code style guides, maximum line length rules are often set to 100 or 120.
| func resourceClusterMastersV3(d *schema.ResourceData) ([]clusters.MasterSpec, error) { | ||
| flavorId := d.Get("flavor_id").(string) | ||
| mastersRaw := d.Get("masters").([]interface{}) | ||
| if strings.Split(flavorId, ".")[1] == "s1" && len(mastersRaw) != 1 { |
There was a problem hiding this comment.
seems the flavor likes cce.dec.s1.small does not applicable.
| return []clusters.MasterSpec{}, fmt.Errorf("Error creating HuaweiCloud Cluster: single-master cluster need 1 az for master node, but got %d", len(mastersRaw)) | ||
| } | ||
| if strings.Split(flavorId, ".")[1] == "s2" && len(mastersRaw) != 3 { | ||
| return []clusters.MasterSpec{}, fmt.Errorf("Error creating HuaweiCloud Cluster: high-availability cluster need 3 az for master nodes, but got %d", len(mastersRaw)) |
There was a problem hiding this comment.
it's better to return nil, error when the validation failed.
Jason-Zhang9309
force-pushed
the
dev-cce-cluster
branch
from
d793cb7 to
b6ee54e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Test result:
make testacc TEST='./huaweicloud' TESTARGS='-run TestAccCCEClusterV3_basic'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run TestAccCCEClusterV3_basic -timeout 360m -parallel 4
=== RUN TestAccCCEClusterV3_basic
=== PAUSE TestAccCCEClusterV3_basic
=== CONT TestAccCCEClusterV3_basic
--- PASS: TestAccCCEClusterV3_basic (422.07s)
PASS
ok github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud 422.138s