Merge pull request #3565 from fluxcd/release/1.24.2

Release 1.24.2
fluxcd · Nov 2, 2021 · 603cb67 · 603cb67
2 parents 13b3e66 + 62675b3
commit 603cb67
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,24 @@
 > requests](https://github.com/fluxcd/toolkit/discussions) for Flux v2
 > and Toolkit components.
 
+## 1.24.2 (2021-11-02)
+
+This release updates the behavior of the dynamic client logger to eliminate the
+needless emission of some especially noisy and unhelpful deprecation warnings.
+
+This release also includes a base image upgrade of the Alpine 3.14.2 upstream
+that mitigates several CVE warnings from dependencies like nettle and libcurl.
+
+### Fixes
+
+- Suppress deprecation warnings [fluxcd/flux#3558][]
+
+### Thanks
+
+Thanks to @dimbleby, @squaremo, and @kingdonb for their contributions to this release.
+
+[fluxcd/flux#3558]: https://github.com/fluxcd/flux/pull/3558
+
 ## 1.24.1 (2021-09-08)
 
 This release fixes an issue when Docker Hub rate limit is not properly handled

diff --git a/chart/flux/CHANGELOG.md b/chart/flux/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.11.2 (2021-09-10)
+
+Single-tenant Flux users reported a regression that affected automated image
+updates in certain configurations from this chart fix, so it is reverted to
+preserve backwards compatibility.
+
+### Fixes
+
+ - Revert [#3482](https://github.com/fluxcd/flux/pull/3482) (undo chart-1.11.0)
+   [fluxcd/flux#3553](https://github.com/fluxcd/flux/pull/3553)
+
+## 1.11.1 (2021-09-09)
+
+### Improvements
+
+ - Updated Flux to `1.24.1`
+   [fluxcd/flux#3551](https://github.com/fluxcd/flux/pull/3551)
+
 ## 1.11.0 (2021-08-20)
 
 ### Fixes

diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "1.24.0"
-version: 1.11.0
+appVersion: "1.24.1"
+version: 1.11.2
 kubeVersion: ">=1.16.0-0"
 name: flux
 description: Flux is a tool that automatically ensures that the state of a cluster matches what is specified in version control

diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
@@ -195,7 +195,7 @@ spec:
               name: {{ .Values.env.secretName }}
           {{- end }}
           args:
-          {{- if and (not .Values.clusterRole.create) ( .Values.allowedNamespaces) }}
+          {{- if not .Values.clusterRole.create }}
           - --k8s-allow-namespace={{ join "," (append .Values.allowedNamespaces .Release.Namespace) }}
           {{- end}}
           {{- if .Values.defaultNamespace }}

diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
@@ -9,7 +9,7 @@ logFormat: fmt
 
 image:
   repository: docker.io/fluxcd/flux
-  tag: 1.24.0
+  tag: 1.24.1
   pullPolicy: IfNotPresent
   pullSecret:
 

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
@@ -436,7 +436,12 @@ func main() {
 			logger.Log("err", err)
 			os.Exit(1)
 		}
-		dynamicClientset, err := k8sclientdynamic.NewForConfig(restClientConfig)
+
+		// The dynamic client gets deprecation warnings, which are not useful:
+		// see <https://github.com/fluxcd/flux/issues/3554>.  Suppress them.
+		noWarningsRestClientConfig := rest.CopyConfig(restClientConfig)
+		noWarningsRestClientConfig.WarningHandler = rest.NoWarnings{}
+		dynamicClientset, err := k8sclientdynamic.NewForConfig(noWarningsRestClientConfig)
 		if err != nil {
 			logger.Log("err", err)
 			os.Exit(1)

diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
@@ -66,7 +66,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/fluxcd/flux/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/flux:1.24.1
+        image: docker.io/fluxcd/flux:1.24.2
         imagePullPolicy: IfNotPresent
         resources:
           requests:

diff --git a/pkg/install/generated_templates.gogen.go b/pkg/install/generated_templates.gogen.go
diff --git a/pkg/install/templates/flux-deployment.yaml.tmpl b/pkg/install/templates/flux-deployment.yaml.tmpl
@@ -66,7 +66,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/fluxcd/flux/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/flux:1.24.1
+        image: docker.io/fluxcd/flux:1.24.2
         imagePullPolicy: IfNotPresent
         resources:
           requests: