Merge branch 'fluxcd:main' into download-locally-controller-gen-and-t…

…estenv

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## 0.14.1
+
+**Release date:** 2021-12-09
+
+This prerelease updates the dependency on the source-controller to `v0.19.2`,
+which includes the fixes from source-controller `v0.19.1`, and changes the
+length of the SHA hex added to the SemVer metadata of a `HelmChart`. Refer to
+the source-controller [changelog](https://github.com/fluxcd/source-controller/blob/main/CHANGELOG.md#0191)
+for more information.
+
+:warning: There have been additional user reports about charts complaining
+about a `+` character in the label:
+
+```
+metadata.labels: Invalid value: "1.2.3+a4303ff0f6fb560ea032f9981c6bd7c7f146d083.1": a valid label must be an empty string or consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyValue', or 'my_value', or '12345', regex used for validation is '(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?')
+```
+
+Given the [Helm chart best practices mention to replace this character with a
+`_`](https://helm.sh/docs/chart_best_practices/conventions/#version-numbers),
+we encourage you to patch this in your (upstream) chart.
+Pseudo example using [template functions](https://helm.sh/docs/chart_template_guide/function_list/):
+
+```yaml
+{{- replace "+" "_" .Chart.Version | trunc 63 }}
+```
+
+In addition, the dependency on `github.com/opencontainers/runc` is updated to
+`v1.0.3` to please static security analysers and fix any warnings for
+CVE-2021-43784.
+
+Improvements:
+- Update kustomize packages to Kustomize v4.4.1
+  [#374](https://github.com/fluxcd/helm-controller/pull/374)
+- Update dependencies (fix CVE-2021-43784)
+  [#376](https://github.com/fluxcd/helm-controller/pull/376)
+- Update source-controller to v0.19.2
+  [#377](https://github.com/fluxcd/helm-controller/pull/377)
+
+Fixes:
+- docs/spec: Fix reconcile annotation key in example
+  [#371](https://github.com/fluxcd/helm-controller/pull/371)
+
 ## 0.14.0
 
 **Release date:** 2021-11-23

config/default/kustomization.yaml

@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: helm-system
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v0.19.0/source-controller.crds.yaml
-- https://github.com/fluxcd/source-controller/releases/download/v0.19.0/source-controller.deployment.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.19.2/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.19.2/source-controller.deployment.yaml
 - ../crd
 - ../rbac
 - ../manager

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ resources:
 images:
   - name: fluxcd/helm-controller
     newName: fluxcd/helm-controller
-    newTag: v0.14.0
+    newTag: v0.14.1

go.mod

@@ -10,11 +10,11 @@ require (
 	github.com/bugsnag/panicwrap v1.3.4 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
-	github.com/fluxcd/helm-controller/api v0.14.0
+	github.com/fluxcd/helm-controller/api v0.14.1
 	github.com/fluxcd/pkg/apis/kustomize v0.3.0
 	github.com/fluxcd/pkg/apis/meta v0.10.1
 	github.com/fluxcd/pkg/runtime v0.12.2
-	github.com/fluxcd/source-controller/api v0.19.0
+	github.com/fluxcd/source-controller/api v0.19.2
 	github.com/garyburd/redigo v1.6.3 // indirect
 	github.com/go-logr/logr v0.4.0
 	github.com/gofrs/uuid v4.1.0+incompatible // indirect

go.sum

@@ -230,8 +230,8 @@ github.com/fluxcd/pkg/apis/meta v0.10.1 h1:zISenRlqNG7WK8TP3HxZTvv+1Z7JZOUIQvZrO
 github.com/fluxcd/pkg/apis/meta v0.10.1/go.mod h1:yUblM2vg+X8TE3A2VvJfdhkGmg+uqBlSPkLk7dxi0UM=
 github.com/fluxcd/pkg/runtime v0.12.2 h1:4iOpx2j/w15kNemDOnZrF6ugJ/rhSmRu7aI+xn23+BI=
 github.com/fluxcd/pkg/runtime v0.12.2/go.mod h1:tuWdqpWPhgjQvYrSnojdZ4plyU8DRU1NDzsfOhnzl2g=
-github.com/fluxcd/source-controller/api v0.19.0 h1:D4hc/ROhcl7iJdgeVhmM6B7WkDqwtQKnvpl04n+LcNg=
-github.com/fluxcd/source-controller/api v0.19.0/go.mod h1:rUqw0LmoCyGUoElmtLqHc8O35WAQUd8LdgdyDA+kNs4=
+github.com/fluxcd/source-controller/api v0.19.2 h1:+C1s9KslnkA/3SIfvEkFDIesaEpzLKFkumCUYOx5lz8=
+github.com/fluxcd/source-controller/api v0.19.2/go.mod h1:rUqw0LmoCyGUoElmtLqHc8O35WAQUd8LdgdyDA+kNs4=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=