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

Jump to bottom

Alibaba: fix: remove the default value #5410

Merged
merged 1 commit into from Dec 3, 2021
Merged

Alibaba: fix: remove the default value #5410

merged 1 commit into from Dec 3, 2021

Conversation

bd233
Copy link
Contributor

@bd233 bd233 commented Nov 23, 2021

Remove the default value in terraform variables, because the root module
and tfvars file should always be explicitly supplying a value.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 23, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 23, 2021

Hi @bd233. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bd233 bd233 mentioned this pull request Nov 24, 2021
Merged
staebler
staebler reviewed Nov 24, 2021
View reviewed changes
data/data/alibabacloud/cluster/master/variables.tf Outdated
@@ -43,7 +43,6 @@ variable "system_disk_size" {
variable "system_disk_category" {
type = string
description = "The system disk category of the master ECS.Valid values are cloud_efficiency, cloud_ssd, cloud_essd. Default value is cloud_essd."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description = "The system disk category of the master ECS.Valid values are cloud_efficiency, cloud_ssd, cloud_essd. Default value is cloud_essd."
description = "The system disk category of the master ECS. Valid values are cloud_efficiency, cloud_ssd, cloud_essd."

data/data/alibabacloud/variables-alibabacloud.tf Outdated
@@ -48,7 +48,6 @@ variable "ali_system_disk_size" {
variable "ali_system_disk_category" {
type = string
description = "The system disk category of the master ECS.Valid values are cloud_efficiency, cloud_ssd, cloud_essd. Default value is cloud_essd."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description = "The system disk category of the master ECS.Valid values are cloud_efficiency, cloud_ssd, cloud_essd. Default value is cloud_essd."
description = "The system disk category of the master ECS. Valid values are cloud_efficiency, cloud_ssd, cloud_essd."

data/data/alibabacloud/variables-alibabacloud.tf
@@ -59,7 +58,6 @@ variable "ali_extra_tags" {

Example: `{ "key" = "value", "foo" = "bar" }`
EOF
default = {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this default also requires removing the omitempty from the field in the tfvars struct.

installer/pkg/tfvars/alibabacloud/alibabacloud.go

Line 30 in c1c9b61

ExtraTags map[string]string `json:"ali_extra_tags,omitempty"`

@bd233
Alibaba: fix: remove the default value
3625389 
Remove the default value in terraform variables, because the root module
and tfvars file should always be  explicitly supplying a value.

Signed-off-by: sunhui <wb-sh373163@alibaba-inc.com>
@bd233
Copy link
Contributor Author

bd233 commented Nov 26, 2021

@staebler Have updated.

staebler
staebler reviewed Nov 29, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 29, 2021
@staebler staebler mentioned this pull request Nov 29, 2021
Merged
@kwoodson
Copy link
Contributor

kwoodson commented Dec 2, 2021

This is pretty straightforward.
/ok-to-test
/lgtm

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 2, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2021 •
edited

@bd233: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-ovirt 3625389 link false /test e2e-ovirt
ci/prow/e2e-aws-single-node 3625389 link false /test e2e-aws-single-node
ci/prow/e2e-crc 3625389 link false /test e2e-crc
ci/prow/e2e-aws-workers-rhel7 3625389 link false /test e2e-aws-workers-rhel7

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit c7b5045 into openshift:master Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@staebler staebler staebler left review comments

@jstuever jstuever Awaiting requested review from jstuever

@rna-afk rna-afk Awaiting requested review from rna-afk

Assignees

@kwoodson kwoodson

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bd233 @kwoodson @openshift-bot @staebler @openshift-merge-robot