feat: Add support for CAPX #384

deepakm-ntnx · 2024-02-20T19:25:18Z

to regenerate example Cluster with topology yamls

 make examples.sync

To run unit tests

 make test

To deploy cre controller as well as nutanix provider and cluster class of nutanix

make dev.run-on-kind

To deploy nutanix cluster with topology with cre annotations

export KUBECONFIG=/go/src/github.com/deepakm-ntnx/capi-runtime-extensions/.local/kind/capi-runtime-extensions-dev/kubeconfig
clusterctl generate cluster nutanix-quick-start-helm-addon-cilium \
  --from examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml \
  --kubernetes-version v1.29.1 \
  --worker-machine-count 1 | \
  kubectl apply --server-side -f -

New clusterctl version available: v1.6.1 -> v1.6.2
sigs.k8s.io/cluster-api
Warning: Cluster refers to ClusterClass test-cre in the topology but it does not exist. Cluster topology has not been fully validated. The ClusterClass must be created to reconcile the Cluster
cluster.cluster.x-k8s.io/nutanix-quick-start-helm-addon-cilium serverside-applied

api/v1alpha1/nutanix_clusterconfig_types.go

cmd/main.go

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

hack/examples/bases/nutanix/calico/crs/kustomization.yaml.tmpl

api/v1alpha1/nutanix_clusterconfig_types.go

api/v1alpha1/constants.go

thunderboltsid · 2024-02-27T15:30:46Z

charts/capi-runtime-extensions/defaultclusterclasses/nutanix-cluster-class.yaml

+        postKubeadmCommands:
+          - echo export KUBECONFIG=/etc/kubernetes/admin.conf >> /root/.bashrc
+          - echo "after kubeadm call" > /var/log/postkubeadm.log
+        preKubeadmCommands:
+          - echo "before kubeadm call" > /var/log/prekubeadm.log
+          - hostnamectl set-hostname "{{ ds.meta_data.hostname }}"


This might have to be modified to accommodate 1.29 nutanix-cloud-native/cluster-api-provider-nutanix#382

currently we are using alpha1 version. if we cut alpha2, then latest changes will show up

handled in d2iq-labs#6

thunderboltsid · 2024-02-27T15:32:26Z

charts/capi-runtime-extensions/defaultclusterclasses/nutanix-cluster-class.yaml

+metadata:
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-nutanix
+  name: ${CLUSTER_NAME}-kcfg-0


nit: I know this is the same as the original template but why do we append a -0 on this particular resource and not others?

this is autogenerated, lets fix it in the main code if needed

thunderboltsid · 2024-02-27T15:37:13Z

charts/capi-runtime-extensions/defaultclusterclasses/nutanix-cluster-class.yaml

+  namespace: ${NAMESPACE}
+spec:
+  template:
+    spec:


We should ideally also add:

project

additionalCategories

opus

assuming you mean GPUs. yes we need to figure out how to add required vs optional fields so that user can choose either way. this can be added in subsequent PRs

dkoshkin · 2024-03-15T20:09:50Z

api/v1alpha1/clusterconfig_types.go

