Skip to content

Commit

Permalink
Update Flux CLI and controller projects to latest (#2903)
Browse files Browse the repository at this point in the history
* Bump fluxcd/flux2 to latest release

* Bump fluxcd/helm-controller to latest release

* Bump fluxcd/kustomize-controller to latest release

* Bump fluxcd/notification-controller to latest release

* Bump fluxcd/source-controller to latest release

* Update checksums and patches for Flux projects

---------

Co-authored-by: EKS Distro PR Bot <[email protected]>
  • Loading branch information
abhay-krishna and eks-distro-pr-bot authored Feb 8, 2024
1 parent 32959bc commit ba60037
Show file tree
Hide file tree
Showing 24 changed files with 167 additions and 350 deletions.
14 changes: 7 additions & 7 deletions UPSTREAM_PROJECTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,23 @@ projects:
repos:
- name: flux2
versions:
- tag: v2.2.2
- tag: v2.2.3
go_version: "1.20"
- name: helm-controller
versions:
- tag: v0.37.2
go_version: "1.20"
- tag: v0.37.4
go_version: "1.21"
- name: kustomize-controller
versions:
- tag: v1.2.1
go_version: "1.20"
- tag: v1.2.2
go_version: "1.21"
- name: notification-controller
versions:
- tag: v1.2.3
- tag: v1.2.4
go_version: "1.21"
- name: source-controller
versions:
- tag: v1.2.3
- tag: v1.2.4
go_version: "1.21"
- org: goharbor
repos:
Expand Down
4 changes: 2 additions & 2 deletions projects/fluxcd/flux2/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
584ea3ed9d91ce05d624450711dd7d96767f6e0025bf3cd8029d3b48f3ca2e28 _output/bin/flux2/linux-amd64/flux
e860a407b557a1497f829da1d779779a88d6a497af00cc3960aed4be9d6af133 _output/bin/flux2/linux-arm64/flux
c831de059c6abe3d4ca648f46b90598b2a2c18088cd91c61c8f57c664c1b91d8 _output/bin/flux2/linux-amd64/flux
500d403767795d40f359c5ffcbd1ee6d11aae45fd7d03d63562ad3e1c5d74d38 _output/bin/flux2/linux-arm64/flux
2 changes: 1 addition & 1 deletion projects/fluxcd/flux2/GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.2.2
v2.2.3
4 changes: 2 additions & 2 deletions projects/fluxcd/flux2/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **Flux**
![Version](https://img.shields.io/badge/version-v2.2.2-blue)
![Version](https://img.shields.io/badge/version-v2.2.3-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.
Expand All @@ -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.2.2](https://github.com/fluxcd/flux2/compare/v2.1.2...v2.2.1). Check the `build` target for
ex: [v2.1.2 compared to v2.2.3](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
Expand Down

This file was deleted.

81 changes: 47 additions & 34 deletions projects/fluxcd/helm-controller/ATTRIBUTION.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@

** github.com/containerd/containerd; version v1.7.6 --
** github.com/containerd/containerd; version v1.7.11 --
https://github.com/containerd/containerd

** github.com/containerd/log; version v0.1.0 --
https://github.com/containerd/log

** github.com/docker/cli/cli/config; version v24.0.7+incompatible --
https://github.com/docker/cli

Expand All @@ -20,34 +23,34 @@ https://github.com/docker/go-metrics
** github.com/docker/go-units; version v0.5.0 --
https://github.com/docker/go-units

** github.com/fluxcd/cli-utils/pkg; version v0.36.0-flux.2 --
** github.com/fluxcd/cli-utils/pkg; version v0.36.0-flux.3 --
https://github.com/fluxcd/cli-utils

** github.com/fluxcd/helm-controller; version v0.37.2 --
** github.com/fluxcd/helm-controller; version v0.37.4 --
https://github.com/fluxcd/helm-controller

** github.com/fluxcd/helm-controller/api/v2beta2; version v0.37.2 --
** github.com/fluxcd/helm-controller/api/v2beta2; version v0.37.4 --
https://github.com/fluxcd/helm-controller/api

** github.com/fluxcd/pkg/apis/acl; version v0.1.0 --
https://github.com/fluxcd/pkg/apis/acl

** github.com/fluxcd/pkg/apis/event/v1beta1; version v0.6.0 --
** github.com/fluxcd/pkg/apis/event/v1beta1; version v0.7.0 --
https://github.com/fluxcd/pkg/apis/event

** github.com/fluxcd/pkg/apis/kustomize; version v1.2.0 --
** github.com/fluxcd/pkg/apis/kustomize; version v1.3.0 --
https://github.com/fluxcd/pkg/apis/kustomize

** github.com/fluxcd/pkg/apis/meta; version v1.2.0 --
** github.com/fluxcd/pkg/apis/meta; version v1.3.0 --
https://github.com/fluxcd/pkg/apis/meta

** github.com/fluxcd/pkg/runtime; version v0.43.3 --
** github.com/fluxcd/pkg/runtime; version v0.44.1 --
https://github.com/fluxcd/pkg/runtime

** github.com/fluxcd/pkg/ssa; version v0.35.0 --
** github.com/fluxcd/pkg/ssa; version v0.36.0 --
https://github.com/fluxcd/pkg/ssa

** github.com/fluxcd/source-controller/api/v1; version v1.2.2 --
** github.com/fluxcd/source-controller/api/v1; version v1.2.4 --
https://github.com/fluxcd/source-controller/api

** github.com/go-logr/logr; version v1.3.0 --
Expand Down Expand Up @@ -116,7 +119,7 @@ https://github.com/opencontainers/go-digest/blake3
** github.com/opencontainers/image-spec/specs-go; version v1.1.0-rc5 --
https://github.com/opencontainers/image-spec

** github.com/prometheus/client_golang/prometheus; version v1.17.0 --
** github.com/prometheus/client_golang/prometheus; version v1.18.0 --
https://github.com/prometheus/client_golang

** github.com/prometheus/client_model/go; version v0.5.0 --
Expand All @@ -140,19 +143,25 @@ https://github.com/xeipuuv/gojsonreference
** github.com/xeipuuv/gojsonschema; version v1.2.0 --
https://github.com/xeipuuv/gojsonschema

** go.opentelemetry.io/otel; version v1.14.0 --
** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.45.0 --
https://github.com/open-telemetry/opentelemetry-go-contrib

** go.opentelemetry.io/otel; version v1.19.0 --
https://github.com/open-telemetry/opentelemetry-go

** go.opentelemetry.io/otel/trace; version v1.14.0 --
** go.opentelemetry.io/otel/metric; version v1.19.0 --
https://github.com/open-telemetry/opentelemetry-go

** go.opentelemetry.io/otel/trace; version v1.19.0 --
https://github.com/open-telemetry/opentelemetry-go

** gomodules.xyz/jsonpatch/v2; version v2.4.0 --
https://github.com/gomodules/jsonpatch

** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20230525234030-28d5490b6b19 --
** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20230711160842-782d3b101e98 --
https://github.com/googleapis/go-genproto

** google.golang.org/grpc; version v1.56.3 --
** google.golang.org/grpc; version v1.58.3 --
https://github.com/grpc/grpc-go

** gopkg.in/yaml.v2; version v2.4.0 --
Expand All @@ -161,25 +170,25 @@ https://gopkg.in/yaml.v2
** helm.sh/helm/v3; version v3.13.3 --
https://github.com/helm/helm

** k8s.io/api; version v0.28.4 --
** k8s.io/api; version v0.28.6 --
https://github.com/kubernetes/api

** k8s.io/apiextensions-apiserver/pkg; version v0.28.4 --
** k8s.io/apiextensions-apiserver/pkg; version v0.28.6 --
https://github.com/kubernetes/apiextensions-apiserver

** k8s.io/apimachinery/pkg; version v0.28.4 --
** k8s.io/apimachinery/pkg; version v0.28.6 --
https://github.com/kubernetes/apimachinery

** k8s.io/apiserver/pkg/endpoints/deprecation; version v0.28.4 --
** k8s.io/apiserver/pkg/endpoints/deprecation; version v0.28.6 --
https://github.com/kubernetes/apiserver

** k8s.io/cli-runtime/pkg; version v0.28.4 --
** k8s.io/cli-runtime/pkg; version v0.28.6 --
https://github.com/kubernetes/cli-runtime

** k8s.io/client-go; version v0.28.4 --
** k8s.io/client-go; version v0.28.6 --
https://github.com/kubernetes/client-go

** k8s.io/component-base; version v0.28.4 --
** k8s.io/component-base; version v0.28.6 --
https://github.com/kubernetes/component-base

** k8s.io/klog/v2; version v2.110.1 --
Expand All @@ -191,7 +200,7 @@ https://github.com/kubernetes/kube-openapi
** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231206194836-bf4651e18aa8 --
https://github.com/kubernetes/kube-openapi

** k8s.io/kubectl/pkg; version v0.28.4 --
** k8s.io/kubectl/pkg; version v0.28.6 --
https://github.com/kubernetes/kubectl

** k8s.io/utils; version v0.0.0-20231127182322-b307cd553661 --
Expand Down Expand Up @@ -911,7 +920,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** github.com/google/uuid; version v1.4.0 --
** github.com/google/uuid; version v1.5.0 --
https://github.com/google/uuid

Copyright (c) 2009,2014 Google Inc. All rights reserved.
Expand Down Expand Up @@ -1047,28 +1056,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
** github.com/liggitt/tabwriter; version v0.0.0-20181228230101-89fcab3d43de --
https://github.com/liggitt/tabwriter

** golang.org/go; version go1.20.13 --
** golang.org/go; version go1.21.6 --
https://github.com/golang/go

** golang.org/x/crypto; version v0.17.0 --
** golang.org/x/crypto; version v0.18.0 --
https://golang.org/x/crypto

** golang.org/x/exp/maps; version v0.0.0-20231206192017-f3f8817b8deb --
https://golang.org/x/exp

** golang.org/x/net; version v0.19.0 --
** golang.org/x/net; version v0.20.0 --
https://golang.org/x/net

** golang.org/x/oauth2; version v0.15.0 --
** golang.org/x/oauth2; version v0.16.0 --
https://golang.org/x/oauth2

** golang.org/x/sync; version v0.5.0 --
** golang.org/x/sync; version v0.6.0 --
https://golang.org/x/sync

** golang.org/x/sys; version v0.15.0 --
** golang.org/x/sys; version v0.16.0 --
https://golang.org/x/sys

** golang.org/x/term; version v0.15.0 --
** golang.org/x/term; version v0.16.0 --
https://golang.org/x/term

** golang.org/x/text; version v0.14.0 --
Expand All @@ -1077,10 +1086,10 @@ https://golang.org/x/text
** golang.org/x/time/rate; version v0.5.0 --
https://golang.org/x/time

** k8s.io/apimachinery/third_party/forked/golang; version v0.28.4 --
** k8s.io/apimachinery/third_party/forked/golang; version v0.28.6 --
https://github.com/kubernetes/apimachinery

** k8s.io/client-go/third_party/forked/golang/template; version v0.28.4 --
** k8s.io/client-go/third_party/forked/golang/template; version v0.28.6 --
https://github.com/kubernetes/client-go

Copyright (c) 2009 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -1572,6 +1581,10 @@ Copyright (c) 2015 Exponent Labs LLC
https://github.com/fatih/color
Copyright (c) 2013 Fatih Arslan

** github.com/felixge/httpsnoop; version v1.0.3 --
https://github.com/felixge/httpsnoop
Copyright (c) 2016 Felix Geisendörfer ([email protected])

** github.com/go-errors/errors; version v1.5.1 --
https://github.com/go-errors/errors
Copyright (c) 2015 Conrad Irwin <[email protected]>
Expand Down Expand Up @@ -1664,7 +1677,7 @@ Copyright (c) [2015] [go-gitignore]
https://github.com/morikuni/aec
Copyright (c) 2016 Taihei Morikuni

** github.com/onsi/gomega; version v1.30.0 --
** github.com/onsi/gomega; version v1.31.1 --
https://github.com/onsi/gomega
Copyright (c) 2013-2014 Onsi Fakhouri

Expand Down
4 changes: 2 additions & 2 deletions projects/fluxcd/helm-controller/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eec5833c6e8e82e08b2cfc4bbb1a1d45299038a8421c659785d90a249c5cba79 _output/bin/helm-controller/linux-amd64/helm-controller
61e28b483365fc4bdf53daafda41e2ebc2c2341b96401050908bafc5aa2008a4 _output/bin/helm-controller/linux-arm64/helm-controller
217ccaf706706b88f399319e68d0545c0ad13ef0848044f852b98d4d51a03c73 _output/bin/helm-controller/linux-amd64/helm-controller
5edd2ad765928d65f62692c90341ad0556fff79d9da90054ff66aff619d07913 _output/bin/helm-controller/linux-arm64/helm-controller
2 changes: 1 addition & 1 deletion projects/fluxcd/helm-controller/GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.37.2
v0.37.4
2 changes: 1 addition & 1 deletion projects/fluxcd/helm-controller/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20
1.21
2 changes: 1 addition & 1 deletion projects/fluxcd/helm-controller/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **Helm Controller**
![Version](https://img.shields.io/badge/version-v0.37.2-blue)
![Version](https://img.shields.io/badge/version-v0.37.4-blue)
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiS045T05yUXhCRzNPeXZwczkwcjgrbm8wOWJmSXZ6dll3eHBlVTV3bERUSlhadlRyOGE1Q1AzeWpEQTlvN2RISG9MNnMrMGRmOG1FZ2N2d0Nxc0l0b2UwPSIsIml2UGFyYW1ldGVyU3BlYyI6IlpJMTJ1cUxhdzc4bWlqNFUiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)

The [helm-controller](https://github.com/fluxcd/helm-controller) is a Kubernetes operator that allows users to declaratively manage Helm chart releases. The desired state of a Helm release is described through a Kubernetes Custom Resource named HelmRelease. Based on the creation, mutation or removal of a HelmRelease resource in the cluster, Helm actions are performed by the operator.
Expand Down
Loading

0 comments on commit ba60037

Please sign in to comment.