From 05cc06a65a72644c2dc68a9a44ecf04e61cc9af7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:26:27 +0000
Subject: [PATCH] build(deps): Bump the k8s group with 3 updates (#317)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps the k8s group with 3 updates:
[k8s.io/klog/v2](https://github.com/kubernetes/klog),
[k8s.io/kubelet](https://github.com/kubernetes/kubelet) and
[sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api).

Updates `k8s.io/klog/v2` from 2.120.0 to 2.120.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/kubernetes/klog/releases">k8s.io/klog/v2's
releases</a>.</em></p>
<blockquote>
<h2>Prepare klog release for Kubernetes v1.30 (Take 2)</h2>
<h2>What's Changed</h2>
<ul>
<li>textlogger: allow caller to override stack unwinding by <a
href="https://github.com/pohly"><code>@​pohly</code></a> in <a
href="https://redirect.github.com/kubernetes/klog/pull/397">kubernetes/klog#397</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/kubernetes/klog/compare/v2.120.0...v2.120.1">https://github.com/kubernetes/klog/compare/v2.120.0...v2.120.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kubernetes/klog/commit/007e661a007dacdf017ad9c1b53e9f96d32d4b7d"><code>007e661</code></a>
textlogger: allow caller to override stack unwinding</li>
<li>See full diff in <a
href="https://github.com/kubernetes/klog/compare/v2.120.0...v2.120.1">compare
view</a></li>
</ul>
</details>
<br />

Updates `k8s.io/kubelet` from 0.29.0 to 0.29.1
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kubernetes/kubelet/commit/ae5938e6ed31e3a093f189e51efe929749e240c7"><code>ae5938e</code></a>
Update dependencies to v0.29.1 tag</li>
<li><a
href="https://github.com/kubernetes/kubelet/commit/eece181a3ec435db0abcc82d229ee619908ced54"><code>eece181</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes/kubelet/issues/122429">#122429</a>
from MadhavJivrajani/tools-bump-129</li>
<li><a
href="https://github.com/kubernetes/kubelet/commit/df31633baff88bbc2a02bbcc83e3e7e5e1384bd5"><code>df31633</code></a>
.*: bump golang.org/x/tools to v0.16.1</li>
<li>See full diff in <a
href="https://github.com/kubernetes/kubelet/compare/v0.29.0...v0.29.1">compare
view</a></li>
</ul>
</details>
<br />

Updates `sigs.k8s.io/cluster-api` from 1.6.0 to 1.6.1
<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.1</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>Highlights</h2>
<ul>
<li>Kubernetes v1.29 is now supported</li>
</ul>
<h2>Changes since v1.6.0</h2>
<h2>:chart_with_upwards_trend: Overview</h2>
<ul>
<li>30 new commits merged</li>
<li>1 feature addition ✨</li>
<li>9 bugs fixed 🐛</li>
</ul>
<h2>:sparkles: New Features</h2>
<ul>
<li>Control-plane: KCP: Allow mutation of all fields that should be
mutable (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9884">#9884</a>)</li>
</ul>
<h2>:bug: Bug Fixes</h2>
<ul>
<li>CAPD: Fix ignition to also set the kube-proxy configuration to skip
setting sysctls (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9895">#9895</a>)</li>
<li>clusterctl: Validate no objects exist from CRDs before deleting them
(<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9834">#9834</a>)</li>
<li>e2e: Make MachinePools and MachineDeployments optional in
ApplyClusterTemplateAndWait (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9962">#9962</a>)</li>
<li>e2e: Test: Fix finalizers test to not only rely on namespaced name
(<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10004">#10004</a>)</li>
<li>e2e: Test: wait for topology to get rolled out before continuing
with scaling checks (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9827">#9827</a>)</li>
<li>IPAM: Fix webhooks using mixed api versions (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9863">#9863</a>)</li>
<li>Logging: Improve log k/v pairs and a improve/drop a few log lines
(<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9880">#9880</a>)</li>
<li>MachinePool: Fix TestReconcileMachinePoolScaleToFromZero flakes (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9822">#9822</a>)</li>
<li>Testing: SSA: fix flaky test TestPatch/Test patch with Machine (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9915">#9915</a>)</li>
</ul>
<h2>:seedling: Others</h2>
<ul>
<li>CI: Bump kubebuilder envtest to 1.29.0 (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10014">#10014</a>)</li>
<li>Dependency: Bump golang.org/x/crypto to v0.17.0 (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9943">#9943</a>)</li>
<li>Dependency: Bump to Go 1.20.12 (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9841">#9841</a>)</li>
<li>Dependency: Go.mod: bump github.com/cloudflare/circl to v1.3.7 (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10002">#10002</a>)</li>
<li>e2e: Add DeepCopy method for E2EConfig (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9989">#9989</a>)</li>
<li>e2e: Add test util to resolve Kubernetes versions (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9996">#9996</a>)</li>
<li>e2e: Bump cluster-autoscaler to v1.29.0 (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9948">#9948</a>)</li>
<li>e2e: Drop duplicated scale test (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9976">#9976</a>)</li>
<li>e2e: Make etcd and CoreDNS optional in upgrade and self-hosted tests
(<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9965">#9965</a>)</li>
<li>e2e: Test/framework add WatchDaemonSetLogsByLabelSelector method (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9994">#9994</a>)</li>
<li>Testing: add dynamic finalizer assertions for e2e framework (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10003">#10003</a>)]</li>
<li>Testing: v1.29: Prepare quickstart, capd and tests for the new
release including kind bump (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9890">#9890</a>)</li>
</ul>
<p>:book: Additionally, there have been 8 contributions to our
documentation and book. (<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9815">#9815</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9816">#9816</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9824">#9824</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9830">#9830</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9878">#9878</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9902">#9902</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9951">#9951</a>,
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9979">#9979</a>)</p>
<p><em>Thanks to all our contributors!</em> 😊</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/a150f715f5a607ef172dbe96615ffdf1d51220b3"><code>a150f71</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10014">#10014</a>
from k8s-infra-cherrypick-robot/cherry-pick-10013-t...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/d049ff7a3665d17465fc223a9fd784498e6ebd0e"><code>d049ff7</code></a>
Bump kubebuilder to 1.29.0</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/6078be4caa42e41742994e7852598346e69add5a"><code>6078be4</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10003">#10003</a>
from adityabhatia/dynamicFinalizerAssertions1.6</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/bca44c54e6a177463f3f648a73bf47b7bea8d9d0"><code>bca44c5</code></a>
test: add dynamic finalizer assertions for e2e framework</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/6a42479ccc5fd2c870d11632ce0b68a18e44a9b5"><code>6a42479</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10004">#10004</a>
from k8s-infra-cherrypick-robot/cherry-pick-9891-to...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/469f102b37872bf155f8397b858bca8c11c9ff82"><code>469f102</code></a>
Fix finalizers test to not only rely on namespaced name</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/ea140ce08e5192a84473779e5d7db93a5c6e0971"><code>ea140ce</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/10002">#10002</a>
from chrischdi/pr-bump-github.com-cloudflare-circl-1-6</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/479499f8db9db13a1aa13f4fb118dfa90175251c"><code>479499f</code></a>
go.mod: bump github.com/cloudflare/circl to v1.3.7</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/70716332b48733feaec1ae231b6691047da54833"><code>7071633</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9996">#9996</a>
from k8s-infra-cherrypick-robot/cherry-pick-9995-to-...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api/commit/59fa80c5e660e2e789c4706aca9e0b42fce6de7b"><code>59fa80c</code></a>
Add test util to resolve Kubernetes versions</li>
<li>Additional commits viewable in <a
href="https://github.com/kubernetes-sigs/cluster-api/compare/v1.6.0...v1.6.1">compare
view</a></li>
</ul>
</details>
<br />


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 <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod |  6 +++---
 go.sum | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index a706322e7..2b4f93fec 100644
--- a/go.mod
+++ b/go.mod
@@ -20,10 +20,10 @@ require (
 	k8s.io/apiserver v0.29.1
 	k8s.io/client-go v0.29.1
 	k8s.io/component-base v0.29.1
-	k8s.io/klog/v2 v2.120.0
-	k8s.io/kubelet v0.29.0
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/kubelet v0.29.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/cluster-api v1.6.0
+	sigs.k8s.io/cluster-api v1.6.1
 	sigs.k8s.io/controller-runtime v0.17.0
 )
 
diff --git a/go.sum b/go.sum
index dffff17e7..8bbd64887 100644
--- a/go.sum
+++ b/go.sum
@@ -201,8 +201,8 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -288,18 +288,18 @@ k8s.io/cluster-bootstrap v0.29.0 h1:zCYdZ+LWDj4O86FB5tDKckIEsf2qBHjcp78xtjOzD3A=
 k8s.io/cluster-bootstrap v0.29.0/go.mod h1:PDk+ouXC6bM2FFdo4u53IlWK3ZMWebH4TeE5BGmHWRw=
 k8s.io/component-base v0.29.1 h1:MUimqJPCRnnHsskTTjKD+IC1EHBbRCVyi37IoFBrkYw=
 k8s.io/component-base v0.29.1/go.mod h1:fP9GFjxYrLERq1GcWWZAE3bqbNcDKDytn2srWuHTtKc=
-k8s.io/klog/v2 v2.120.0 h1:z+q5mfovBj1fKFxiRzsa2DsJLPIVMk/KFL81LMOfK+8=
-k8s.io/klog/v2 v2.120.0/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
+k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
-k8s.io/kubelet v0.29.0 h1:SX5hlznTBcGIrS1scaf8r8p6m3e475KMifwt9i12iOk=
-k8s.io/kubelet v0.29.0/go.mod h1:kvKS2+Bz2tgDOG1S1q0TH2z1DasNuVF+8p6Aw7xvKkI=
+k8s.io/kubelet v0.29.1 h1:cso8Dk8dymkj8q+EvW/aCbIYU2aOkH27gho48tYza/8=
+k8s.io/kubelet v0.29.1/go.mod h1:hTl/naFcCVG1Ku17fMgj/krbheBwBkf3gnFhaboMx7E=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
-sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
-sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
+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/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=