Fix affinity group naming

vishesh92 commented 1 year ago

Issue #, if available: Fixes https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/240 Closes https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/239 Description of changes:

Separate naming scheme for KubeadmControlPlane & EtcdadmCluster. <cluster name>-<cluster uid>-<affinity type>Affinity-<owner kind>-<failure domain name>
Prefix generate affinity group name with <cluster name>-<cluster uid>-.
Use AffinityGroupRef to store information about the attached affinity group and use it prevent generation of a new affinity group in case the owner ref changes.

Testing performed:

Tested locally with a CloudStack setup.
Ran E2E tests.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

k8s-ci-robot commented 1 year ago

Hi @vishesh92. 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](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

netlify[bot] commented 1 year ago

Deploy Preview for kubernetes-sigs-cluster-api-cloudstack ready!

Name	Link
Latest commit	6d5708c99b2f26f4029841a4758f0fc9fcd807d1
Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-cloudstack/deploys/64a404fa0770e00008d17f1a
Deploy Preview	https://deploy-preview-286--kubernetes-sigs-cluster-api-cloudstack.netlify.app
Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

rohityadavcloud commented 1 year ago

/approve /ok-to-test

codecov-commenter commented 1 year ago

Codecov Report

Patch coverage: 12.50% and project coverage change: -0.12 :warning:

Comparison is base (5803cf3) 34.27% compared to head (6d5708c) 34.16%.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## main #286 +/- ## ========================================== - Coverage 34.27% 34.16% -0.12% ========================================== Files 43 43 Lines 3927 3940 +13 ========================================== Hits 1346 1346 - Misses 2397 2410 +13 Partials 184 184 ``` | [Impacted Files](https://app.codecov.io/gh/kubernetes-sigs/cluster-api-provider-cloudstack/pull/286?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kubernetes-sigs) | Coverage Δ | | |---|---|---| | [controllers/cloudstackmachine\_controller.go](https://app.codecov.io/gh/kubernetes-sigs/cluster-api-provider-cloudstack/pull/286?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kubernetes-sigs#diff-Y29udHJvbGxlcnMvY2xvdWRzdGFja21hY2hpbmVfY29udHJvbGxlci5nbw==) | `54.85% <12.50%> (-2.80%)` | :arrow_down: |

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Do you have feedback about the report comment? Let us know in this issue.

vishesh92 commented 1 year ago

/run-e2e -c 4.18

blueorangutan commented 1 year ago

@vishesh92 a jenkins job has been kicked to run test with following paramaters:

kubernetes version: 1.27.2
CloudStack version: 4.18
hypervisor: kvm
template: ubuntu-2004-kube
Kubernetes upgrade from: 1.26.5 to 1.27.2

blueorangutan commented 1 year ago

Test Results : (tid-263) Environment: kvm Rocky8(x3), Advanced Networking with Management Server Rocky8 Kubernetes Version: v1.27.2 Kubernetes Version upgrade from: v1.26.5 Kubernetes Version upgrade to: v1.27.2 CloudStack Version: 4.18 Template: ubuntu-2004-kube E2E Test Run Logs: https://github.com/blueorangutan/capc-prs/releases/download/capc-pr-ci-cd/capc-e2e-artifacts-pr286-sl-263.zip

[PASS] When testing MachineDeployment rolling upgrades Should successfully upgrade Machines upon changes in relevant MachineDeployment fields
[PASS] When testing affinity group Should have host affinity group when affinity is pro
[PASS] When testing affinity group Should have host affinity group when affinity is anti
[PASS] When testing app deployment to the workload cluster with network interruption [ToxiProxy] Should be able to create a cluster despite a network interruption during that process
[PASS] When testing K8S conformance [Conformance] Should create a workload cluster and run kubetest
[PASS] When testing app deployment to the workload cluster [TC1][PR-Blocking] Should be able to download an HTML from the app deployed to the workload cluster
[PASS] When the specified resource does not exist Should fail due to the specified account is not found [TC4a]
[PASS] When the specified resource does not exist Should fail due to the specified domain is not found [TC4b]
[PASS] When the specified resource does not exist Should fail due to the specified control plane offering is not found [TC7]
[PASS] When the specified resource does not exist Should fail due to the specified template is not found [TC6]
[PASS] When the specified resource does not exist Should fail due to the specified zone is not found [TC3]
[PASS] When the specified resource does not exist Should fail due to the specified disk offering is not found
[PASS] When the specified resource does not exist Should fail due to the compute resources are not sufficient for the specified offering [TC8]
[PASS] When the specified resource does not exist Should fail due to the specified disk offer is not customized but the disk size is specified
[PASS] When the specified resource does not exist Should fail due to the specified disk offer is customized but the disk size is not specified
[PASS] When the specified resource does not exist Should fail due to the public IP can not be found
[PASS] When the specified resource does not exist When starting with a healthy cluster Should fail to upgrade worker machine due to insufficient compute resources
[PASS] When the specified resource does not exist When starting with a healthy cluster Should fail to upgrade control plane machine due to insufficient compute resources
[PASS] When testing with custom disk offering Should successfully create a cluster with a custom disk offering
[PASS] When testing horizontal scale out/in [TC17][TC18][TC20][TC21] Should successfully scale machine replicas up and down horizontally
[PASS] When testing multiple CPs in a shared network with kubevip Should successfully create a cluster with multiple CPs in a shared network
[PASS] When testing with disk offering Should successfully create a cluster with disk offering
[PASS] When testing node drain timeout A node should be forcefully removed if it cannot be drained in time
[PASS] When testing Kubernetes version upgrades Should successfully upgrade kubernetes versions when there is a change in relevant fields
[PASS] When testing machine remediation Should replace a machine when it is destroyed
[PASS] with two clusters should successfully add and remove a second cluster without breaking the first cluster
[PASS] When testing subdomain Should create a cluster in a subdomain
[PASS] When testing app deployment to the workload cluster with slow network [ToxiProxy] Should be able to download an HTML from the app deployed to the workload cluster
[PASS] When testing resource cleanup Should create a new network when the specified network does not exist

Ran 28 of 29 Specs in 9187.945 seconds
SUCCESS! -- 28 Passed | 0 Failed | 0 Pending | 1 Skipped
PASS

weizhouapache commented 1 year ago

/hold please unhold after QA testing

weizhouapache commented 1 year ago

/lgtm

weizhouapache commented 1 year ago

/assign @vignesh-goutham

k8s-ci-robot commented 1 year ago

@weizhouapache: GitHub didn't allow me to assign the following users: vignesh-goutham.

Note that only kubernetes-sigs members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time. For more information please see the contributor guide

In response to [this](https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/pull/286#issuecomment-1623167032): >/assign @vignesh-goutham Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

rohityadavcloud commented 1 year ago

cc @vignesh-goutham I'll go ahead and merge, pl review/test if that meets your expections, thanks. /approve /lgtm

k8s-ci-robot commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kiranchavala, rohityadavcloud, vishesh92

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: - ~~[OWNERS](https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/blob/main/OWNERS)~~ [rohityadavcloud] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

rohityadavcloud commented 1 year ago

/unhold

kubernetes-sigs / cluster-api-provider-cloudstack