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

Cherry-pick PR #403, #406, and #415 to release-v1.2 #430

Merged
merged 4 commits into from
May 8, 2024
Merged

Cherry-pick PR #403, #406, and #415 to release-v1.2 #430

merged 4 commits into from
May 8, 2024

Conversation

thunderboltsid
Copy link
Contributor

@thunderboltsid thunderboltsid commented May 7, 2024 •
edited
Loading

Cherry-Pick Details

The changes also include changes to build files and dependencies that allow us to get builds working in this release train with the new changes.

deepakm-ntnx and others added 3 commits May 6, 2024 20:50
@deepakm-ntnx @thunderboltsid
Ensure fallback config is only read when prismCentral is absent (#403)
5decb6e 
Skip reading fallback config file from /etc/nutanix/config/prismCentral
if NutanixCluster has prismCentral set.

Co-authored-by: Sid Shukla <sid.shukla@nutanix.com>
@yanhua121 @thunderboltsid
Add a provision for handling image based bootstrap (#406)
f67953b 
* Add a provision for handling image based bootstrap

AHV has a limit of 32KB for cloud-init userdata. In Openshift, the
ignition can be rather large (a magnitude over the limit). In
order to support larger userdata files, we allow mounting the customization
as an image.

* Only set guestcustomization explicitly when bootstrap ref is secret

* Use lowercase for data_source_reference kind.

---------

Co-authored-by: Sid Shukla <sid.shukla@nutanix.com>
@thunderboltsid
Introduce a nutanix prism client cache (#415)
36bea0e 
* Introduce a nutanix prism client cache

The cache stores a prismgoclient.V3 client instance for each NutanixCluster instance.
The cache is shared between nutanixcluster and nutanixmachine controllers.

* Address review comments
@thunderboltsid thunderboltsid mentioned this pull request May 7, 2024
Closed
@codecov Codecov
Copy link

codecov bot commented May 7, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 25.58140% with 96 lines in your changes are missing coverage. Please review.

Project coverage is 10.03%. Comparing base (52f3f8c) to head (119ad64).

Files Patch % Lines
controllers/nutanixmachine_controller.go 0.00% 70 Missing ⚠️
controllers/helpers.go 46.66% 16 Missing ⚠️
controllers/nutanixcluster_controller.go 62.50% 6 Missing ⚠️
pkg/context/context.go 0.00% 4 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff                @@
##           release-v1.2     #430      +/-   ##
================================================
+ Coverage          9.62%   10.03%   +0.40%     
================================================
  Files                10       22      +12     
  Lines              1340     2053     +713     
================================================
+ Hits                129      206      +77     
- Misses             1211     1847     +636

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

@thunderboltsid
Copy link
Contributor Author

/retest

@thunderboltsid thunderboltsid requested review from adiantum and dkoshkin and removed request for tuxtof May 7, 2024 14:52
@thunderboltsid
Copy link
Contributor Author

/test e2e-nutanix-features

1 similar comment
@thunderboltsid
Copy link
Contributor Author

/test e2e-nutanix-features

@thunderboltsid
Copy link
Contributor Author

thunderboltsid commented May 7, 2024 •
edited
Loading

@thunderboltsid: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-nutanix-features d879fcc link true /test e2e-nutanix-features
Full PR test history. Your PR dashboard.

Seems the PE user credentials had to be rotated

@thunderboltsid thunderboltsid force-pushed the jira/krbn-8098 branch 2 times, most recently from c675871 to 0e29ccb Compare May 7, 2024 20:59
@thunderboltsid
Update CAPI version in go.mod
119ad64 
This is to ensure newer versions of interfaces from SharedIndexInformers
don't cause compile failures.

Update go version to v1.22 becasue cmp.Or is only available in go v1.22

update prism-go-client
@thunderboltsid
Copy link
Contributor Author

/retest

adiantum
adiantum approved these changes May 8, 2024
View reviewed changes
Copy link
Contributor

@adiantum adiantum left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@nutanix-cn-prow-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adiantum, thunderboltsid

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 [adiantum,thunderboltsid]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@thunderboltsid thunderboltsid merged commit 73eb73d into release-v1.2 May 8, 2024
7 of 10 checks passed
@thunderboltsid thunderboltsid deleted the jira/krbn-8098 branch May 8, 2024 21:26
@thunderboltsid thunderboltsid changed the title Cherry-pick PR #4013, #406, and #415 to release-v1.2 Cherry-pick PR #403, #406, and #415 to release-v1.2 May 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepakm-ntnx deepakm-ntnx deepakm-ntnx approved these changes

@adiantum adiantum adiantum approved these changes

@dkoshkin dkoshkin Awaiting requested review from dkoshkin

Assignees

@adiantum adiantum

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@thunderboltsid @adiantum @deepakm-ntnx @yanhua121