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

fix(misc): contrib/terraform/aws #7818

Merged
merged 2 commits into from
Jul 23, 2021
Merged

fix(misc): contrib/terraform/aws #7818

merged 2 commits into from
Jul 23, 2021

Conversation

faust64
Copy link
Contributor

@faust64 faust64 commented Jul 22, 2021 •
edited
Loading

  • handles deployment with a single availability zone
  • handles deployment with more than two availability zone
  • handles etcd collocation with control-plane nodes (aws_etcd_num=0)
  • allows to set a bastion instances count (aws_bastion_num)
  • allows to set bastion/etcd/control-plane/workers rootfs volume size
  • removes variables from terraform.tfvars that were not re-used
  • adds .terraform.lock.hcl to .gitignore
  • changes/updates base image from ubuntu-18.03 to debian-10

What type of PR is this?
/kind feature

What this PR does / why we need it:
Removes confusing variables / not re-used, producing warnings
Allows to resize rootfs, as the default 8G is just not enough, even running small demos
Updates base image, as we shouldn't deploy new clusters on such an old OS, even running small demos
Allows collocating etcd with control planes, lowering costs, especially running small demos
Allows to set the bastion instances count
Allows to spread deployment over one AZ, or 3 and more (current only allows for 2)

Which issue(s) this PR fixes:

None that I know of

Special notes for your reviewer:

tested by a few coworkers of mine, and myself: thanks for the outstanding work, on both those terraform samples and kubespray playbooks.
I did not test ubuntu deployments, I could still swap from buster to focal. LMK.

Does this PR introduce a user-facing change?:

NONE

@faust64
fix(misc): terraform/aws
3ee92a1 
- handles deployment with a single availability zone
- handles deployment with more than two availability zone
- handles etcd collocation with control-plane nodes (`aws_etcd_num=0`)
- allows to set a bastion instances count (`aws_bastion_num`)
- allows to set bastion/etcd/control-plane/workers rootfs volume size
- removes variables from terraform.tfvars that were not re-used
- adds .terraform.lock.hcl to .gitignore
- changes/updates base image from ubuntu-18.03 to debian-10

tested by a few coworkers of mine, and myself: thanks for the outstanding
work, on both those terraform samples and kubespray playbooks.
I did not test ubuntu deployments, I could still swap from buster to
focal. LMK.
@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 22, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @faust64. 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 Jul 22, 2021
@k8s-ci-robot k8s-ci-robot requested review from holmsten and oomichi July 22, 2021 18:21
@faust64
fix(gitlab-ci)
a828ca1 
AFAIU, terraform.tfvars indentation should be fixed for / no diff
returned running `terraform fmt -check -diff`

https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/1445622114
floryut
floryut approved these changes Jul 23, 2021
View reviewed changes
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.

@faust64 Wow thank you for that, good work

@floryut
Copy link
Member

floryut commented Jul 23, 2021

/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 Jul 23, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jul 23, 2021
@oomichi
Copy link
Contributor

oomichi commented Jul 23, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2021
@k8s-ci-robot k8s-ci-robot merged commit bfebcfa into kubernetes-sigs:master Jul 23, 2021
Quehenr added a commit to Quehenr/unstable-laboratory-infrastructure-kubespray that referenced this pull request Aug 2, 2021
@Quehenr
Merge branch 'master' into feature/virtualbox
474597b 
* master: (23 commits)
  retry to fetch binary if it fails first time (kubernetes-sigs#7839)
  Update vSphere CPI (kubernetes-sigs#7838)
  doc: Update 'Kubespray vs Kubeadm' (kubernetes-sigs#7834)
  Update MetalLB documentation (kubernetes-sigs#7833)
  Disable OVH CI until  voucher situation is cleared up (kubernetes-sigs#7824)
  Fix how to get image ID on offline deployment (kubernetes-sigs#7808)
  CRI-O: Install libseccomp2 from backports on Debian 10 (kubernetes-sigs#7816)
  fix(misc): contrib/terraform/aws (kubernetes-sigs#7818)
  Separate gvisor_download_url for runsc and shim (kubernetes-sigs#7760)
  Allow failure on tf-elax_ubuntu18-calico (kubernetes-sigs#7814)
  Add containerd on Flatcar Container Linux (kubernetes-sigs#7681)
  Fixup label for oracle linux bootstrap
  Update multus to 3.7.2 (and move to ghcr.io)
  Set default k8s version to 1.21.3
  Add hashes for k8s 1.20.8/.9 and 1.19.12/.13 and 1.21.3
  Fix erroneous ansible args
  Update kube-router to 1.3.0
  Update flannel to 0.14.0 (moved from coreos repo to flannel-io)
  Use dashboard 2.3.1 image
  Set Helm default version to 3.6.3
  ...
@oomichi oomichi mentioned this pull request Sep 13, 2021
Merged
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 23, 2021
@faust64 @LuckySB
fix(misc): contrib/terraform/aws (kubernetes-sigs#7818)
0f3d391 
* fix(misc): terraform/aws

- handles deployment with a single availability zone
- handles deployment with more than two availability zone
- handles etcd collocation with control-plane nodes (`aws_etcd_num=0`)
- allows to set a bastion instances count (`aws_bastion_num`)
- allows to set bastion/etcd/control-plane/workers rootfs volume size
- removes variables from terraform.tfvars that were not re-used
- adds .terraform.lock.hcl to .gitignore
- changes/updates base image from ubuntu-18.03 to debian-10

tested by a few coworkers of mine, and myself: thanks for the outstanding
work, on both those terraform samples and kubespray playbooks.
I did not test ubuntu deployments, I could still swap from buster to
focal. LMK.

* fix(gitlab-ci)

AFAIU, terraform.tfvars indentation should be fixed for / no diff
returned running `terraform fmt -check -diff`

https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/1445622114
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
@faust64 @sakuraiyuta
fix(misc): contrib/terraform/aws (kubernetes-sigs#7818)
76e59e6 
* fix(misc): terraform/aws

- handles deployment with a single availability zone
- handles deployment with more than two availability zone
- handles etcd collocation with control-plane nodes (`aws_etcd_num=0`)
- allows to set a bastion instances count (`aws_bastion_num`)
- allows to set bastion/etcd/control-plane/workers rootfs volume size
- removes variables from terraform.tfvars that were not re-used
- adds .terraform.lock.hcl to .gitignore
- changes/updates base image from ubuntu-18.03 to debian-10

tested by a few coworkers of mine, and myself: thanks for the outstanding
work, on both those terraform samples and kubespray playbooks.
I did not test ubuntu deployments, I could still swap from buster to
focal. LMK.

* fix(gitlab-ci)

AFAIU, terraform.tfvars indentation should be fixed for / no diff
returned running `terraform fmt -check -diff`

https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/1445622114
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@holmsten holmsten Awaiting requested review from holmsten

@oomichi oomichi Awaiting requested review from oomichi

Assignees

@oomichi oomichi

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/feature Categorizes issue or PR as related to a new feature. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@faust64 @k8s-ci-robot @floryut @oomichi