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.

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 provider versions constraint for GCP and Aliyun and support values file customization for tidb-operator and tidb-cluster #959

Merged
merged 4 commits into from
Sep 29, 2019

Conversation

DanielZhangQD
Copy link
Contributor

What problem does this PR solve?

fix #958

What is changed and how does it work?

Add version constraint for providers.
Modify terraform scripts to support values customization for tidb-operator and tidb-cluster.

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    • terraform init does not prompt for version constraint any more
    • tidb-operator can be customized with specific values.yaml
    • tidb-cluster can be customized with specific values.yaml

Code changes

  • Has terraform scripts change
  • Has documents change

Side effects

NONE

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Does this PR introduce a user-facing change?:

tidb-operator and tidb-cluster can be deployed with customized values.yaml correctly.

@DanielZhangQD
Copy link
Contributor Author

/run-e2e-in-kind

@@ -50,7 +50,7 @@ module "tidb-operator" {
kubeconfig_path = local.kubeconfig
tidb_operator_version = var.tidb_operator_version
maintenance_window_start_time = var.maintenance_window_start_time
operator_helm_values = var.operator_helm_values
operator_helm_values = var.operator_helm_values == "" ? "" : file(var.operator_helm_values)
Copy link
Contributor

Choose a reason for hiding this comment

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

inline yaml values is sometimes convenient, short and no external file required. How about adding a new variable for file support?

operator_helm_values = <<EOF
operatorImage: quay.io/cofyc/tidb-operator:canary
imagePullPolicy: Always
EOF

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I thought it was designed for external values file, will revert the change.

@DanielZhangQD
Copy link
Contributor Author

@cofyc @aylei PTAL again, revert the change for values customization and just keep the version constraint.

@DanielZhangQD
Copy link
Contributor Author

/run-e2e-in-kind

@DanielZhangQD DanielZhangQD changed the title Add provider versions and fix tidb-operator and tidb-cluster customization issue on GCP Add provider versions constraint for GCP and Aliyun Sep 27, 2019
cofyc
cofyc previously approved these changes Sep 27, 2019
Copy link
Contributor

@cofyc cofyc left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD
Copy link
Contributor Author

@cofyc @aylei @jlerche PTAL again, add new variables for customized values file for tidb-operator and tidb-cluster.

@DanielZhangQD
Copy link
Contributor Author

/run-e2e-in-kind

@DanielZhangQD DanielZhangQD changed the title Add provider versions constraint for GCP and Aliyun Add provider versions constraint for GCP and Aliyun and support values file customization for tidb-operator and tidb-cluster Sep 29, 2019
@DanielZhangQD
Copy link
Contributor Author

/run-e2e-in-kind

Copy link
Contributor

@cofyc cofyc left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD
Copy link
Contributor Author

/run-e2e-in-kind

Copy link
Contributor

@aylei aylei left a comment

Choose a reason for hiding this comment

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

LGTM
Please fix the CI

@DanielZhangQD
Copy link
Contributor Author

@aylei CI passed, PTAL again.

Copy link
Contributor

@aylei aylei left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD DanielZhangQD merged commit 04a8549 into pingcap:master Sep 29, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Sep 29, 2019

cherry pick to release-1.0 failed

DanielZhangQD added a commit that referenced this pull request Sep 29, 2019
…P and Aliyun (#967)

* add provider version constraint for GCP and Aliyun

* Support customized values file for tidb-operator and tidb-cluster
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/bug Something isn't working
Projects
None yet
4 participants