Merge pull request #3572 from fluxcd/release/1.24.3

Release 1.24.3
fluxcd · Nov 24, 2021 · 27b83e1 · 27b83e1
2 parents 603cb67 + 9c5c7ac
commit 27b83e1
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,26 @@
 > requests](https://github.com/fluxcd/toolkit/discussions) for Flux v2
 > and Toolkit components.
 
+## 1.24.3 (2021-11-24)
+
+This release includes the [new host keys][github.blog-2021-09-01] for GitHub,
+changes effective on November 16, that could be important for users of Flux.
+
+This release also includes a base image upgrade to the Alpine 3.14.3 upstream
+that mitigates low and medium severity CVE warnings from the base image.
+
+### Fixes
+
+- Add fingerprints for new github.com host keys [fluxcd/flux#3571][]
+
+### Thanks
+
+Thanks to @kingdonb, @stefanprodan, @squaremo, and @hiddeco for their
+contributions to this release.
+
+[fluxcd/flux#3571]: https://github.com/fluxcd/flux/pull/3571
+[github.blog-2021-09-01]: https://github.blog/2021-09-01-improving-git-protocol-security-github/
+
 ## 1.24.2 (2021-11-02)
 
 This release updates the behavior of the dynamic client logger to eliminate the

diff --git a/chart/flux/CHANGELOG.md b/chart/flux/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.11.3 (2021-11-02)
+
+### Improvements
+
+ - Updated Flux to `1.24.2`
+   [fluxcd/flux#3565](https://github.com/fluxcd/flux/pull/3565)
+ - Update Memcached to `1.6.12`
+   [fluxcd/flux#3566](https://github.com/fluxcd/flux/pull/3566)
+
 ## 1.11.2 (2021-09-10)
 
 Single-tenant Flux users reported a regression that affected automated image

diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "1.24.1"
-version: 1.11.2
+appVersion: "1.24.2"
+version: 1.11.3
 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/values.yaml b/chart/flux/values.yaml
@@ -9,7 +9,7 @@ logFormat: fmt
 
 image:
   repository: docker.io/fluxcd/flux
-  tag: 1.24.1
+  tag: 1.24.2
   pullPolicy: IfNotPresent
   pullSecret:
 
@@ -208,7 +208,7 @@ memcached:
   enabled: true
   hostnameOverride:
   repository: memcached
-  tag: 1.6.10-alpine
+  tag: 1.6.12-alpine
   pullSecret:
   createClusterIP: true
   verbose: false

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.2
+        image: docker.io/fluxcd/flux:1.24.3
         imagePullPolicy: IfNotPresent
         resources:
           requests:

diff --git a/docker/known_hosts.sh b/docker/known_hosts.sh
@@ -46,9 +46,11 @@ diff - "$fingerprints" <<EOF
 2048 SHA256:ohD8VZEXGWo6Ez8GSEJQ9WpafgLFsOfLOtGGQCQo6Og ssh.dev.azure.com (RSA)
 2048 SHA256:ohD8VZEXGWo6Ez8GSEJQ9WpafgLFsOfLOtGGQCQo6Og vs-ssh.visualstudio.com (RSA)
 2048 SHA256:zzXQOXSRBEiUtuE8AikJYKwbHaxvSc0ojez9YXaGp1A bitbucket.org (RSA)
+256 SHA256:+DiY3wvvV6TuJJhbpZisF/zLDA0zPMSvHdkr4UvCOqU github.com (ED25519)
 256 SHA256:AGvEpqYNMqsRNIviwyk4J4HM0lEylomDBKOWZsBn434 [source.developers.google.com]:2022 (ECDSA)
 256 SHA256:HbW3g8zUjNSksFbqTiUWPWg2Bq1x8xdGUrliXFzSnUw gitlab.com (ECDSA)
 256 SHA256:eUXGGm1YGsMAS7vkcx6JOJdOGHPem5gQp4taiCfCLB8 gitlab.com (ED25519)
+256 SHA256:p2QAMXNIC1TJYWeIOttrVc98/R1BUFWu3/LiyKgUfQM github.com (ECDSA)
 EOF
 
 }

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.2
+        image: docker.io/fluxcd/flux:1.24.3
         imagePullPolicy: IfNotPresent
         resources:
           requests: