diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 8e8a03222c..285d3f7bfc 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -105,7 +105,7 @@ projects: repos: - name: flux2 versions: - - tag: v2.8.3 + - tag: v2.8.5 go_version: "1.26" - name: helm-controller versions: diff --git a/projects/fluxcd/flux2/ATTRIBUTION.txt b/projects/fluxcd/flux2/ATTRIBUTION.txt index 79548997b9..95e7385e60 100644 --- a/projects/fluxcd/flux2/ATTRIBUTION.txt +++ b/projects/fluxcd/flux2/ATTRIBUTION.txt @@ -71,7 +71,7 @@ https://github.com/distribution/distribution ** github.com/fluxcd/cli-utils/pkg; version v0.37.2-flux.1 -- https://github.com/fluxcd/cli-utils -** github.com/fluxcd/flux2/v2; version v2.8.3 -- +** github.com/fluxcd/flux2/v2; version v2.8.5 -- https://github.com/fluxcd/flux2/v2 ** github.com/fluxcd/go-git-providers; version v0.26.0 -- @@ -86,10 +86,10 @@ https://github.com/fluxcd/image-automation-controller/api ** github.com/fluxcd/image-reflector-controller/api/v1; version v1.1.1 -- https://github.com/fluxcd/image-reflector-controller/api -** github.com/fluxcd/kustomize-controller/api/v1; version v1.8.2 -- +** github.com/fluxcd/kustomize-controller/api/v1; version v1.8.3 -- https://github.com/fluxcd/kustomize-controller/api -** github.com/fluxcd/notification-controller/api/v1; version v1.8.2 -- +** github.com/fluxcd/notification-controller/api/v1; version v1.8.3 -- https://github.com/fluxcd/notification-controller/api ** github.com/fluxcd/pkg/apis/acl; version v0.9.0 -- @@ -116,7 +116,7 @@ https://github.com/fluxcd/pkg/envsubst ** github.com/fluxcd/pkg/git; version v0.43.1 -- https://github.com/fluxcd/pkg/git -** github.com/fluxcd/pkg/kustomize; version v1.27.1 -- +** github.com/fluxcd/pkg/kustomize; version v1.27.2 -- https://github.com/fluxcd/pkg/kustomize ** github.com/fluxcd/pkg/oci; version v0.60.1 -- @@ -137,7 +137,7 @@ https://github.com/fluxcd/pkg/ssh ** github.com/fluxcd/pkg/version; version v0.12.0 -- https://github.com/fluxcd/pkg/version -** github.com/fluxcd/source-controller/api/v1; version v1.8.1 -- +** github.com/fluxcd/source-controller/api/v1; version v1.8.2 -- https://github.com/fluxcd/source-controller/api ** github.com/fluxcd/source-watcher/api/v2/v1beta1; version v2.1.1 -- diff --git a/projects/fluxcd/flux2/CHECKSUMS b/projects/fluxcd/flux2/CHECKSUMS index b6ac65b6e5..45a8716da2 100644 --- a/projects/fluxcd/flux2/CHECKSUMS +++ b/projects/fluxcd/flux2/CHECKSUMS @@ -1,2 +1,2 @@ -e32b32aa7ce8018b2012fc001020a46062765648997272dcde68d974e74118d3 _output/bin/flux2/linux-amd64/flux -c23fd9bd79aa8326eaee2223c1845be22339a58cd06645c3a96c728052d7d949 _output/bin/flux2/linux-arm64/flux +787d4ecf14a88dcc11b5555c607022a9d4b744376018ed05f0154542fefdc349 _output/bin/flux2/linux-amd64/flux +5db141124677533992eab8904c8732683a7ca366ff8885dc9c4b6088980edda7 _output/bin/flux2/linux-arm64/flux diff --git a/projects/fluxcd/flux2/GIT_TAG b/projects/fluxcd/flux2/GIT_TAG index 37bf031623..3f03d9f19a 100644 --- a/projects/fluxcd/flux2/GIT_TAG +++ b/projects/fluxcd/flux2/GIT_TAG @@ -1 +1 @@ -v2.8.3 +v2.8.5 diff --git a/projects/fluxcd/flux2/README.md b/projects/fluxcd/flux2/README.md index ddc37481df..d4840431d8 100644 --- a/projects/fluxcd/flux2/README.md +++ b/projects/fluxcd/flux2/README.md @@ -1,5 +1,5 @@ ## **Flux** -![Version](https://img.shields.io/badge/version-v2.8.3-blue) +![Version](https://img.shields.io/badge/version-v2.8.5-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiYzRDM0E2d3BGeHZNenB4aVdRY0RqMkhoMUZBdjVHdjZsTSsrVEdhVEw1Sy9DREIwRUlwSEx4MFpoUVBiK2grUnhyT2JodmNVWUVaemFGR2JTOWhkWC9VPSIsIml2UGFyYW1ldGVyU3BlYyI6Im1VckJkV25QbHdyc0hRbmgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Flux](https://github.com/fluxcd/flux2) is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories), and automating updates to configuration when new code is deployed. @@ -17,7 +17,7 @@ review carefully and if there are questions about changes necessary to eks-anywh and/or automatically update between eks-anywhere version reach out to @jiayiwang7 or @danbudris 1. Update the `GIT_TAG` file to have the new desired version based on the upstream release tags. 1. Compare the old tag to the new, looking specifically for Makefile changes. -ex: [v2.1.2 compared to v2.8.3](https://github.com/fluxcd/flux2/compare/v2.1.2...v2.2.1). Check the `build` target for +ex: [v2.1.2 compared to v2.8.5](https://github.com/fluxcd/flux2/compare/v2.1.2...v2.2.1). Check the `build` target for any build flag changes, tag changes, dependencies, etc. Check that the manifest target has not changed, this is called from our Makefile. 1. Verify the golang version has not changed. The version specified in `go.mod` seems to be kept up to date. There is also