Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add default value of min_cpu_platform #161

Merged
merged 3 commits into from
Feb 26, 2024
Merged

add default value of min_cpu_platform #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d92c3fb
use req.HostId instead of req.UHostId when waiting host to shut down …
wangrzneu Feb 1, 2024
a3356c2
Merge branch 'ucloud:master' into master
wangrzneu Feb 26, 2024
91e9cfc
add default value of min_cpu_platform
wangrzneu Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ucloud/resource_ucloud_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ func resourceUCloudInstance() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: "Intel/Auto",
},

"cpu_platform": {
Expand Down
1 change: 1 addition & 0 deletions ucloud/resource_ucloud_uk8s_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ func resourceUCloudUK8SCluster() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: "Intel/Auto",
ValidateFunc: validation.StringInSlice([]string{
"Intel/Auto",
"Intel/IvyBridge",
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ The following arguments are supported:

* `network_interface` - (Optional, ForceNew) Additional network interface eips to attach to the instance. `network_interface` configurations only apply on resource creation. The count of `network_interface` can only be one. See [network_interface](#network_interface) below for details on attributes. When set `network_interface`, the argument `delete_eips_with_instance` must bet set.
* `delete_eips_with_instance` - (Optional, ForceNew, Required when set `network_interface`) Whether the network interface eips associated instance should be destroyed on instance termination.
* `min_cpu_platform` - (Optional) Specifies a minimum CPU platform for the the VM instance. (Default: `Intel/Auto`). You may refer to [product documentation](https://docs.ucloud.cn/uhost/introduction/uhost/type_new) and [API documentation](https://docs.ucloud.cn/api/uhost-api/create_uhost_instance).
* `min_cpu_platform` - (Optional, ForceNew) Specifies a minimum CPU platform for the the VM instance. (Default: `Intel/Auto`). You may refer to [product documentation](https://docs.ucloud.cn/uhost/introduction/uhost/type_new) and [API documentation](https://docs.ucloud.cn/api/uhost-api/create_uhost_instance).
### data_disks

The `data_disks` supports the following:
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/uk8s_node.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ The following arguments are supported:
~> **NOTE:** We recommend set `delete_disks_with_instance` to `true` means delete cloud data disks attached to instance when instance termination. Otherwise, the cloud data disks will be not managed by the terraform after instance termination.

* `disable_schedule_on_create` - (Optional, ForceNew) Whether disable any pod scheduling on the node is created.
* `min_cpu_platform` - (Optional) Specifies a minimum CPU platform for the VM instance. (Default: `Intel/Auto`). You may refer to [min_cpu_platform](https://docs.ucloud.cn/uhost/introduction/uhost/type_new)
* `min_cpu_platform` - (Optional, ForceNew) Specifies a minimum CPU platform for the VM instance. (Default: `Intel/Auto`). You may refer to [min_cpu_platform](https://docs.ucloud.cn/uhost/introduction/uhost/type_new)
- The Intel CPU platform:
- `Intel/Auto` as the Intel CPU platform version will be selected randomly by system;
- `Intel/IvyBridge` as Intel V2, the version of Intel CPU platform selected by system will be `Intel/IvyBridge` and above;
Expand Down
Loading