Skip to content

Commit

Permalink
build(deps): Bump sigs.k8s.io/cluster-api-provider-aws/v2 from 2.5.2 …
Browse files Browse the repository at this point in the history
…to 2.6.1 in /hack/third-party/capa (#840)

Bumps
[sigs.k8s.io/cluster-api-provider-aws/v2](https://github.com/kubernetes-sigs/cluster-api-provider-aws)
from 2.5.2 to 2.6.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases">sigs.k8s.io/cluster-api-provider-aws/v2's
releases</a>.</em></p>
<blockquote>
<h2>v2.6.1</h2>
<h1>Release notes for Cluster API Provider AWS (CAPA) v2.6.1</h1>
<p><a href="https://cluster-api-aws.sigs.k8s.io/">Documentation</a></p>
<h1>Changelog since v2.5.2</h1>
<p>| NOTE: there is no v2.6.0 release publicly available due to issue
encountered during release.</p>
<h2>Changes by Kind</h2>
<h3>Feature</h3>
<ul>
<li>Add natgatewayips as source for ingress rules (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5005">#5005</a>,
<a
href="https://github.com/alexander-demicev"><code>@​alexander-demicev</code></a>)</li>
<li>Add separate eks kubeconfig secret keys for the cluster-autoscaler
to support refreshing the token automatically, see eks kubeconfig for
more info. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4648">#4648</a>,
<a href="https://github.com/cnmcavoy"><code>@​cnmcavoy</code></a>)</li>
<li>EBS Volumes and ENIs are now tagged when created as part of EC2
Instance Creation. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5057">#5057</a>,
<a href="https://github.com/fahlmant"><code>@​fahlmant</code></a>)</li>
<li>Flag to enable private subnet filter for EKS control plane (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5058">#5058</a>,
<a href="https://github.com/jas-nik"><code>@​jas-nik</code></a>)</li>
<li>New <code>AWSCluster.spec.network.vpc.SubnetSchema</code> parameter
which allows to change preferred way of subnet division to public and
private. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4971">#4971</a>,
<a
href="https://github.com/krasoffski"><code>@​krasoffski</code></a>)</li>
<li>Adding a new API field <code>capacityReservationId</code> to create
capacity reserved instances (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5047">#5047</a>,
<a href="https://github.com/athiruma"><code>@​athiruma</code></a>)</li>
</ul>
<h3>Bug or Regression</h3>
<ul>
<li>Continue reconciliation after filling an empty
<code>AWSMachinePool.status.launchTemplateVersion</code> field (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5048">#5048</a>,
<a href="https://github.com/AndiDog"><code>@​AndiDog</code></a>)</li>
<li>Fix comparison of ingress rules during Security Group reconciliation
to avoid unnecessary revokes and authorizes. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5024">#5024</a>,
<a href="https://github.com/r4f4"><code>@​r4f4</code></a>)</li>
<li>Fix managed subnet tagging with &quot;owned&quot; value for
&quot;kubernetes.io/cluster/<!-- raw HTML omitted -->&quot; tag. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5051">#5051</a>,
<a href="https://github.com/r4f4"><code>@​r4f4</code></a>)</li>
<li>Fix registering instances to Load Balancers when instances are still
pending. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5040">#5040</a>,
<a href="https://github.com/r4f4"><code>@​r4f4</code></a>)</li>
<li>Fixed released binary name template. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5055">#5055</a>,
<a href="https://github.com/nrb"><code>@​nrb</code></a>)</li>
<li>Fixes target group and listeners creation for v2 Load Balancers. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5017">#5017</a>,
<a href="https://github.com/r4f4"><code>@​r4f4</code></a>)</li>
<li>Flag to remove the default Helm-managed AWS VPC CNI EKS Addon (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5009">#5009</a>,
<a href="https://github.com/jas-nik"><code>@​jas-nik</code></a>)</li>
<li>Change prevenet deletion label to be specific to CAPA. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5072">#5072</a>,
<a
href="https://github.com/richardcase"><code>@​richardcase</code></a>)</li>
</ul>
<h3>Other</h3>
<ul>
<li>Move AndiDog to maintainer status. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5060">#5060</a>,
<a
href="https://github.com/richardcase"><code>@​richardcase</code></a>)</li>
<li>Update the metadata file for v2.6.0 (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5071">#5071</a>,
<a
href="https://github.com/richardcase"><code>@​richardcase</code></a>)</li>
</ul>
<p>The images for this release are:
registry.k8s.io/cluster-api-aws/cluster-api-aws-controller:v2.6.1</p>
<p>Thanks to all our contributors.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/6db1244a6aea9058cc0546dd7d2151fc2c624acc"><code>6db1244</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5073">#5073</a>
from k8s-infra-cherrypick-robot/cherry-pick-5072-to-...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/ec0b23658898a49422e63081916ad4ec44656e57"><code>ec0b236</code></a>
chore: change name of prevent deletion label</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/b38488dd8573577770ab3c6123447cb73031170a"><code>b38488d</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5071">#5071</a>
from richardcase/metadata_release260</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/ab63db7b7a8bd4dffdd1c969c454cac70084592a"><code>ab63db7</code></a>
chore: update metadata for v2.6.0</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/b8ad31cc176d31eeec13f0dc99a2fa3b02fd0459"><code>b8ad31c</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5009">#5009</a>
from jas-nik/vpc-cni-helm</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/02198d345a927b2c37188eb79bc59806f19ffa7a"><code>02198d3</code></a>
Remove helm condition for aws vpc cni deletion</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/8d68d0385d7fd9a11c916bfd6b4dd2ceac1f9b4a"><code>8d68d03</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5058">#5058</a>
from jas-nik/filter-pvt-sub</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/6ad02ef365f068a50f3b5591a6de64849411492b"><code>6ad02ef</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5047">#5047</a>
from athiruma/support_capacity_reservation</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/015943516fe951ef7d7a2fc7068f861f061708a7"><code>0159435</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5040">#5040</a>
from r4f4/fix-5037</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/commit/8050e014c835a7223a1d7f0c9fdada199b181d91"><code>8050e01</code></a>
Add Control Plane Private Subnet Filter</li>
<li>Additional commits viewable in <a
href="https://github.com/kubernetes-sigs/cluster-api-provider-aws/compare/v2.5.2...v2.6.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sigs.k8s.io/cluster-api-provider-aws/v2&package-manager=go_modules&previous-version=2.5.2&new-version=2.6.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jimmi Dyson <jimmidyson@gmail.com>
  • Loading branch information
