Skip to content

Commit

Permalink
Showing 54 changed files with 2,824 additions and 1,171 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -519,9 +519,9 @@ delete-cluster: delete-workload-cluster ## Deletes the example kind cluster "ca
kind delete cluster --name=capz

.PHONY: kind-reset
kind-reset: ## Destroys the "capz" kind cluster.
kind-reset: ## Destroys the "capz" and "capz-e2e" kind clusters.
kind delete cluster --name=capz || true

kind delete cluster --name=capz-e2e || true

## --------------------------------------
## Cleanup / Verification
7 changes: 2 additions & 5 deletions api/v1alpha2/azurecluster_conversion.go
Original file line number Diff line number Diff line change
@@ -74,6 +74,8 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error { // nolint
}
}

dst.Spec.NetworkSpec.APIServerLB = restored.Spec.NetworkSpec.APIServerLB

// Manually convert conditions
dst.SetConditions(restored.GetConditions())

@@ -162,11 +164,6 @@ func Convert_v1alpha3_AzureClusterStatus_To_v1alpha2_AzureClusterStatus(in *infr
return nil
}

// Convert_v1alpha2_Network_To_v1alpha3_Network.
func Convert_v1alpha2_Network_To_v1alpha3_Network(in *Network, out *infrav1alpha3.Network, s apiconversion.Scope) error { //nolint
return autoConvert_v1alpha2_Network_To_v1alpha3_Network(in, out, s)
}

// Convert_v1alpha2_NetworkSpec_To_v1alpha3_NetworkSpec.
func Convert_v1alpha2_NetworkSpec_To_v1alpha3_NetworkSpec(in *NetworkSpec, out *infrav1alpha3.NetworkSpec, s apiconversion.Scope) error { //nolint
if err := Convert_v1alpha2_VnetSpec_To_v1alpha3_VnetSpec(&in.Vnet, &out.Vnet, s); err != nil {
188 changes: 2 additions & 186 deletions api/v1alpha2/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2dfc5ea

Please sign in to comment.