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

Set nonzero default control plane node count in templates #4660

Merged

Conversation

nawazkh
Copy link
Member

@nawazkh nawazkh commented Mar 20, 2024

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

  • This PR adds defaults to the control plane count and worker count to all the templates.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #4656

Special notes for your reviewer:

  • I have split the PR into commits for the ease of review.
  • I have only addressed updating WORKER_MACHINE_COUNT and CONTROL_PLANE_MACHINE_COUNT. Other variables have not been defaulted for maintainability reason.
  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 20, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 20, 2024
@nawazkh
Copy link
Member Author

nawazkh commented Mar 20, 2024

/cc @dtzar

@k8s-ci-robot k8s-ci-robot requested a review from dtzar March 20, 2024 18:28
Copy link

codecov bot commented Mar 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.73%. Comparing base (4c8a05f) to head (b8f15c3).
Report is 16 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4660   +/-   ##
=======================================
  Coverage   62.73%   62.73%           
=======================================
  Files         192      192           
  Lines       15644    15644           
=======================================
  Hits         9815     9815           
  Misses       5146     5146           
  Partials      683      683           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mboersma
Copy link
Contributor

/retest

fatal: unable to access 'https://github.com/kubernetes-sigs/cluster-api-provider-azure.git/': Recv failure: Connection reset by peer

@jackfrancis
Copy link
Contributor

/test pull-cluster-api-provider-azure-e2e-optional

@jackfrancis
Copy link
Contributor

@nawazkh after the optional E2E scenarios test runs, could you kindly squash commits and add more detail to commit message and PR title (like "ensure reference templates have default replica count values" or something...)

Thanks!

- update worker machine count in the templates
@nawazkh nawazkh force-pushed the set_defaults_to_templates branch from 81ea095 to b8f15c3 Compare March 21, 2024 20:42
@nawazkh
Copy link
Member Author

nawazkh commented Mar 21, 2024

/test pull-cluster-api-provider-azure-e2e-optional

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/retitle Set nonzero default control plane node count in templates

@k8s-ci-robot k8s-ci-robot changed the title Set default counts Set nonzero default control plane node count in templates Mar 22, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 22, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e2423335209323830a64aef16b29b0650cbcbdce

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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 Mar 26, 2024
@k8s-ci-robot k8s-ci-robot merged commit 8be2ad2 into kubernetes-sigs:main Mar 26, 2024
28 checks passed
@mboersma
Copy link
Contributor

/cherrypick release-1.14

@mboersma
Copy link
Contributor

/cherrypick release-1.13

@k8s-infra-cherrypick-robot

@mboersma: new pull request created: #4684

In response to this:

/cherrypick release-1.14

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-infra-cherrypick-robot

@mboersma: #4660 failed to apply on top of branch "release-1.13":

Applying: update control plane machine count
Using index info to reconstruct a base tree...
M	templates/cluster-template-aks.yaml
M	templates/flavors/aks/cluster-template.yaml
M	templates/test/ci/cluster-template-prow-aks.yaml
A	templates/test/ci/cluster-template-prow-spot.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml
CONFLICT (content): Merge conflict in test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml
Auto-merging templates/test/ci/cluster-template-prow-aks.yaml
Auto-merging templates/flavors/aks/cluster-template.yaml
Auto-merging templates/cluster-template-aks.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update control plane machine count
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.13

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.

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Set default ENV variables for clusterctl templates
6 participants