Add a provision for handling image based bootstrap #406

yanhua121 · 2024-04-05T17:43:14Z

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. This can be done using the BootstrapRef property of the NutanixMachine spec.

apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixMachine
metadata:
  name: machine-name
  namespace: cluster-namespace
spec:
  ...
  bootstrapRef:
    kind: Image
    name: cluster-bootstrap.iso

config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml

deepakm-ntnx · 2024-04-05T17:51:54Z

pls add unit-test and e2e tests (tracker if want to do it in separate PR) to verify

api/v1beta1/nutanixmachine_types.go

controllers/nutanixmachine_controller.go

api/v1beta1/nutanixmachine_types.go

thunderboltsid

we need to solve this more generically than we are in this change.

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.

codecov · 2024-04-09T20:54:08Z

Codecov Report

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

Project coverage is 25.07%. Comparing base (92800d9) to head (4d05296).

Files	Patch %	Lines
controllers/nutanixmachine_controller.go	0.00%	53 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #406      +/-   ##
==========================================
- Coverage   25.63%   25.07%   -0.56%     
==========================================
  Files          19       19              
  Lines        1303     1332      +29     
==========================================
  Hits          334      334              
- Misses        969      998      +29

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

thunderboltsid · 2024-04-09T22:16:23Z

/retest

thunderboltsid · 2024-04-09T23:14:02Z

/test e2e-capx-controller-upgrade

yanhua121

LGTM. The code changes look good to me. And my local integration test using this branch with the OCP installer passed.

controllers/nutanixmachine_controller.go

deepakm-ntnx

can we document the yaml input for review as well

thunderboltsid

/lgtm
/approve

nutanix-cn-prow-bot · 2024-04-11T21:54:10Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deepakm-ntnx, dkoshkin, thunderboltsid, yanhua121

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~~ [deepakm-ntnx,thunderboltsid]

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

* 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 <[email protected]>

* 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: Yanhua Li <[email protected]>

* 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 <[email protected]>

* Ensure fallback config is only read when prismCentral is absent (#403) Skip reading fallback config file from /etc/nutanix/config/prismCentral if NutanixCluster has prismCentral set. Co-authored-by: Sid Shukla <[email protected]> * Add a provision for handling image based bootstrap (#406) * 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 <[email protected]> * Introduce a nutanix prism client cache (#415) * 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 * Update CAPI version in go.mod 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 --------- Co-authored-by: Deepak Muley <[email protected]> Co-authored-by: Yanhua Li <[email protected]>

nutanix-cn-prow-bot bot requested review from adiantum and yannickstruyf3 April 5, 2024 17:43

deepakm-ntnx reviewed Apr 5, 2024

View reviewed changes

config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml Outdated Show resolved Hide resolved

deepakm-ntnx reviewed Apr 5, 2024

View reviewed changes

config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml Outdated Show resolved Hide resolved

dkoshkin reviewed Apr 5, 2024

View reviewed changes

api/v1beta1/nutanixmachine_types.go Outdated Show resolved Hide resolved

controllers/nutanixmachine_controller.go Outdated Show resolved Hide resolved

thunderboltsid reviewed Apr 5, 2024

View reviewed changes

api/v1beta1/nutanixmachine_types.go Outdated Show resolved Hide resolved

thunderboltsid requested changes Apr 5, 2024

View reviewed changes

yanhua121 force-pushed the jira/krbn-8115 branch from 3858cf9 to d13fcc7 Compare April 8, 2024 15:37

yanhua121 force-pushed the jira/krbn-8120 branch from 79d1b48 to 0f922e5 Compare April 8, 2024 17:11

thunderboltsid force-pushed the jira/krbn-8115 branch from d13fcc7 to 6af6baa Compare April 9, 2024 15:38

thunderboltsid force-pushed the jira/krbn-8120 branch from 0f922e5 to 34a0d6c Compare April 9, 2024 16:56

thunderboltsid changed the title ~~Fix KRBN-8120: add optional field bootstrapImageName to NutanixMachine~~ Add a provision for handling image based bootstrap Apr 9, 2024

thunderboltsid requested review from thunderboltsid, dkoshkin and deepakm-ntnx April 9, 2024 16:57

thunderboltsid force-pushed the jira/krbn-8120 branch from 34a0d6c to 102a0c3 Compare April 9, 2024 17:03

Base automatically changed from jira/krbn-8115 to main April 9, 2024 20:10

Add a provision for handling image based bootstrap

7c89fa0

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.

thunderboltsid force-pushed the jira/krbn-8120 branch from 102a0c3 to 84df35f Compare April 9, 2024 20:25

Only set guestcustomization explicitly when bootstrap ref is secret

70b6909

thunderboltsid force-pushed the jira/krbn-8120 branch from 84df35f to 70b6909 Compare April 9, 2024 20:41

Use lowercase for data_source_reference kind.

4d05296

yanhua121 commented Apr 10, 2024

View reviewed changes

deepakm-ntnx reviewed Apr 10, 2024

View reviewed changes

controllers/nutanixmachine_controller.go Show resolved Hide resolved

deepakm-ntnx reviewed Apr 10, 2024

View reviewed changes

yanhua121 self-assigned this Apr 10, 2024

yanhua121 removed their assignment Apr 10, 2024

thunderboltsid requested a review from deepakm-ntnx April 11, 2024 21:34

deepakm-ntnx approved these changes Apr 11, 2024

View reviewed changes

dkoshkin approved these changes Apr 11, 2024

View reviewed changes

thunderboltsid approved these changes Apr 11, 2024

View reviewed changes

nutanix-cn-prow-bot bot assigned thunderboltsid Apr 11, 2024

nutanix-cn-prow-bot bot added the lgtm label Apr 11, 2024

nutanix-cn-prow-bot bot added the approved label Apr 11, 2024

thunderboltsid merged commit 25ba78f into main Apr 11, 2024
10 of 13 checks passed

thunderboltsid deleted the jira/krbn-8120 branch April 11, 2024 22:07

thunderboltsid mentioned this pull request Apr 11, 2024

Cherry-pick PR #406 to release-v1.3 #411

Merged

thunderboltsid mentioned this pull request May 7, 2024

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a provision for handling image based bootstrap #406

Add a provision for handling image based bootstrap #406

yanhua121 commented Apr 5, 2024 •

edited by thunderboltsid

Loading

deepakm-ntnx commented Apr 5, 2024

thunderboltsid left a comment

codecov bot commented Apr 9, 2024 •

edited

Loading

thunderboltsid commented Apr 9, 2024

thunderboltsid commented Apr 9, 2024

yanhua121 left a comment

deepakm-ntnx left a comment

thunderboltsid left a comment

nutanix-cn-prow-bot bot commented Apr 11, 2024

Add a provision for handling image based bootstrap #406

Add a provision for handling image based bootstrap #406

Conversation

yanhua121 commented Apr 5, 2024 • edited by thunderboltsid Loading

deepakm-ntnx commented Apr 5, 2024

thunderboltsid left a comment

Choose a reason for hiding this comment

codecov bot commented Apr 9, 2024 • edited Loading

Codecov Report

thunderboltsid commented Apr 9, 2024

thunderboltsid commented Apr 9, 2024

yanhua121 left a comment

Choose a reason for hiding this comment

deepakm-ntnx left a comment

Choose a reason for hiding this comment

thunderboltsid left a comment

Choose a reason for hiding this comment

nutanix-cn-prow-bot bot commented Apr 11, 2024

yanhua121 commented Apr 5, 2024 •

edited by thunderboltsid

Loading

codecov bot commented Apr 9, 2024 •

edited

Loading