Skip to content

Commit

Permalink
build(deps): bump sigs.k8s.io/cluster-api from 1.6.1 to 1.6.3 (#353)
Browse files Browse the repository at this point in the history
Bumps [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) from 1.6.1 to 1.6.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/kubernetes-sigs/cluster-api/releases">sigs.k8s.io/cluster-api's releases</a>.</em></p>
<blockquote>
<h2>v1.6.3</h2>
<h2>👌 Kubernetes version support</h2>
<ul>
<li>Management Cluster: v1.25.x -&gt; v1.29.x</li>
<li>Workload Cluster: v1.23.x -&gt; v1.29.x</li>
</ul>
<p><a href="https://cluster-api.sigs.k8s.io/reference/versions.html">More information about version support can be found here</a></p>
<h2>Changes since v1.6.2</h2>
<h2>:chart_with_upwards_trend: Overview</h2>
<ul>
<li>14 new commits merged</li>
<li>2 bugs fixed 🐛</li>
</ul>
<h2>:bug: Bug Fixes</h2>
<ul>
<li>CAPD: Fix(capd): remove hack for btrfs/zfs support (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10192">#10192</a>)</li>
<li>e2e: Test: retry GetOwnerGraph in owner references test on certificate errors (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10217">#10217</a>)</li>
</ul>
<h2>:seedling: Others</h2>
<ul>
<li>CABPK: Add pod metadata to capbk manager (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10212">#10212</a>)</li>
<li>clusterctl: Add 0 default to worker-machine-count help (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10205">#10205</a>)</li>
<li>clusterctl: Add hivelocity infra provider to clusterctl (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10168">#10168</a>)</li>
<li>Dependency: Bump go version to 1.21.8 (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10246">#10246</a>)</li>
<li>Dependency: Bump protobuf to v1.33.0 to address CVEs (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10249">#10249</a>)</li>
<li>Release: Improve release-staging build (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10190">#10190</a>)</li>
<li>Release: Read in dockerfiles from stdin (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10209">#10209</a>)</li>
</ul>
<p>:book: Additionally, there have been 4 contributions to our documentation and book. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10230">#10230</a>, <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10241">#10241</a>, <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10243">#10243</a>, <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10260">#10260</a>)</p>
<h2>Dependencies</h2>
<h3>Added</h3>
<p><em>Nothing has changed.</em></p>
<h3>Changed</h3>
<ul>
<li>google.golang.org/protobuf: v1.31.0 → v1.33.0</li>
</ul>
<h3>Removed</h3>
<p><em>Nothing has changed.</em></p>
<p><em>Thanks to all our contributors!</em> 😊</p>
<h2>v1.6.2</h2>
<h2>Highlights</h2>
<ul>
<li>:warning: Warning: This release fixes a bug (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10051">#10051</a>) that was introduced in v1.6.0, which caused a regression in the conversion of v1alpha3/v1alpha4 objects. It is recommended to upgrade to v1.6.2 to avoid the issue.</li>
</ul>
<h2>👌 Kubernetes version support</h2>
<ul>
<li>Management Cluster: v1.25.x -&gt; v1.29.x</li>
<li>Workload Cluster: v1.23.x -&gt; v1.29.x</li>
</ul>

</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/965ffa1d94230b8127245df750a99f09eab9dd97"><code>965ffa1</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10260">#10260</a> from k8s-infra-cherrypick-robot/cherry-pick-10257-t...</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/63cbd6c7d98907fb4095671dccdc51995361ab2a"><code>63cbd6c</code></a> Fix flaky link in docs</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/2dedba3c38adfb964754bd08db94e32371458f14"><code>2dedba3</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10249">#10249</a> from cahillsf/bump-protobuf-dep-release-1.6</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/16c55a4d85d71d2888d527441fde8da990db575b"><code>16c55a4</code></a> bump protobuf to v1.33.0 to address CVEs</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/d37b9cc83db24b851d66eced54e78f1a9d0b7138"><code>d37b9cc</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10246">#10246</a> from k8s-infra-cherrypick-robot/cherry-pick-10235-t...</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/ff493a4b851c0df6798765eebf61181004d64586"><code>ff493a4</code></a> bump go version to 1.21.8</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/743abcef637ee2b0ec2e14ddeb9b51756527e271"><code>743abce</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10243">#10243</a> from chrischdi/pr-cp-10099</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/6eff7e1b3618ccb47ce0ccebe7cb79377ab9a640"><code>6eff7e1</code></a> Add provider tab for k0smotron</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/6dae4a0f86e86e68a4aa202277612ac3d2184a45"><code>6dae4a0</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10241">#10241</a> from k8s-infra-cherrypick-robot/cherry-pick-10239-t...</li>
<li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/3c79cff5ddafb221a559b60f35e16a9367c7e3e5"><code>3c79cff</code></a> book: Update agenda links w/ shared drive</li>
<li>Additional commits viewable in <a href="https://github.com/kubernetes-sigs/cluster-api/compare/v1.6.1...v1.6.3">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&package-manager=go_modules&previous-version=1.6.1&new-version=1.6.3)](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>
  • Loading branch information
mergify[bot] authored Mar 30, 2024
2 parents f374c03 + 1f9689a commit ac0c8f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
k8s.io/component-base v0.29.2
k8s.io/klog/v2 v2.110.1
k8s.io/utils v0.0.0-20231127182322-b307cd553661
sigs.k8s.io/cluster-api v1.6.1
sigs.k8s.io/cluster-api v1.6.3
sigs.k8s.io/controller-runtime v0.17.0
sigs.k8s.io/kustomize/kustomize/v5 v5.3.0
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -79,7 +79,7 @@ require (
golang.org/x/tools v0.17.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down Expand Up @@ -343,8 +343,8 @@ k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8 h1:yHNkNuLjht7iq95pO9Qmbj
k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.6.1 h1:I34p/fwgRlEhs+o9cUhKXDwNNfPS3no0yJsd2bJyQVc=
sigs.k8s.io/cluster-api v1.6.1/go.mod h1:DaxwruDvSaEYq5q6FREDaGzX6UsAVUCA99Sp8vfMHyQ=
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=
sigs.k8s.io/cluster-api v1.6.3/go.mod h1:4FzfgPPiYaFq8X9F9j2SvmggH/4OOLEDgVJuWDqKLig=
sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s=
sigs.k8s.io/controller-runtime v0.17.0/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down

0 comments on commit ac0c8f0

Please sign in to comment.