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

Fixes various issues in vSphere Terraform code #8178

Merged
merged 4 commits into from
Nov 12, 2021
Merged

Fixes various issues in vSphere Terraform code #8178

merged 4 commits into from
Nov 12, 2021

Conversation

llarsson
Copy link
Contributor

@llarsson llarsson commented Nov 10, 2021

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug

/kind cleanup

/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it: fixes hardcoded in the Terraform code for vSphere, which caused configured variables to be ignored.

Which issue(s) this PR fixes:

Fixes #8176

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

[vSphere] Terraform code now documents and requires specification of the OVF template to use and separate specification of the netmask to use.

Provided to address various shortcomings and to fix the following
issue in upstream Kubespray:

#8176
@k8s-ci-robot k8s-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Nov 10, 2021
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


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.

@k8s-ci-robot
Copy link
Contributor

Welcome @llarsson!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 10, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @llarsson. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 10, 2021
@llarsson
Copy link
Contributor Author

Commenting here in the hopes of having the company's CLA show up correctly. 😄

Also, the pipeline has failed, but the failing build step seems to be fine and also the artifact is empty?

@llarsson
Copy link
Contributor Author

@bozzo and/or @oomichi: please help me understand where to go from here, given that the pipeline failure does not provide me with any useful information as far as I can see. 🤔

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 10, 2021
@floryut
Copy link
Member

floryut commented Nov 10, 2021

@bozzo and/or @oomichi: please help me understand where to go from here, given that the pipeline failure does not provide me with any useful information as far as I can see. 🤔

fmt 😉

$ terraform -chdir="contrib/terraform/$PROVIDER" fmt -check -diff
default.tfvars
--- old/default.tfvars
+++ new/default.tfvars
@@ -8,17 +8,17 @@
   "master-0" : {
     "node_type" : "master",
     "ip" : "i-did-not-read-the-docs", # e.g. 192.168.0.10
-    "netmask": "24"
+    "netmask" : "24"
   },
   "worker-0" : {
     "node_type" : "worker",
     "ip" : "i-did-not-read-the-docs", # e.g. 192.168.0.20
-    "netmask": "24"
+    "netmask" : "24"
   },
   "worker-1" : {
     "node_type" : "worker",
     "ip" : "i-did-not-read-the-docs", # e.g. 192.168.0.21
-    "netmask": "24"
+    "netmask" : "24"
   }
 }

Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

Yes, you are right.
It is necessary to fix the format as https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/1768111609

contrib/terraform/vsphere/default.tfvars Outdated Show resolved Hide resolved
contrib/terraform/vsphere/default.tfvars Outdated Show resolved Hide resolved
contrib/terraform/vsphere/default.tfvars Outdated Show resolved Hide resolved
@llarsson
Copy link
Contributor Author

Embarrassing that formatting was all it took. The pipeline seems to fail in a rather unexpected way, to me. Is the failing step really vSphere related?

@oomichi
Copy link
Contributor

oomichi commented Nov 11, 2021

Embarrassing that formatting was all it took. The pipeline seems to fail in a rather unexpected way, to me. Is the failing step really vSphere related?

Yeah, the failure is unrelated and the pipeline is kicked again.
Let's see the result.

/ok-to-test

@k8s-ci-robot k8s-ci-robot 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 Nov 11, 2021
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

@llarsson Thanks for the PR ! Please check @oomichi comments and then we'll merge 👍

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, llarsson

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 12, 2021
@oomichi
Copy link
Contributor

oomichi commented Nov 12, 2021

Thanks for updating again.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit 6eeb488 into kubernetes-sigs:master Nov 12, 2021
@floryut floryut added kind/applications Applications section in the release note and removed kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Nov 15, 2021
@floryut floryut mentioned this pull request Dec 21, 2021
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
* Fixes various issues in vSphere Terraform code

Provided to address various shortcomings and to fix the following
issue in upstream Kubespray:

kubernetes-sigs#8176

* Resolves Terraform formatting issues

* Sets default prefix to human-readable name

* Documents new default prefix in README
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 28, 2023
* Fixes various issues in vSphere Terraform code

Provided to address various shortcomings and to fix the following
issue in upstream Kubespray:

kubernetes-sigs#8176

* Resolves Terraform formatting issues

* Sets default prefix to human-readable name

* Documents new default prefix in README
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/applications Applications section in the release note lgtm "Looks good to me", 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix various problems with hardcoded values in the vSphere Terraform code
4 participants