Skip to content

Commit

Permalink
Merge pull request #1781 from CecileRobertMichon/audit-api
Browse files Browse the repository at this point in the history
Audit API to follow CAPI conventions
  • Loading branch information
k8s-ci-robot authored Oct 27, 2021
2 parents b25ac49 + 11b01ea commit ea83f00
Show file tree
Hide file tree
Showing 16 changed files with 164 additions and 213 deletions.
58 changes: 0 additions & 58 deletions api/v1alpha3/zz_generated.conversion.go

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

58 changes: 0 additions & 58 deletions api/v1alpha4/zz_generated.conversion.go

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

4 changes: 3 additions & 1 deletion api/v1beta1/azurecluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const (
// AzureClusterSpec defines the desired state of AzureCluster.
type AzureClusterSpec struct {
// NetworkSpec encapsulates all things related to Azure network.
// +optional
NetworkSpec NetworkSpec `json:"networkSpec,omitempty"`

// +optional
Expand All @@ -46,7 +47,7 @@ type AzureClusterSpec struct {

// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
// +optional
ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint,omitempty"`

// AdditionalTags is an optional set of tags to add to Azure resources managed by the Azure provider, in addition to the
// ones added by default.
Expand Down Expand Up @@ -87,6 +88,7 @@ type AzureClusterStatus struct {
// the cluster is more resilient to failure.
// See: https://docs.microsoft.com/en-us/azure/availability-zones/az-overview
// This list will be used by Cluster API to try and spread the machines across the failure domains.
// +optional
FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`

// Ready is true when the provider resource is ready.
Expand Down
3 changes: 3 additions & 0 deletions api/v1beta1/azuremachine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type AzureMachineSpec struct {

// FailureDomain is the failure domain unique identifier this Machine should be attached to,
// as defined in Cluster API. This relates to an Azure Availability Zone
// +optional
FailureDomain *string `json:"failureDomain,omitempty"`

// Image is used to provide details of an image to use during VM creation.
Expand Down Expand Up @@ -74,6 +75,7 @@ type AzureMachineSpec struct {
OSDisk OSDisk `json:"osDisk"`

// DataDisk specifies the parameters that are used to add one or more data disks to the machine
// +optional
DataDisks []DataDisk `json:"dataDisks,omitempty"`

SSHPublicKey string `json:"sshPublicKey"`
Expand Down Expand Up @@ -128,6 +130,7 @@ type AzureMachineStatus struct {
Ready bool `json:"ready"`

// Addresses contains the Azure instance associated addresses.
// +optional
Addresses []v1.NodeAddress `json:"addresses,omitempty"`

// VMState is the provisioning state of the Azure virtual machine.
Expand Down
Loading

0 comments on commit ea83f00

Please sign in to comment.