dependabot[bot] and jimmidyson authored Aug 13, 2024
1 parent 576e7d0 commit cb8693f
Show file tree
Hide file tree
Showing 7 changed files with 194 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ type AWSMachineSpec struct {
// +optional
PublicIP *bool `json:"publicIP,omitempty"`

// ElasticIPPool is the configuration to allocate Public IPv4 address (Elastic IP/EIP) from user-defined pool.
//
// +optional
ElasticIPPool *ElasticIPPool `json:"elasticIpPool,omitempty"`

// AdditionalSecurityGroups is an array of references to security groups that should be applied to the
// instance. These security groups would be set in addition to any security groups defined
// at the cluster level or in the actuator. It is possible to specify either IDs of Filters. Using Filters
Expand Down Expand Up @@ -188,6 +193,10 @@ type AWSMachineSpec struct {
// PrivateDNSName is the options for the instance hostname.
// +optional
PrivateDNSName *PrivateDNSName `json:"privateDnsName,omitempty"`

// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
// +optional
CapacityReservationID *string `json:"capacityReservationId,omitempty"`
}

// CloudInit defines options related to the bootstrapping systems where
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,22 @@ type VPCSpec struct {
// +optional
// +kubebuilder:validation:Enum:=ip-name;resource-name
PrivateDNSHostnameTypeOnLaunch *string `json:"privateDnsHostnameTypeOnLaunch,omitempty"`

// ElasticIPPool contains specific configuration to allocate Public IPv4 address (Elastic IP) from user-defined pool
// brought to AWS for core infrastructure resources, like NAT Gateways and Public Network Load Balancers for
// the API Server.
// +optional
ElasticIPPool *ElasticIPPool `json:"elasticIpPool,omitempty"`

// SubnetSchema specifies how CidrBlock should be divided on subnets in the VPC depending on the number of AZs.
// PreferPrivate - one private subnet for each AZ plus one other subnet that will be further sub-divided for the public subnets.
// PreferPublic - have the reverse logic of PreferPrivate, one public subnet for each AZ plus one other subnet
// that will be further sub-divided for the private subnets.
// Defaults to PreferPrivate
// +optional
// +kubebuilder:default=PreferPrivate
// +kubebuilder:validation:Enum=PreferPrivate;PreferPublic
SubnetSchema *SubnetSchemaType `json:"subnetSchema,omitempty"`
}

// String returns a string representation of the VPC.
Expand All @@ -477,6 +493,22 @@ func (v *VPCSpec) IsIPv6Enabled() bool {
return v.IPv6 != nil
}

// GetElasticIPPool returns the custom Elastic IP Pool configuration when present.
func (v *VPCSpec) GetElasticIPPool() *ElasticIPPool {
return v.ElasticIPPool
}

// GetPublicIpv4Pool returns the custom public IPv4 pool brought to AWS when present.
func (v *VPCSpec) GetPublicIpv4Pool() *string {
if v.ElasticIPPool == nil {
return nil
}
if v.ElasticIPPool.PublicIpv4Pool != nil {
return v.ElasticIPPool.PublicIpv4Pool
}
return nil
}

// SubnetSpec configures an AWS Subnet.
type SubnetSpec struct {
// ID defines a unique identifier to reference this resource.
Expand Down Expand Up @@ -715,6 +747,17 @@ func (s Subnets) FilterPrivate() (res Subnets) {
return
}

// FilterNonCni returns the subnets that are NOT intended for usage with the CNI pod network
// (i.e. do NOT have the `sigs.k8s.io/cluster-api-provider-aws/association=secondary` tag).
func (s Subnets) FilterNonCni() (res Subnets) {
for _, x := range s {
if x.Tags[NameAWSSubnetAssociation] != SecondarySubnetTagValue {
res = append(res, x)
}
}
return
}

// FilterPublic returns a slice containing all subnets marked as public.
func (s Subnets) FilterPublic() (res Subnets) {
for _, x := range s {
Expand Down Expand Up @@ -897,6 +940,10 @@ type IngressRule struct {
// The field will be combined with source security group IDs if specified.
// +optional
SourceSecurityGroupRoles []SecurityGroupRole `json:"sourceSecurityGroupRoles,omitempty"`

// NatGatewaysIPsSource use the NAT gateways IPs as the source for the ingress rule.
// +optional
NatGatewaysIPsSource bool `json:"natGatewaysIPsSource,omitempty"`
}

// String returns a string representation of the ingress rule.
Expand Down Expand Up @@ -1002,3 +1049,57 @@ func (z ZoneType) String() string {
func (z ZoneType) Equal(other ZoneType) bool {
return z == other
}

// ElasticIPPool allows configuring a Elastic IP pool for resources allocating
// public IPv4 addresses on public subnets.
type ElasticIPPool struct {
// PublicIpv4Pool sets a custom Public IPv4 Pool used to create Elastic IP address for resources
// created in public IPv4 subnets. Every IPv4 address, Elastic IP, will be allocated from the custom
// Public IPv4 pool that you brought to AWS, instead of Amazon-provided pool. The public IPv4 pool
// resource ID starts with 'ipv4pool-ec2'.
//
// +kubebuilder:validation:MaxLength=30
// +optional
PublicIpv4Pool *string `json:"publicIpv4Pool,omitempty"`

// PublicIpv4PoolFallBackOrder defines the fallback action when the Public IPv4 Pool has been exhausted,
// no more IPv4 address available in the pool.
//
// When set to 'amazon-pool', the controller check if the pool has available IPv4 address, when pool has reached the
// IPv4 limit, the address will be claimed from Amazon-pool (default).
//
// When set to 'none', the controller will fail the Elastic IP allocation when the publicIpv4Pool is exhausted.
//
// +kubebuilder:validation:Enum:=amazon-pool;none
// +optional
PublicIpv4PoolFallBackOrder *PublicIpv4PoolFallbackOrder `json:"publicIpv4PoolFallbackOrder,omitempty"`

// TODO(mtulio): add future support of user-defined Elastic IP to allow users to assign BYO Public IP from
// 'static'/preallocated amazon-provided IPsstrucute currently holds only 'BYO Public IP from Public IPv4 Pool' (user brought to AWS),
// although a dedicated structure would help to hold 'BYO Elastic IP' variants like:
// - AllocationIdPoolApiLoadBalancer: an user-defined (static) IP address to the Public API Load Balancer.
// - AllocationIdPoolNatGateways: an user-defined (static) IP address to allocate to NAT Gateways (egress traffic).
}

// PublicIpv4PoolFallbackOrder defines the list of available fallback action when the PublicIpv4Pool is exhausted.
// 'none' let the controllers return failures when the PublicIpv4Pool is exhausted - no more IPv4 available.
// 'amazon-pool' let the controllers to skip the PublicIpv4Pool and use the Amazon pool, the default.
// +kubebuilder:validation:XValidation:rule="self in ['none','amazon-pool']",message="allowed values are 'none' and 'amazon-pool'"
type PublicIpv4PoolFallbackOrder string

const (
// PublicIpv4PoolFallbackOrderAmazonPool refers to use Amazon-pool Public IPv4 Pool as a fallback strategy.
PublicIpv4PoolFallbackOrderAmazonPool = PublicIpv4PoolFallbackOrder("amazon-pool")

// PublicIpv4PoolFallbackOrderNone refers to not use any fallback strategy.
PublicIpv4PoolFallbackOrderNone = PublicIpv4PoolFallbackOrder("none")
)

func (r PublicIpv4PoolFallbackOrder) String() string {
return string(r)
}

// Equal compares PublicIpv4PoolFallbackOrder types and return true if input param is equal.
func (r PublicIpv4PoolFallbackOrder) Equal(e PublicIpv4PoolFallbackOrder) bool {
return r == e
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@ limitations under the License.
package v1beta2

import (
"strings"

"k8s.io/apimachinery/pkg/util/sets"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)

const (
// PreventDeletionLabel can be used in situations where preventing delation is allowed. The docs
// and the CRD will call this out where its allowed.
PreventDeletionLabel = "aws.cluster.x-k8s.io/prevent-deletion"
)

// AWSResourceReference is a reference to a specific AWS resource by ID or filters.
// Only one of ID or Filters may be specified. Specifying more than one will result in
// a validation error.
Expand Down Expand Up @@ -249,6 +257,10 @@ type Instance struct {
// PublicIPOnLaunch is the option to associate a public IP on instance launch
// +optional
PublicIPOnLaunch *bool `json:"publicIPOnLaunch,omitempty"`

// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
// +optional
CapacityReservationID *string `json:"capacityReservationId,omitempty"`
}

// InstanceMetadataState describes the state of InstanceMetadataOptions.HttpEndpoint and InstanceMetadataOptions.InstanceMetadataTags
Expand Down Expand Up @@ -439,3 +451,19 @@ type PrivateDNSName struct {
// +kubebuilder:validation:Enum:=ip-name;resource-name
HostnameType *string `json:"hostnameType,omitempty"`
}

// SubnetSchemaType specifies how given network should be divided on subnets
// in the VPC depending on the number of AZs.
type SubnetSchemaType string

// Name returns subnet schema type name without prefix.
func (s *SubnetSchemaType) Name() string {
return strings.ToLower(strings.TrimPrefix(string(*s), "Prefer"))
}

var (
// SubnetSchemaPreferPrivate allocates more subnets in the VPC to private subnets.
SubnetSchemaPreferPrivate = SubnetSchemaType("PreferPrivate")
// SubnetSchemaPreferPublic allocates more subnets in the VPC to public subnets.
SubnetSchemaPreferPublic = SubnetSchemaType("PreferPublic")
)

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

2 changes: 1 addition & 1 deletion hack/third-party/capa/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/ex

go 1.21

require sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.6.1

require (
github.com/aws/aws-sdk-go v1.51.17 // indirect
Expand Down
6 changes: 4 additions & 2 deletions hack/third-party/capa/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU=
Expand Down Expand Up @@ -183,8 +185,8 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2 h1:KIIgGf7CmYcvmrluwq7kPO8ZIfCduVtJ2aFR8GvA6IU=
sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2/go.mod h1:eQodl6ZvSu8PVNsOPt5TrqDc8gmCsor+BZHQQFX2Gns=
sigs.k8s.io/cluster-api-provider-aws/v2 v2.6.1 h1:vbZUYEB7OfPlfHk6wis+UrvRLTqv5F4Nrjl2WDJ1kiw=
sigs.k8s.io/cluster-api-provider-aws/v2 v2.6.1/go.mod h1:1aq1EZbirRW6NC2gYUFCc7cVFwX9PM/vDvoU+2oGPuw=
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/data/shared/v1beta1-capa/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
releaseSeries:
- major: 2
minor: 5
minor: 6
contract: v1beta1

0 comments on commit cb8693f

Please sign in to comment.