Skip to content

Commit

Permalink
build(deps): Bump sigs.k8s.io/cluster-api-addon-provider-helm from 0.…
Browse files Browse the repository at this point in the history
…2.5 to 0.2.6 in /hack/third-party/caaph (#952)

Bumps
[sigs.k8s.io/cluster-api-addon-provider-helm](https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm)
from 0.2.5 to 0.2.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases">sigs.k8s.io/cluster-api-addon-provider-helm's
releases</a>.</em></p>
<blockquote>
<h2>v0.2.6</h2>
<h2>What's Changed</h2>
<ul>
<li>:seedling: Bump github.com/onsi/gomega from 1.34.1 to 1.34.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/281">kubernetes-sigs/cluster-api-addon-provider-helm#281</a></li>
<li>:seedling: Bump github.com/Masterminds/sprig/v3 from 3.2.3 to 3.3.0
by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>
in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/282">kubernetes-sigs/cluster-api-addon-provider-helm#282</a></li>
<li>:seedling: Bump github.com/onsi/ginkgo/v2 from 2.20.1 to 2.20.2 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/283">kubernetes-sigs/cluster-api-addon-provider-helm#283</a></li>
<li>:sparkles: expose resetThenReuseValues upgrade option by <a
href="https://github.com/tuxtof"><code>@​tuxtof</code></a> in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/288">kubernetes-sigs/cluster-api-addon-provider-helm#288</a></li>
<li>:seedling: Bump actions/cache from 4.0.2 to 4.1.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/291">kubernetes-sigs/cluster-api-addon-provider-helm#291</a></li>
<li>:seedling: Bump golangci/golangci-lint-action from 6.1.0 to 6.1.1 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/290">kubernetes-sigs/cluster-api-addon-provider-helm#290</a></li>
<li>🌱 Bump CAPI to v1.8.4 by <a
href="https://github.com/Jont828"><code>@​Jont828</code></a> in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/296">kubernetes-sigs/cluster-api-addon-provider-helm#296</a></li>
<li>:seedling: Bump actions/cache from 4.1.0 to 4.1.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/295">kubernetes-sigs/cluster-api-addon-provider-helm#295</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/tuxtof"><code>@​tuxtof</code></a> made
their first contribution in <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/pull/288">kubernetes-sigs/cluster-api-addon-provider-helm#288</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/compare/v0.2.5...v0.2.6">https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/compare/v0.2.5...v0.2.6</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/8c307b2fded1e8d9ab996cc3c3dc379942f0f3fb"><code>8c307b2</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/issues/295">#295</a>
from kubernetes-sigs/dependabot/github_actions/action...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/d0b2cbe787bc6991ea6f52caa0b5397d9f9a4474"><code>d0b2cbe</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/issues/296">#296</a>
from Jont828/capi-v1.8.4</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/ed7c475116b4f1a19378eb887eef020c991198a3"><code>ed7c475</code></a>
Bump CAPI to v1.8.4</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/173a921af13f8c5e2adf4905203e6021cc6fc801"><code>173a921</code></a>
:seedling: Bump actions/cache from 4.1.0 to 4.1.1</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/e74b06c23e1f6371dd91782db734e492831b8ec6"><code>e74b06c</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/issues/290">#290</a>
from kubernetes-sigs/dependabot/github_actions/golang...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/b011e3bab2d4d37d036cecdee3ce58216754becb"><code>b011e3b</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/issues/291">#291</a>
from kubernetes-sigs/dependabot/github_actions/action...</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/13dbb27eb963ff0fff34190307508d07180a270b"><code>13dbb27</code></a>
:seedling: Bump actions/cache from 4.0.2 to 4.1.0</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/5a738291f45b8cc297b8caf2650dd300e9982cc1"><code>5a73829</code></a>
:seedling: Bump golangci/golangci-lint-action from 6.1.0 to 6.1.1</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/8241bfd48906870271e01ec8eb599d17a9266c0b"><code>8241bfd</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/cluster-api-addon-provider-helm/issues/288">#288</a>
from tuxtof/feat/reset-and-reuse</li>
<li><a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/commit/c343bee9dec09499dea89ff2962f08b06640cbf2"><code>c343bee</code></a>
expose resetThenReuseValues upgrade option</li>
<li>Additional commits viewable in <a
href="https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/compare/v0.2.5...v0.2.6">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-addon-provider-helm&package-manager=go_modules&previous-version=0.2.5&new-version=0.2.6)](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 Oct 31, 2024
1 parent 155b731 commit 36a0378
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ type HelmUpgradeOptions struct {
// +optional
ReuseValues bool `json:"reuseValues,omitempty"`

// ResetThenReuseValues will reset the values to the chart's built-ins then merge with user's last supplied values.
// +optional
ResetThenReuseValues bool `json:"resetThenReuseValues,omitempty"`

// Recreate will (if true) recreate pods after a rollback.
// +optional
Recreate bool `json:"recreate,omitempty"`
Expand Down
6 changes: 3 additions & 3 deletions hack/third-party/caaph/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.22.0

toolchain go1.23.0

require sigs.k8s.io/cluster-api-addon-provider-helm v0.2.5
require sigs.k8s.io/cluster-api-addon-provider-helm v0.2.6

require (
github.com/beorn7/perks v1.0.1 // indirect
Expand Down Expand Up @@ -45,7 +45,7 @@ require (
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
Expand All @@ -61,7 +61,7 @@ require (
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
sigs.k8s.io/cluster-api v1.8.1 // indirect
sigs.k8s.io/cluster-api v1.8.4 // indirect
sigs.k8s.io/controller-runtime v0.18.5 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
24 changes: 12 additions & 12 deletions hack/third-party/caaph/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
Expand Down Expand Up @@ -72,10 +72,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo=
github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down Expand Up @@ -131,8 +131,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down Expand Up @@ -181,10 +181,10 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.8.1 h1:OA3w1CjCmXXXDL7aY3WDe+seL0mdFVJX1K5mZwqKbDE=
sigs.k8s.io/cluster-api v1.8.1/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
sigs.k8s.io/cluster-api-addon-provider-helm v0.2.5 h1:SZMWg5CvQ2jTI5+kinwbfIWdXg4TlQJeTY3E2d3tsdI=
sigs.k8s.io/cluster-api-addon-provider-helm v0.2.5/go.mod h1:rKbgOX2X70qg3vblOMAQSXSqYNjCdGMto1gS0DqxUxg=
sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs=
sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
sigs.k8s.io/cluster-api-addon-provider-helm v0.2.6 h1:KF3cXByS4f1COsQGOzdyEMxgCjxD3DMd54JS++pFZUw=
sigs.k8s.io/cluster-api-addon-provider-helm v0.2.6/go.mod h1:DojwirXChZbawC8XmdPdNdU2KobvCa2D2NECb2Zlnv0=
sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down

0 comments on commit 36a0378

Please sign in to comment.