Skip to content

Commit

Permalink
Merge pull request #950 from CecileRobertMichon/remove-bastion-status
Browse files Browse the repository at this point in the history 
💎 Remove unused AzureCluster bastion status field
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Sep 22, 2020
2 parents 0d347d9 + 4ea23fa commit 7612824
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 191 deletions.
2 changes: 0 additions & 2 deletions api/v1alpha2/azurecluster_conversion.go
View file
Expand Up @@ -59,8 +59,6 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error { // nolint
}

dst.Status.FailureDomains = restored.Status.FailureDomains
dst.Status.Bastion.OSDisk.DiffDiskSettings = restored.Status.Bastion.OSDisk.DiffDiskSettings
dst.Status.Bastion.OSDisk.CachingType = restored.Status.Bastion.OSDisk.CachingType

for _, restoredSubnet := range restored.Spec.NetworkSpec.Subnets {
if restoredSubnet != nil {
Expand Down
7 changes: 1 addition & 6 deletions api/v1alpha2/zz_generated.conversion.go
View file

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

2 changes: 0 additions & 2 deletions api/v1alpha3/azurecluster_types.go
View file
Expand Up @@ -62,8 +62,6 @@ type AzureClusterStatus struct {
// This list will be used by Cluster API to try and spread the machines across the failure domains.
FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`

Bastion VM `json:"bastion,omitempty"`

// Ready is true when the provider resource is ready.
// +optional
Ready bool `json:"ready"`
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha3/zz_generated.deepcopy.go
View file

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

180 changes: 0 additions & 180 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
View file
Expand Up @@ -610,186 +610,6 @@ spec:
status:
description: AzureClusterStatus defines the observed state of AzureCluster
properties:
bastion:
description: VM describes an Azure virtual machine.
properties:
addresses:
description: Addresses contains the addresses associated with
the Azure VM.
items:
description: NodeAddress contains information for the node's
address.
properties:
address:
description: The node address.
type: string
type:
description: Node address type, one of Hostname, ExternalIP
or InternalIP.
type: string
required:
- address
- type
type: object
type: array
availabilityZone:
type: string
id:
type: string
identity:
description: VMIdentity defines the identity of the virtual machine,
if configured.
enum:
- None
- SystemAssigned
- UserAssigned
type: string
image:
description: Storage profile
properties:
id:
description: ID specifies an image to use by ID
type: string
marketplace:
description: Marketplace specifies an image to use from the
Azure Marketplace
properties:
offer:
description: Offer specifies the name of a group of related
images created by the publisher. For example, UbuntuServer,
WindowsServer
minLength: 1
type: string
publisher:
description: Publisher is the name of the organization
that created the image
minLength: 1
type: string
sku:
description: SKU specifies an instance of an offer, such
as a major release of a distribution. For example, 18.04-LTS,
2019-Datacenter
minLength: 1
type: string
thirdPartyImage:
default: false
description: ThirdPartyImage indicates the image is published
by a third party publisher and a Plan will be generated
for it.
type: boolean
version:
description: Version specifies the version of an image
sku. The allowed formats are Major.Minor.Build or 'latest'.
Major, Minor, and Build are decimal numbers. Specify
'latest' to use the latest version of an image available
at deploy time. Even if you use 'latest', the VM image
will not automatically update after deploy time even
if a new version becomes available.
minLength: 1
type: string
required:
- offer
- publisher
- sku
- thirdPartyImage
- version
type: object
sharedGallery:
description: SharedGallery specifies an image to use from
an Azure Shared Image Gallery
properties:
gallery:
description: Gallery specifies the name of the shared
image gallery that contains the image
minLength: 1
type: string
name:
description: Name is the name of the image
minLength: 1
type: string
resourceGroup:
description: ResourceGroup specifies the resource group
containing the shared image gallery
minLength: 1
type: string
subscriptionID:
description: SubscriptionID is the identifier of the subscription
that contains the shared image gallery
minLength: 1
type: string
version:
description: Version specifies the version of the marketplace
image. The allowed formats are Major.Minor.Build or
'latest'. Major, Minor, and Build are decimal numbers.
Specify 'latest' to use the latest version of an image
available at deploy time. Even if you use 'latest',
the VM image will not automatically update after deploy
time even if a new version becomes available.
minLength: 1
type: string
required:
- gallery
- name
- resourceGroup
- subscriptionID
- version
type: object
type: object
name:
type: string
osDisk:
description: OSDisk defines the operating system disk for a VM.
properties:
cachingType:
type: string
diffDiskSettings:
description: DiffDiskSettings describe ephemeral disk settings
for the os disk.
properties:
option:
description: Option enables ephemeral OS when set to "Local"
See https://docs.microsoft.com/en-us/azure/virtual-machines/ephemeral-os-disks
for full details
enum:
- Local
type: string
required:
- option
type: object
diskSizeGB:
format: int32
type: integer
managedDisk:
description: ManagedDisk defines the managed disk options
for a VM.
properties:
storageAccountType:
type: string
required:
- storageAccountType
type: object
osType:
type: string
required:
- diskSizeGB
- managedDisk
- osType
type: object
startupScript:
type: string
tags:
additionalProperties:
type: string
description: Tags defines a map of tags.
type: object
vmSize:
description: Hardware profile
type: string
vmState:
description: State - The provisioning state, which only appears
in the response.
type: string
type: object
conditions:
description: Conditions defines current service state of the AzureCluster.
items:
Expand Down

0 comments on commit 7612824

Please sign in to comment.