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

added template modifications for uuid in machineconfig #4283

Merged
merged 13 commits into from
Dec 6, 2022
Merged

added template modifications for uuid in machineconfig #4283

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c448004
added template modifications for uuid in machineconfig
deepakm-ntnx Dec 1, 2022
f5e59b7
added test e2e changes related to passing id type
deepakm-ntnx Dec 6, 2022
f23b655
more fixes and enable tests to pass uuid
deepakm-ntnx Dec 6, 2022
cdca221
fixed the template format
deepakm-ntnx Dec 6, 2022
7d0addd
fixed template
deepakm-ntnx Dec 6, 2022
3411278
fixed the uuid key which is passed to capx
deepakm-ntnx Dec 6, 2022
6b00e40
now not setting id type in test e2e. will be added thru separately
deepakm-ntnx Dec 6, 2022
516c278
fixed lint issue
deepakm-ntnx Dec 6, 2022
c541b56
remove setting of uuid in default name case
deepakm-ntnx Dec 6, 2022
2412a79
added uuid simple flow test. disabled till uuid is populated in ci env
deepakm-ntnx Dec 6, 2022
328b955
enabled uuid tests in ci
deepakm-ntnx Dec 6, 2022
c52e2a1
appeased the lint god
deepakm-ntnx Dec 6, 2022
cdcc59e
incorporated review comments
deepakm-ntnx Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ env:
T_NUTANIX_MACHINE_MEMORY_SIZE: "4Gi"
T_NUTANIX_SYSTEMDISK_SIZE: "40Gi"
T_NUTANIX_INSECURE: true
T_NUTANIX_MACHINE_TEMPLATE_ID_TYPE: "name"
T_NUTANIX_PRISM_ELEMENT_CLUSTER_ID_TYPE: "name"
T_NUTANIX_SUBNET_ID_TYPE: "name"
secrets-manager:
EKSA_VSPHERE_USERNAME: "vsphere_ci_beta_connection:vsphere_username"
EKSA_VSPHERE_PASSWORD: "vsphere_ci_beta_connection:vsphere_password"
Expand Down Expand Up @@ -70,16 +73,22 @@ env:
T_NUTANIX_PORT: "nutanix_ci:nutanix_port"
T_NUTANIX_MACHINE_BOOT_TYPE: "nutanix_ci:nutanix_machine_boot_type"
T_NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: "nutanix_ci:nutanix_prism_element_cluster_name"
# T_NUTANIX_PRISM_ELEMENT_CLUSTER_UUID: "nutanix_ci:nutanix_prism_element_cluster_uuid"
T_NUTANIX_SSH_AUTHORIZED_KEY: "nutanix_ci:nutanix_ssh_authorized_key"
T_NUTANIX_SUBNET_NAME: "nutanix_ci:nutanix_subnet_name"
# T_NUTANIX_SUBNET_UUID: "nutanix_ci:nutanix_subnet_uuid"
T_NUTANIX_CONTROL_PLANE_CIDR: "nutanix_ci:nutanix_control_plane_cidr"
T_NUTANIX_POD_CIDR: "nutanix_ci:nutanix_pod_cidr"
T_NUTANIX_SERVICE_CIDR: "nutanix_ci:nutanix_service_cidr"
T_NUTANIX_ADDITIONAL_TRUST_BUNDLE: "nutanix_ci:nutanix_additional_trust_bundle"
T_NUTANIX_TEMPLATE_UBUNTU_1_21: "nutanix_ci:nutanix_template_ubuntu_1_21"
T_NUTANIX_TEMPLATE_UBUNTU_1_22: "nutanix_ci:nutanix_template_ubuntu_1_22"
T_NUTANIX_TEMPLATE_UBUNTU_1_23: "nutanix_ci:nutanix_template_ubuntu_1_23"
T_NUTANIX_TEMPLATE_UBUNTU_1_24: "nutanix_ci:nutanix_template_ubuntu_1_24"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_21: "nutanix_ci:nutanix_template_ubuntu_1_21"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_22: "nutanix_ci:nutanix_template_ubuntu_1_22"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_23: "nutanix_ci:nutanix_template_ubuntu_1_23"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_24: "nutanix_ci:nutanix_template_ubuntu_1_24"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_21: "nutanix_ci:nutanix_template_uuid_ubuntu_1_21"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_22: "nutanix_ci:nutanix_template_uuid_ubuntu_1_22"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_23: "nutanix_ci:nutanix_template_uuid_ubuntu_1_23"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_24: "nutanix_ci:nutanix_template_uuid_ubuntu_1_24"
phases:
pre_build:
commands:
Expand Down
9 changes: 9 additions & 0 deletions cmd/integration_test/build/buildspecs/test-eks-a-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ env:
T_NUTANIX_MACHINE_MEMORY_SIZE: "4Gi"
T_NUTANIX_SYSTEMDISK_SIZE: "40Gi"
T_NUTANIX_INSECURE: true
T_NUTANIX_MACHINE_TEMPLATE_ID_TYPE: "name"
T_NUTANIX_PRISM_ELEMENT_CLUSTER_ID_TYPE: "name"
T_NUTANIX_SUBNET_ID_TYPE: "name"
secrets-manager:
EKSA_VSPHERE_USERNAME: "vsphere_ci_beta_connection:vsphere_username"
EKSA_VSPHERE_PASSWORD: "vsphere_ci_beta_connection:vsphere_password"
Expand Down Expand Up @@ -121,8 +124,10 @@ env:
T_NUTANIX_PORT: "nutanix_ci:nutanix_port"
T_NUTANIX_MACHINE_BOOT_TYPE: "nutanix_ci:nutanix_machine_boot_type"
T_NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: "nutanix_ci:nutanix_prism_element_cluster_name"
# T_NUTANIX_PRISM_ELEMENT_CLUSTER_UUID: "nutanix_ci:nutanix_prism_element_cluster_uuid"
T_NUTANIX_SSH_AUTHORIZED_KEY: "nutanix_ci:nutanix_ssh_authorized_key"
T_NUTANIX_SUBNET_NAME: "nutanix_ci:nutanix_subnet_name"
# T_NUTANIX_SUBNET_UUID: "nutanix_ci:nutanix_subnet_uuid"
T_NUTANIX_CONTROL_PLANE_CIDR: "nutanix_ci:nutanix_control_plane_cidr"
T_NUTANIX_POD_CIDR: "nutanix_ci:nutanix_pod_cidr"
T_NUTANIX_SERVICE_CIDR: "nutanix_ci:nutanix_service_cidr"
Expand All @@ -131,6 +136,10 @@ env:
T_NUTANIX_TEMPLATE_UBUNTU_1_22: "nutanix_ci:nutanix_template_ubuntu_1_22"
T_NUTANIX_TEMPLATE_UBUNTU_1_23: "nutanix_ci:nutanix_template_ubuntu_1_23"
T_NUTANIX_TEMPLATE_UBUNTU_1_24: "nutanix_ci:nutanix_template_ubuntu_1_24"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_21: "nutanix_ci:nutanix_template_uuid_ubuntu_1_21"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_22: "nutanix_ci:nutanix_template_uuid_ubuntu_1_22"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_23: "nutanix_ci:nutanix_template_uuid_ubuntu_1_23"
# T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_24: "nutanix_ci:nutanix_template_uuid_ubuntu_1_24"
phases:
pre_build:
commands:
Expand Down
4 changes: 4 additions & 0 deletions pkg/api/v1alpha1/nutanixmachineconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import (
// NutanixIdentifierType is an enumeration of different resource identifier types.
type NutanixIdentifierType string

func (c NutanixIdentifierType) String() string {
return string(c)
}

const (
// NutanixMachineConfigKind is the kind for a NutanixMachineConfig.
NutanixMachineConfigKind = "NutanixMachineConfig"
Expand Down
15 changes: 15 additions & 0 deletions pkg/providers/nutanix/config/cp-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,26 @@ spec:
memorySize: {{.memorySize}}
systemDiskSize: {{.systemDiskSize}}
image:
{{- if (eq .imageIDType "name") }}
type: name
name: "{{.imageName}}"
{{ else if (eq .imageIDType "uuid") }}
type: uuid
name: "{{.imageUUID}}"
{{ end }}
cluster:
{{- if (eq .imageIDType "name") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
type: name
name: "{{.nutanixPEClusterName}}"
{{- else if (eq .imageIDType "uuid") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
type: uuid
name: "{{.nutanixPEClusterUUID}}"
{{ end }}
subnet:
{{- if (eq .imageIDType "name") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
- type: name
name: "{{.subnetName}}"
{{- else if (eq .imageIDType "uuid") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
- type: uuid
name: "{{.subnetUUID}}"
{{ end }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
15 changes: 15 additions & 0 deletions pkg/providers/nutanix/config/md-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,29 @@ spec:
memorySize: {{.memorySize}}
systemDiskSize: {{.systemDiskSize}}
image:
{{- if (eq .imageIDType "name") }}
type: name
name: "{{.imageName}}"
{{ else if (eq .imageIDType "uuid") }}
type: uuid
name: "{{.imageUUID}}"
{{ end }}
cluster:
{{- if (eq .imageIDType "name") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
type: name
name: "{{.nutanixPEClusterName}}"
{{- else if (eq .imageIDType "uuid") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
type: uuid
name: "{{.nutanixPEClusterUUID}}"
{{ end }}
subnet:
{{- if (eq .imageIDType "name") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
- type: name
name: "{{.subnetName}}"
{{- else if (eq .imageIDType "uuid") }}
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
- type: uuid
name: "{{.subnetUUID}}"
{{ end }}
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
Expand Down
24 changes: 18 additions & 6 deletions pkg/providers/nutanix/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,15 @@ func buildTemplateMapCP(
"vcpuSockets": controlPlaneMachineSpec.VCPUSockets,
"memorySize": controlPlaneMachineSpec.MemorySize.String(),
"systemDiskSize": controlPlaneMachineSpec.SystemDiskSize.String(),
"imageName": controlPlaneMachineSpec.Image.Name, // TODO(nutanix): pass name or uuid based on type of identifier
"nutanixPEClusterName": controlPlaneMachineSpec.Cluster.Name, // TODO(nutanix): pass name or uuid based on type of identifier
"subnetName": controlPlaneMachineSpec.Subnet.Name, // TODO(nutanix): pass name or uuid based on type of identifier
"imageIDType": controlPlaneMachineSpec.Image.Type,
"imageName": controlPlaneMachineSpec.Image.Name,
"imageUUID": controlPlaneMachineSpec.Image.UUID,
"nutanixPEClusterIDType": controlPlaneMachineSpec.Cluster.Type,
"nutanixPEClusterName": controlPlaneMachineSpec.Cluster.Name,
"nutanixPEClusterUUID": controlPlaneMachineSpec.Cluster.UUID,
"subnetIDType": controlPlaneMachineSpec.Subnet.Type,
"subnetName": controlPlaneMachineSpec.Subnet.Name,
"subnetUUID": controlPlaneMachineSpec.Subnet.UUID,
}

if clusterSpec.Cluster.Spec.ExternalEtcdConfiguration != nil {
Expand Down Expand Up @@ -185,9 +191,15 @@ func buildTemplateMapMD(clusterSpec *cluster.Spec, workerNodeGroupMachineSpec v1
"vcpuSockets": workerNodeGroupMachineSpec.VCPUSockets,
"memorySize": workerNodeGroupMachineSpec.MemorySize.String(),
"systemDiskSize": workerNodeGroupMachineSpec.SystemDiskSize.String(),
"imageName": workerNodeGroupMachineSpec.Image.Name, // TODO(nutanix): pass name or uuid based on type of identifier
"nutanixPEClusterName": workerNodeGroupMachineSpec.Cluster.Name, // TODO(nutanix): pass name or uuid based on type of identifier
"subnetName": workerNodeGroupMachineSpec.Subnet.Name, // TODO(nutanix): pass name or uuid based on type of identifier
"imageIDType": workerNodeGroupMachineSpec.Image.Type,
"imageName": workerNodeGroupMachineSpec.Image.Name,
"imageUUID": workerNodeGroupMachineSpec.Image.UUID,
"nutanixPEClusterIDType": workerNodeGroupMachineSpec.Cluster.Type,
"nutanixPEClusterName": workerNodeGroupMachineSpec.Cluster.Name,
"nutanixPEClusterUUID": workerNodeGroupMachineSpec.Cluster.UUID,
"subnetIDType": workerNodeGroupMachineSpec.Subnet.Type,
"subnetName": workerNodeGroupMachineSpec.Subnet.Name,
"subnetUUID": workerNodeGroupMachineSpec.Subnet.UUID,
"workerNodeGroupName": fmt.Sprintf("%s-%s", clusterSpec.Cluster.Name, workerNodeGroupConfiguration.Name),
}
return values
Expand Down
26 changes: 21 additions & 5 deletions test/e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,32 @@ The format is: `T_VSPHERE_TEMPLATE_{OS}_{EKS-D VERSION}`. For example, for Ubunt
T_NUTANIX_SYSTEMDISK_SIZE
T_NUTANIX_MACHINE_VCPU_PER_SOCKET
T_NUTANIX_MACHINE_VCPU_SOCKET

T_NUTANIX_PRISM_ELEMENT_CLUSTER_ID_TYPE # uuid or name
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
T_NUTANIX_PRISM_ELEMENT_CLUSTER_NAME
T_NUTANIX_SSH_AUTHORIZED_KEY
T_NUTANIX_PRISM_ELEMENT_CLUSTER_UUID

T_NUTANIX_SUBNET_ID_TYPE # uuid or name
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved
T_NUTANIX_SUBNET_NAME
T_NUTANIX_SUBNET_UUID

T_NUTANIX_SSH_AUTHORIZED_KEY
T_NUTANIX_CONTROL_PLANE_ENDPOINT_IP
T_NUTANIX_POD_CIDR
T_NUTANIX_SERVICE_CIDR
T_NUTANIX_TEMPLATE_UBUNTU_1_21
T_NUTANIX_TEMPLATE_UBUNTU_1_22
T_NUTANIX_TEMPLATE_UBUNTU_1_23
T_NUTANIX_TEMPLATE_UBUNTU_1_24

T_NUTANIX_MACHINE_TEMPLATE_ID_TYPE # uuid or name
deepakm-ntnx marked this conversation as resolved.
Show resolved Hide resolved

T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_21
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_22
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_23
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_24

T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_21
T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_22
T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_23
T_NUTANIX_TEMPLATE_UUID_UBUNTU_1_24

```
## Tinkerbell tests requisites
The following env variables need to be set:
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ func TestNutanixKubernetes121To122UbuntuUpgrade(t *testing.T) {
test,
v1alpha1.Kube122,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube122)),
provider.WithProviderUpgrade(framework.UpdateNutanixUbuntuTemplate122Var()),
provider.WithProviderUpgrade(framework.GetUbuntu122NutanixFillers()...),
)
}

Expand All @@ -822,7 +822,7 @@ func TestNutanixKubernetes122To123UbuntuUpgrade(t *testing.T) {
test,
v1alpha1.Kube123,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)),
provider.WithProviderUpgrade(framework.UpdateNutanixUbuntuTemplate123Var()),
provider.WithProviderUpgrade(framework.GetUbuntu123NutanixFillers()...),
)
}

Expand All @@ -839,7 +839,7 @@ func TestNutanixKubernetes123To124UbuntuUpgrade(t *testing.T) {
test,
v1alpha1.Kube124,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)),
provider.WithProviderUpgrade(framework.UpdateNutanixUbuntuTemplate124Var()),
provider.WithProviderUpgrade(framework.GetUbuntu124NutanixFillers()...),
)
}

Expand Down
Loading