Skip to content

Upgrade cluster-api to v1.9.6 #427

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

Merged
merged 5 commits into from
Mar 24, 2025

Conversation

vishesh92
Copy link
Member

Issue #, if available:
Fixes #420
Description of changes:
Followed t he changes mentioned in the CAPI documentation and some changes other minor changes to make it compatible with latest version of CAPI.
https://cluster-api.sigs.k8s.io/developer/providers/migrations/v1.6-to-v1.7
https://cluster-api.sigs.k8s.io/developer/providers/migrations/v1.7-to-v1.8
https://cluster-api.sigs.k8s.io/developer/providers/migrations/v1.8-to-v1.9

Copilot generated summary

This pull request includes various updates and improvements across multiple files, focusing on configuration changes, dependency updates, and code refactoring. Below is a summary of the most important changes:

Configuration Updates

  • .golangci.yml: Removed skip-dirs and added tests: false under run, and moved excluded directories to exclude-dirs under issues. [1] [2]

Dependency Updates

  • Makefile: Updated the go mod tidy command to use compatibility version 1.22 instead of 1.21.

Code Refactoring

Documentation and Metadata Updates

These changes collectively enhance the configuration management, update dependencies to newer versions, and improve code readability and maintainability.

Testing performed:

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
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 22, 2025
Copy link

netlify bot commented Mar 22, 2025

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

Name Link
🔨 Latest commit 2dcac77
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-cloudstack/deploys/67deee1d762369000833c667
😎 Deploy Preview https://deploy-preview-427--kubernetes-sigs-cluster-api-cloudstack.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@codecov-commenter
Copy link

codecov-commenter commented Mar 22, 2025

Codecov Report

Attention: Patch coverage is 80.35714% with 22 lines in your changes missing coverage. Please review.

Project coverage is 26.98%. Comparing base (d597e80) to head (2dcac77).
Report is 84 commits behind head on main.

Files with missing lines Patch % Lines
pkg/cloud/instance.go 66.66% 13 Missing ⚠️
controllers/cloudstackmachine_controller.go 87.27% 5 Missing and 2 partials ⚠️
pkg/cloud/isolated_network.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #427      +/-   ##
==========================================
+ Coverage   25.66%   26.98%   +1.31%     
==========================================
  Files          59       72      +13     
  Lines        5563     6838    +1275     
==========================================
+ Hits         1428     1845     +417     
- Misses       3996     4832     +836     
- Partials      139      161      +22     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@blueorangutan
Copy link

Test Results : (tid-654)
Environment: kvm Rocky8(x3), Advanced Networking with Management Server Rocky8
Kubernetes Version: v1.31.6
Kubernetes Version upgrade from: v1.30.10
Kubernetes Version upgrade to: v1.31.6
CloudStack Version: 4.20
Template: ubuntu-2404-kube
E2E Test Run Logs: https://github.com/blueorangutan/capc-prs/releases/download/capc-pr-ci-cd/capc-e2e-artifacts-pr427-sl-654.zip



Summarizing 6 Failures:
 [FAIL] When the specified resource does not exist [It] Should fail due to the specified zone is not found [TC3]
 /jenkins/workspace/capc-e2e-new/test/e2e/invalid_resource.go:253
 [FAIL] When the specified resource does not exist When starting with a healthy cluster [It] Should fail to upgrade control plane machine due to insufficient compute resources
 /jenkins/workspace/capc-e2e-new/test/e2e/invalid_resource.go:253
 [FAIL] When testing clusters in a VPC network [It] Should successfully create a cluster in a VPC network
 /root/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/cluster_helpers.go:147
 [FAIL] When testing affinity group [It] Should have host affinity group when affinity is pro
 /jenkins/workspace/capc-e2e-new/test/e2e/common.go:359
 [FAIL] When testing resource cleanup [AfterEach] Should create a new network when the specified network does not exist
 /jenkins/workspace/capc-e2e-new/test/e2e/resource_cleanup.go:101
 [FAIL] When testing node drain timeout [It] A node should be forcefully removed if it cannot be drained in time
 /root/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/deployment_helpers.go:542

Ran 31 of 32 Specs in 9593.971 seconds
FAIL! -- 25 Passed | 6 Failed | 0 Pending | 1 Skipped
--- FAIL: TestE2E (9593.97s)
FAIL

@vishesh92 vishesh92 requested review from rohityadavcloud and weizhouapache and removed request for jweite-amazon March 24, 2025 09:17
@vishesh92 vishesh92 closed this Mar 24, 2025
@vishesh92 vishesh92 reopened this Mar 24, 2025
@weizhouapache weizhouapache changed the title Upgrade capi Upgrade cluster-api to v1.9.6 Mar 24, 2025
@kubernetes-sigs kubernetes-sigs deleted a comment from blueorangutan Mar 24, 2025
@weizhouapache
Copy link
Collaborator

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 24, 2025
@k8s-ci-robot k8s-ci-robot merged commit 1b229ac into kubernetes-sigs:main Mar 24, 2025
11 checks passed
@vishesh92 vishesh92 deleted the upgrade-capi branch March 24, 2025 18:40
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate to CAPI 1.9
5 participants