Skip to content

Commit 8b336dc

Browse files
build(deps): Bump github.com/fluxcd/helm-controller/api from 0.28.1 to 0.32.2 (#69)
Bumps [github.com/fluxcd/helm-controller/api](https://github.com/fluxcd/helm-controller) from 0.28.1 to 0.32.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/fluxcd/helm-controller/releases">github.com/fluxcd/helm-controller/api's releases</a>.</em></p> <blockquote> <h2>v0.32.2</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.32.1</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.32.0</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.31.2</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.31.1</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.31.0</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.30.0</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> <h2>v0.29.0</h2> <p><a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">CHANGELOG</a></p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/fluxcd/helm-controller/blob/main/CHANGELOG.md">github.com/fluxcd/helm-controller/api's changelog</a>.</em></p> <blockquote> <h2>0.32.2</h2> <p><strong>Release date:</strong> 2023-04-13</p> <p>This prerelease comes with a bug fix for a nil pointer deref that could occur when drift detection was enabled.</p> <p>In addition, it updates Helm to <code>v3.11.3</code>, which includes two fixes for Go routine leaks.</p> <p>Fixes:</p> <ul> <li>Fix nil pointer deref during diff attempt <a href="https://redirect.github.com/fluxcd/helm-controller/pull/672">#672</a></li> <li>Update Helm to v3.11.3 <a href="https://redirect.github.com/fluxcd/helm-controller/pull/673">#673</a></li> </ul> <h2>0.32.1</h2> <p><strong>Release date:</strong> 2023-04-03</p> <p>This prerelease comes with a bug fix in HelmRelease related to the <code>.spec.chart.metadata</code> field which wasn't truly optional, leading to empty value assignment even when it wasn't set.</p> <p>Fixes:</p> <ul> <li>Fix chart metadata by making it truly optional <a href="https://redirect.github.com/fluxcd/helm-controller/pull/665">#665</a></li> </ul> <h2>0.32.0</h2> <p><strong>Release date:</strong> 2023-03-31</p> <p>This prerelease comes with a number of new features and improvements, and solves a long-standing issue with the patching of the HelmRelease status.</p> <h3>Highlights</h3> <h4>Management of HelmChart labels and annotations</h4> <p>The HelmRelease now supports the definition of a set of labels and annotations using <code>.spec.chart.metadata.labels</code> and <code>.spec.chart.metadata.annotations</code>, which will be applied to the HelmChart created by the controller.</p> <h4>Sharding</h4> <p>The controller can now be configured with <code>--watch-label-selector</code>, after which only HelmRelease objects with this label will be reconciled by the controller.</p> <p>This allows for horizontal scaling, where the controller can be deployed</p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/fluxcd/helm-controller/commit/d1cc2fea6e4dd68c81a265d912e4e67609592607"><code>d1cc2fe</code></a> Merge pull request <a href="https://redirect.github.com/fluxcd/helm-controller/issues/674">#674</a> from fluxcd/release-0.32.2</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/5c02db72bf8b9f891c1987c36f37280d13d97533"><code>5c02db7</code></a> Release v0.32.2</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/53c461f4782f20ab6853b1197ca526760cb626a5"><code>53c461f</code></a> Merge pull request <a href="https://redirect.github.com/fluxcd/helm-controller/issues/673">#673</a> from fluxcd/update-helm</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/d1c9e7c3cef33b26a2699d5b95bffd3d5b6cfb57"><code>d1c9e7c</code></a> Update Helm to v3.11.3</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/464a084bd058599682caec0ba64d7ed8c6100d1e"><code>464a084</code></a> Merge pull request <a href="https://redirect.github.com/fluxcd/helm-controller/issues/668">#668</a> from fluxcd/dependabot/go_modules/github.com/docker/d...</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/724090517e8f9e25d549f0bde1254a76c7af61f4"><code>7240905</code></a> build(deps): bump github.com/docker/docker</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/96a17efdef859fade59a846197cb3f05c6e848d0"><code>96a17ef</code></a> Merge pull request <a href="https://redirect.github.com/fluxcd/helm-controller/issues/672">#672</a> from fluxcd/fix-drift-nil-deref</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/32b5d7ec1b4b1b478684df9bde9109ce3c2cd9b9"><code>32b5d7e</code></a> Fix nil pointer deref during diff attempt</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/8448b1dec11abe5926ac409f05587faf0da59b51"><code>8448b1d</code></a> Merge pull request <a href="https://redirect.github.com/fluxcd/helm-controller/issues/666">#666</a> from fluxcd/release-0.32.1</li> <li><a href="https://github.com/fluxcd/helm-controller/commit/692a6f545bc707e3ea5b3686cd29a0ebec36b963"><code>692a6f5</code></a> Release v0.32.1</li> <li>Additional commits viewable in <a href="https://github.com/fluxcd/helm-controller/compare/v0.28.1...v0.32.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/fluxcd/helm-controller/api&package-manager=go_modules&previous-version=0.28.1&new-version=0.32.2)](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 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <[email protected]>
1 parent b82996e commit 8b336dc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module github.com/d2iq-labs/capi-runtime-extensions
66
go 1.20
77

88
require (
9-
github.com/fluxcd/helm-controller/api v0.28.1
9+
github.com/fluxcd/helm-controller/api v0.32.2
1010
github.com/fluxcd/pkg/apis/meta v1.0.0
1111
github.com/fluxcd/source-controller/api v0.33.0
1212
github.com/onsi/ginkgo/v2 v2.9.2
@@ -27,7 +27,7 @@ require (
2727
github.com/coredns/corefile-migration v1.0.20 // indirect
2828
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2929
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
30-
github.com/fluxcd/pkg/apis/kustomize v0.7.0 // indirect
30+
github.com/fluxcd/pkg/apis/kustomize v1.0.0 // indirect
3131
github.com/go-logr/zapr v1.2.3 // indirect
3232
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3333
github.com/google/go-github/v48 v48.2.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJ
119119
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
120120
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
121121
github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
122-
github.com/fluxcd/helm-controller/api v0.28.1 h1:2qjZymRAbl/OqId2lpKCzuleKhId34X1zQ0rcPlMKFQ=
123-
github.com/fluxcd/helm-controller/api v0.28.1/go.mod h1:/qCtlP718rveiAL7Mova4fGAk0aZv2qyYQn87zcUNhs=
122+
github.com/fluxcd/helm-controller/api v0.32.2 h1:ETkZmMEHY/qu6a9AjP6en35WrpN7NnVmhOe7IvOB7jE=
123+
github.com/fluxcd/helm-controller/api v0.32.2/go.mod h1:xzQgNoaPOg77zFUqvnaX0Fn3lPA3iGDLoz8q4wiEyLA=
124124
github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
125125
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
126-
github.com/fluxcd/pkg/apis/kustomize v0.7.0 h1:X2htBmJ91nGYv4d93gin665MFWKNGiNwUiZ08/Zz0hY=
127-
github.com/fluxcd/pkg/apis/kustomize v0.7.0/go.mod h1:Mu+KdktsEKWA4l/33CZdY5lB4hz51mqfcLzBZSwAqVg=
126+
github.com/fluxcd/pkg/apis/kustomize v1.0.0 h1:5T2b/mRZiGWtP7fvSU8gZOApIc06H6SdLX3MlsE6LRo=
127+
github.com/fluxcd/pkg/apis/kustomize v1.0.0/go.mod h1:XaDYlKxrf9D2zZWcZ0BnSIqGtcm8mdNtJGzZWYjCnQo=
128128
github.com/fluxcd/pkg/apis/meta v1.0.0 h1:i9IGHd/VNEZELX7mepkiYFbJxs2J5znaB4cN9z2nPm8=
129129
github.com/fluxcd/pkg/apis/meta v1.0.0/go.mod h1:04ZdpZYm1x+aL93K4daNHW1UX6E8K7Gyf5za9OhrE+U=
130130
github.com/fluxcd/source-controller/api v0.33.0 h1:NZYU3+MNf9puyrTbBa7AJbBDlN7tmt0uw8lyye++5fE=

pkg/addons/fluxhelmrelease/cni.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func calicoHelmReleaseForCluster(cluster *clusterv1.Cluster) *fluxhelmv2beta1.He
114114
}},
115115
},
116116
Spec: fluxhelmv2beta1.HelmReleaseSpec{
117-
KubeConfig: &fluxhelmv2beta1.KubeConfig{
117+
KubeConfig: &meta.KubeConfigReference{
118118
SecretRef: meta.SecretKeyReference{
119119
Name: fmt.Sprintf("%s-kubeconfig", cluster.Name),
120120
Key: "value",

0 commit comments

Comments
 (0)