Merge pull request #3544 from fluxcd/release/1.24.1

Release 1.24.1

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '28 4 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CHANGELOG.md

@@ -8,6 +8,32 @@
 > requests](https://github.com/fluxcd/toolkit/discussions) for Flux v2
 > and Toolkit components.
 
+## 1.24.1 (2021-09-08)
+
+This release fixes an issue when Docker Hub rate limit is not properly handled
+by Flux daemon as rate limiting. Docker Hub sends its rate limit warnings as an
+error that does not include the expected "429" Too Many Requests status code.
+
+This release also includes a base image upgrade to Alpine 3.14.2 that mitigates
+several CVE scan warnings in the base image related to openssl and libgcrypt.
+
+### Fixes
+
+- Adding Docker Hub rate limit condition message [fluxcd/flux#3543][]
+
+### Maintenance and documentation
+
+- Add CodeQL Security Scanning [fluxcd/flux#3446][]
+- Upgrade alpine:3.14.1 to alpine:3.14.2 [fluxcd/flux#3545][]
+
+### Thanks
+
+Thanks to @fdpeiter and @kingdonb for their contributions to this release.
+
+[fluxcd/flux#3543]: https://github.com/fluxcd/flux/pull/3543
+[fluxcd/flux#3446]: https://github.com/fluxcd/flux/pull/3446
+[fluxcd/flux#3545]: https://github.com/fluxcd/flux/pull/3545
+
 ## 1.24.0 (2021-08-20)
 
 This minor release addresses some error cases that may be encountered when an

chart/flux/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "1.23.2"
-version: 1.10.2
+appVersion: "1.24.0"
+version: 1.11.0
 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

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

docker/Dockerfile.flux

@@ -1,4 +1,4 @@
-FROM alpine:3.14.1
+FROM alpine:3.14
 
 WORKDIR /home/flux
 

docker/Dockerfile.fluxctl

@@ -1,4 +1,4 @@
-FROM alpine:3.14.1
+FROM alpine:3.14
 
 WORKDIR /home/flux
 

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

pkg/registry/cache/repocachemanager.go

@@ -209,7 +209,7 @@ updates:
 					return
 				}
 				switch {
-				case strings.Contains(err.Error(), "429"):
+				case strings.Contains(err.Error(), "429"), strings.Contains(err.Error(), "toomanyrequests"):
 					// abort the image tags fetching if we've been rate limited
 					warnAboutRateLimit.Do(func() {
 						c.logger.Log("warn", "aborting image tag fetching due to rate limiting, will try again later")