@@ -40,6 +40,8 @@ type ClusterConfigSpec struct {
 	AWS *AWSSpec `json:"aws,omitempty"`
 	// +optional
 	Docker *DockerSpec `json:"docker,omitempty"`
+	// +optional
+	Nutanix *NutanixSpec `json:"nutanix,omitempty"`


To make the reviewing easier what do you think about opening a PR with just API changes for only the required input?

dkoshkin · 2024-03-15T20:10:58Z

api/v1alpha1/nutanix_node_types.go

+	SystemDiskSize string `json:"systemDiskSize"`
+
+	// List of GPU devices that need to be added to the machines.
+	GPUs []NutanixGPU `json:"gpus,omitempty"`


Maybe the GPU API should be added later after testing just a basic cluster?

charts/capi-runtime-extensions/templates/clusterclass_nutanix.yaml

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

hack/examples/bases/nutanix/calico/crs/kustomization.yaml.tmpl

hack/examples/bases/nutanix/cilium/crs/kustomization.yaml.tmpl

jimmidyson · 2024-03-19T13:03:55Z

I noticed conflicts so I rebased this and fixed up (force pushed) @deepakm-ntnx. Please pull latest changes locally.

jimmidyson · 2024-03-19T17:30:30Z

Fixed up conflicts again after repo rename.

kept for newly added files only

…sync.sh disabled for nutanix till we find a better solution for e2e

deepakm-ntnx · 2024-03-21T22:35:01Z

closing as due to rename moved to https://github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pull/6/files

deepakm-ntnx marked this pull request as draft February 20, 2024 19:25

deepakm-ntnx changed the title ~~[WIP] added nutanix support~~ feat[WIP] added nutanix support Feb 21, 2024

deepakm-ntnx changed the title ~~feat[WIP] added nutanix support~~ feat: Add support for CAPX Feb 21, 2024

github-actions bot added feature and removed feature labels Feb 21, 2024

deepakm-ntnx force-pushed the KRBN-8015 branch from 8f23f92 to 193c178 Compare February 22, 2024 19:48

dkoshkin reviewed Feb 26, 2024

View reviewed changes

thunderboltsid reviewed Feb 27, 2024

View reviewed changes

api/v1alpha1/constants.go Outdated Show resolved Hide resolved

thunderboltsid reviewed Feb 27, 2024

View reviewed changes

github-actions bot added feature and removed feature labels Feb 27, 2024

deepakm-ntnx force-pushed the KRBN-8015 branch from 63c80b2 to ef21b87 Compare March 1, 2024 18:05

github-actions bot added feature and removed feature labels Mar 5, 2024

deepakm-ntnx force-pushed the KRBN-8015 branch from 78aad65 to 3d4f108 Compare March 5, 2024 17:22

github-actions bot added feature and removed feature labels Mar 5, 2024

deepakm-ntnx mentioned this pull request Mar 12, 2024

Update kustomization.yaml files to new format nutanix-cloud-native/cluster-api-provider-nutanix#387

Merged

deepakm-ntnx force-pushed the KRBN-8015 branch from f5a7fb8 to 2b31e29 Compare March 14, 2024 18:38

dkoshkin reviewed Mar 15, 2024

View reviewed changes

jimmidyson force-pushed the KRBN-8015 branch from 444bf36 to 9955adb Compare March 19, 2024 13:02

jimmidyson force-pushed the KRBN-8015 branch from c22b9e2 to 76e2b92 Compare March 19, 2024 17:30

[WIP] added nutanix support

94451f1

deepakm-ntnx added 25 commits March 20, 2024 14:47

review comments fixes

1138b9f

patches

358610b

updated latest final yaml

33d79c5

updated yaml with faultDomain

aed4b42

WIP added all the types as a placeholder to share across team members

a2c80fb

added cluster config variables

d5390bd

reverted year update in copyright for existing files

2113e27

kept for newly added files only

test fixes

72fb2e8

added prism central endpoint mutation

324c075

updated prism central endpoint mutation

3d5f6f0

added machine details mutation

7fb8d15

added nutanix into charts to install clusterclass

14732dd

need to add double $ sign in bases so that var remains in example yaml

b637285

using a dev build yaml. todo revert url of the yaml

28835b7

now updated examples with latest state for completeness

24653fa

make lint fixes

47da896

now able to apply nutanix cluster with topology with cre validating it

ded0d20

removed temp file

0c9b408

now using clusterctl.yaml vars so that its easy to fill in values

e415d46

updated paths to new branch due to stackked PR related changes

4a9c7e0

fixed examples.sync

c422e2f

reorg of examples kustomize yamls

9c532c4

fixed the naming of all the objects which was getting overriden thru …

62e86e8

…sync.sh disabled for nutanix till we find a better solution for e2e

now added subnet settings in cre

a3b6a9c

fixed NPE

7688d3e

deepakm-ntnx force-pushed the KRBN-8015 branch from 76e2b92 to 7688d3e Compare March 20, 2024 21:55

Merge branch 'nutanix-cloud-native:main' into KRBN-8015

ec87ae3

deepakm-ntnx mentioned this pull request Mar 21, 2024

feat: Add support for CAPX d2iq-labs/cluster-api-runtime-extensions-nutanix#6

Merged

deepakm-ntnx closed this Mar 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add support for CAPX #384

feat: Add support for CAPX #384

deepakm-ntnx commented Feb 20, 2024 •

edited

Loading

thunderboltsid Feb 27, 2024

deepakm-ntnx Feb 27, 2024

deepakm-ntnx Mar 27, 2024

thunderboltsid Feb 27, 2024

deepakm-ntnx Feb 27, 2024

thunderboltsid Feb 27, 2024

deepakm-ntnx Feb 27, 2024 •

edited

Loading

dkoshkin Mar 15, 2024

dkoshkin Mar 15, 2024

jimmidyson commented Mar 19, 2024

jimmidyson commented Mar 19, 2024

deepakm-ntnx commented Mar 21, 2024

feat: Add support for CAPX #384

feat: Add support for CAPX #384

Conversation

deepakm-ntnx commented Feb 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deepakm-ntnx Feb 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jimmidyson commented Mar 19, 2024

jimmidyson commented Mar 19, 2024

deepakm-ntnx commented Mar 21, 2024

deepakm-ntnx commented Feb 20, 2024 •

edited

Loading

deepakm-ntnx Feb 27, 2024 •

edited

Loading