Skip to content

Commit

Permalink
Update upstream cluster-api-provider-azure version from v1.3.2 to v1.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@nprokopic
nprokopic committed Dec 17, 2022
1 parent 322b252 commit 6bc8c21
Show file tree
Hide file tree
Showing 14 changed files with 319 additions and 13 deletions.
2 changes: 1 addition & 1 deletion config/helm/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ transformers:
- webhook-prefix.yaml

images:
- name: us.gcr.io/k8s-artifacts-prod/cluster-api-azure/cluster-api-azure-controller
- name: registry.k8s.io/cluster-api-azure/cluster-api-azure-controller
newName: "{{.Values.image.registry}}/{{.Values.image.name}}"
newTag: "{{.Values.image.tag}}"

Expand Down
6 changes: 5 additions & 1 deletion .../files/infrastructure/bases/azuremanagedmachinepools.infrastructure.cluster.x-k8s.io.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ spec:
storage: false
subresources:
status: {}
- name: v1beta1
- additionalPrinterColumns:
- jsonPath: .spec.mode
name: Mode
type: string
name: v1beta1
schema: {}
served: true
storage: true
Expand Down
2 changes: 1 addition & 1 deletion .../patches/versions/v1alpha3/azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
- calico
type: string
nodeResourceGroupName:
description: NodeResourceGroupName is the name of the resource group containining cluster IaaS resources. Will be populated to default in webhook.
description: NodeResourceGroupName is the name of the resource group containing cluster IaaS resources. Will be populated to default in webhook.
type: string
resourceGroupName:
description: ResourceGroupName is the name of the Azure resource group for this AKS Cluster.
Expand Down
2 changes: 1 addition & 1 deletion .../patches/versions/v1alpha4/azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
- calico
type: string
nodeResourceGroupName:
description: NodeResourceGroupName is the name of the resource group containining cluster IaaS resources. Will be populated to default in webhook.
description: NodeResourceGroupName is the name of the resource group containing cluster IaaS resources. Will be populated to default in webhook.
type: string
resourceGroupName:
description: ResourceGroupName is the name of the Azure resource group for this AKS Cluster.
Expand Down
5 changes: 3 additions & 2 deletions ...ture/patches/versions/v1beta1/azureclusteridentities.infrastructure.cluster.x-k8s.io.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,16 @@
type: string
type: object
resourceID:
description: ResourceID is the Azure resource ID for the User Assigned MSI resource. Not currently supported.
description: ResourceID is the Azure resource ID for the User Assigned MSI resource. Only applicable when type is UserAssignedMSI.
type: string
tenantID:
description: TenantID is the service principal primary tenant id.
type: string
type:
description: Type is the type of Azure Identity used. ServicePrincipal, ServicePrincipalCertificate, or ManualServicePrincipal.
description: Type is the type of Azure Identity used. ServicePrincipal, ServicePrincipalCertificate, UserAssignedMSI or ManualServicePrincipal.
enum:
- ServicePrincipal
- UserAssignedMSI
- ManualServicePrincipal
- ServicePrincipalCertificate
type: string
Expand Down
90 changes: 90 additions & 0 deletions ...nfrastructure/patches/versions/v1beta1/azureclusters.infrastructure.cluster.x-k8s.io.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@
properties:
dnsName:
type: string
ipTags:
items:
description: IPTag contains the IpTag associated with the object.
properties:
tag:
description: 'Tag specifies the value of the IP tag associated with the public IP. Example: SQL.'
type: string
type:
description: 'Type specifies the IP tag type. Example: FirstPartyUsage.'
type: string
required:
- tag
- type
type: object
type: array
name:
type: string
required:
Expand Down Expand Up @@ -66,6 +81,21 @@
properties:
dnsName:
type: string
ipTags:
items:
description: IPTag contains the IpTag associated with the object.
properties:
tag:
description: 'Tag specifies the value of the IP tag associated with the public IP. Example: SQL.'
type: string
type:
description: 'Type specifies the IP tag type. Example: FirstPartyUsage.'
type: string
required:
- tag
- type
type: object
type: array
name:
type: string
required:
Expand Down Expand Up @@ -300,6 +330,21 @@
properties:
dnsName:
type: string
ipTags:
items:
description: IPTag contains the IpTag associated with the object.
properties:
tag:
description: 'Tag specifies the value of the IP tag associated with the public IP. Example: SQL.'
type: string
type:
description: 'Type specifies the IP tag type. Example: FirstPartyUsage.'
type: string
required:
- tag
- type
type: object
type: array
name:
type: string
required:
Expand Down Expand Up @@ -346,6 +391,21 @@
properties:
dnsName:
type: string
ipTags:
items:
description: IPTag contains the IpTag associated with the object.
properties:
tag:
description: 'Tag specifies the value of the IP tag associated with the public IP. Example: SQL.'
type: string
type:
description: 'Type specifies the IP tag type. Example: FirstPartyUsage.'
type: string
required:
- tag
- type
type: object
type: array
name:
type: string
required:
Expand Down Expand Up @@ -392,6 +452,21 @@
properties:
dnsName:
type: string
ipTags:
items:
description: IPTag contains the IpTag associated with the object.
properties:
tag:
description: 'Tag specifies the value of the IP tag associated with the public IP. Example: SQL.'
type: string
type:
description: 'Type specifies the IP tag type. Example: FirstPartyUsage.'
type: string
required:
- tag
- type
type: object
type: array
name:
type: string
required:
Expand Down Expand Up @@ -451,6 +526,21 @@
properties:
dnsName:
type: string
ipTags:
items:
description: IPTag contains the IpTag associated with the object.
properties:
tag:
description: 'Tag specifies the value of the IP tag associated with the public IP. Example: SQL.'
type: string
type:
description: 'Type specifies the IP tag type. Example: FirstPartyUsage.'
type: string
required:
- tag
- type
type: object
type: array
name:
type: string
required:
Expand Down
96 changes: 94 additions & 2 deletions ...structure/patches/versions/v1beta1/azuremachinepools.infrastructure.cluster.x-k8s.io.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,52 @@
image:
description: Image is used to provide details of an image to use during VM creation. If image details are omitted the image will default the Azure Marketplace "capi" offer, which is based on Ubuntu.
properties:
computeGallery:
description: ComputeGallery specifies an image to use from the Azure Compute Gallery
properties:
gallery:
description: Gallery specifies the name of the compute image gallery that contains the image
minLength: 1
type: string
name:
description: Name is the name of the image
minLength: 1
type: string
plan:
description: Plan contains plan information.
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
required:
- offer
- publisher
- sku
type: object
resourceGroup:
description: ResourceGroup specifies the resource group containing the private compute gallery.
type: string
subscriptionID:
description: SubscriptionID is the identifier of the subscription that contains the private compute gallery.
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
- version
type: object
id:
description: ID specifies an image to use by ID
type: string
Expand Down Expand Up @@ -170,7 +216,7 @@
- version
type: object
sharedGallery:
description: SharedGallery specifies an image to use from an Azure Shared Image Gallery
description: 'SharedGallery specifies an image to use from an Azure Shared Image Gallery Deprecated: use ComputeGallery instead.'
properties:
gallery:
description: Gallery specifies the name of the shared image gallery that contains the image
Expand Down Expand Up @@ -345,6 +391,52 @@
image:
description: Image is the current image used in the AzureMachinePool. When the spec image is nil, this image is populated with the details of the defaulted Azure Marketplace "capi" offer.
properties:
computeGallery:
description: ComputeGallery specifies an image to use from the Azure Compute Gallery
properties:
gallery:
description: Gallery specifies the name of the compute image gallery that contains the image
minLength: 1
type: string
name:
description: Name is the name of the image
minLength: 1
type: string
plan:
description: Plan contains plan information.
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
required:
- offer
- publisher
- sku
type: object
resourceGroup:
description: ResourceGroup specifies the resource group containing the private compute gallery.
type: string
subscriptionID:
description: SubscriptionID is the identifier of the subscription that contains the private compute gallery.
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
- version
type: object
id:
description: ID specifies an image to use by ID
type: string
Expand Down Expand Up @@ -378,7 +470,7 @@
- version
type: object
sharedGallery:
description: SharedGallery specifies an image to use from an Azure Shared Image Gallery
description: 'SharedGallery specifies an image to use from an Azure Shared Image Gallery Deprecated: use ComputeGallery instead.'
properties:
gallery:
description: Gallery specifies the name of the shared image gallery that contains the image
Expand Down
Loading

0 comments on commit 6bc8c21

Please sign in to comment.