Skip to content

[pull] main from fluxcd:main#34

Open
pull[bot] wants to merge 744 commits into
FoxAndDuckSoftware:mainfrom
fluxcd:main
Open

[pull] main from fluxcd:main#34
pull[bot] wants to merge 744 commits into
FoxAndDuckSoftware:mainfrom
fluxcd:main

Conversation

@pull

@pull pull Bot commented Sep 18, 2023

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added the ⤵️ pull label Sep 18, 2023
stefanprodan and others added 29 commits May 28, 2025 15:34
Update controller to OCIRepository v1 (GA)
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
(chore): adds commonAnnotations and commonLabels to kustomize

if applied, this commit will pass the common labels and annotations specified in postRenderers kustomization and which gets propagated to all resources

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): generates updated api-docs

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): adds common metadata to spec

HelmRelease postRenderer uses `CommonMetadata` struct from kustomize controller to have a common CRD specification usage across flux API types

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): update helm release post renderer

HelmRelease kustomize post renderer uses the CommonMetadata type from kustomize controller to propagate common labels and annotations across all resources. Labels are not propagated to `selector.matchLabels`

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): generates updated CRD and api docs

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): adds common metadata types

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): removes common metadata

removes the insertion of common metadata info in `Kustomize.Run()`

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): adds common-metadata types

this commit adds CommonMetadata to HelmRelease spec as an optional field and when used will run a helm postRenderer to add specified labels and annotations resources contained in helm template. The digest of common metadata is stored as ObservedCommonMetadataDigest in the resource status

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): common post-renderer

this commit combines common metadata rendering and origin labels rendering into common_renderer.go with re-usable methods for label transformer and annotation transformer. Precedence is given to origin labels rendering over common metadata rendering.

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): trigger upgrade on commonMetadata value changes

this commit ensures that when commonMetadata value has changed after install triggers an upgrade action to re-render the new commonMetadata values to the helm release. The digest of commonMetadata values are stored in .status.ObservedCommonMetadataDigest for release state out-of-sync detection.

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(fix): adheres to import ordering

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(fix): revert go mod updates

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): updates copyright headers

Co-authored-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Abhijith Ravindra <137736216+abhijith-darshan@users.noreply.github.com>

(chore): adds copyright headers

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): updates copyright headers

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): keep go mod in sync with upstream/main

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): adds common metadata documentation

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>

(chore): fix precedence of label application

This commit will ensure that OriginLabels run last so that it has a higher precedence over CommonMetadata.Labels

Signed-off-by: abhijith-darshan <abhijith.darshan@hotmail.com>
…otations

feat: adds CommonMetadata to HelmRelease postrenderer
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Use `reconcile.fluxcd.io/forceAt` annotation from fluxcd/pkg/apis/meta
As described at https://go.dev/wiki/Deprecated, the `Deprecated` comments shall start a new paragraph. This way, the deprecation is also visible to other tools like staticcheck and vscode.

Signed-off-by: Martin Hoffmann <hoffimar@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Move 'Deprecated' comments to own paragraph
Update kustomize from v5.6.0 to v5.7.0 for consistency across
FluxCD components, aligning with the kustomize-controller
update that addresses issues with multiple $patch: delete
strategic merge patches in a single patch file.

Updated dependencies:
- sigs.k8s.io/kustomize/api v0.19.0 -> v0.20.0
- sigs.k8s.io/kustomize/kyaml v0.19.0 -> v0.20.0

Signed-off-by: cappyzawa <cappyzawa@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
[RFC-0010] Introduce workload identity auth for remote clusters
Bumps the ci group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [korthout/backport-action](https://github.com/korthout/backport-action) | `3.2.0` | `3.2.1` |
| [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) | `3.10.0` | `3.11.1` |
| [docker/build-push-action](https://github.com/docker/build-push-action) | `6.17.0` | `6.18.0` |
| [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) | `3.8.2` | `3.9.1` |
| [anchore/sbom-action](https://github.com/anchore/sbom-action) | `0.20.0` | `0.20.1` |
| [github/codeql-action](https://github.com/github/codeql-action) | `3.28.18` | `3.29.0` |



Updates `korthout/backport-action` from 3.2.0 to 3.2.1
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@436145e...0193454)

Updates `docker/setup-buildx-action` from 3.10.0 to 3.11.1
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@b5ca514...e468171)

Updates `docker/build-push-action` from 6.17.0 to 6.18.0
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@1dc7386...2634353)

Updates `sigstore/cosign-installer` from 3.8.2 to 3.9.1
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](sigstore/cosign-installer@3454372...398d4b0)

Updates `anchore/sbom-action` from 0.20.0 to 0.20.1
- [Release notes](https://github.com/anchore/sbom-action/releases)
- [Changelog](https://github.com/anchore/sbom-action/blob/main/RELEASE.md)
- [Commits](anchore/sbom-action@e11c554...9246b90)

Updates `github/codeql-action` from 3.28.18 to 3.29.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@ff0a06e...ce28f5b)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 3.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
- dependency-name: docker/setup-buildx-action
  dependency-version: 3.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: docker/build-push-action
  dependency-version: 6.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: sigstore/cosign-installer
  dependency-version: 3.9.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: anchore/sbom-action
  dependency-version: 0.20.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
- dependency-name: github/codeql-action
  dependency-version: 3.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
...

Signed-off-by: dependabot[bot] <support@github.com>
…ef230b4

Bump the ci group across 1 directory with 6 updates
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Introduce label selector for watching ConfigMaps and Secrets
…ller level

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
[RFC-0010] Support all Azure clouds for remote clusters at the controller level
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Fix watch index conflict between HelmChart and OCIRepository kinds
Signed-off-by: Yves Mettier <ymettier@free.fr>
Fix continuous drift due to unstable hashing of values
matheuscscp and others added 30 commits June 5, 2026 16:05
Signed-off-by: GitHub <noreply@github.com>
Local container image builds and envtest binaries were pinned to amd64,
forcing emulation (e.g. Rosetta) on Apple Silicon and other arm64 hosts. This
produced amd64 images/test binaries locally, which can surface subtle runtime
bugs. envtest now publishes arm64 binaries (including darwin/arm64), so the
historical amd64 pin (and the Darwin-specific override) is no longer needed.

Derive the architecture from the host Go toolchain (go env GOARCH) so local
builds are native, while keeping both values overridable for cross-arch builds.
Multi-arch release images are built by the fluxcd/gha-workflows release
workflow, not by "make docker-build", so release artifacts are unaffected.

Signed-off-by: leigh capili <leigh@null.net>
build: target host arch for local builds/envtest
Signed-off-by: GitHub <noreply@github.com>
Bumps the ci group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [fluxcd/gha-workflows/.github/workflows/backport.yaml](https://github.com/fluxcd/gha-workflows) | `0.9.0` | `0.11.0` |
| [fluxcd/gha-workflows](https://github.com/fluxcd/gha-workflows) | `0.9.0` | `0.11.0` |
| [fluxcd/gha-workflows/.github/workflows/controller-release.yaml](https://github.com/fluxcd/gha-workflows) | `0.9.0` | `0.11.0` |
| [fluxcd/gha-workflows/.github/workflows/code-scan.yaml](https://github.com/fluxcd/gha-workflows) | `0.9.0` | `0.11.0` |
| [fluxcd/gha-workflows/.github/workflows/labels-sync.yaml](https://github.com/fluxcd/gha-workflows) | `0.9.0` | `0.11.0` |
| [fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml](https://github.com/fluxcd/gha-workflows) | `0.9.0` | `0.11.0` |


Updates `fluxcd/gha-workflows/.github/workflows/backport.yaml` from 0.9.0 to 0.11.0
- [Release notes](https://github.com/fluxcd/gha-workflows/releases)
- [Commits](fluxcd/gha-workflows@v0.9.0...v0.11.0)

Updates `fluxcd/gha-workflows` from 0.9.0 to 0.11.0
- [Release notes](https://github.com/fluxcd/gha-workflows/releases)
- [Commits](fluxcd/gha-workflows@v0.9.0...v0.11.0)

Updates `fluxcd/gha-workflows/.github/workflows/controller-release.yaml` from 0.9.0 to 0.11.0
- [Release notes](https://github.com/fluxcd/gha-workflows/releases)
- [Commits](fluxcd/gha-workflows@v0.9.0...v0.11.0)

Updates `fluxcd/gha-workflows/.github/workflows/code-scan.yaml` from 0.9.0 to 0.11.0
- [Release notes](https://github.com/fluxcd/gha-workflows/releases)
- [Commits](fluxcd/gha-workflows@v0.9.0...v0.11.0)

Updates `fluxcd/gha-workflows/.github/workflows/labels-sync.yaml` from 0.9.0 to 0.11.0
- [Release notes](https://github.com/fluxcd/gha-workflows/releases)
- [Commits](fluxcd/gha-workflows@v0.9.0...v0.11.0)

Updates `fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml` from 0.9.0 to 0.11.0
- [Release notes](https://github.com/fluxcd/gha-workflows/releases)
- [Commits](fluxcd/gha-workflows@v0.9.0...v0.11.0)

---
updated-dependencies:
- dependency-name: fluxcd/gha-workflows/.github/workflows/backport.yaml
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: fluxcd/gha-workflows
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: fluxcd/gha-workflows/.github/workflows/controller-release.yaml
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: fluxcd/gha-workflows/.github/workflows/code-scan.yaml
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
...

Signed-off-by: dependabot[bot] <support@github.com>
…37d5d97

Bump the ci group with 6 updates
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: GitHub <noreply@github.com>
This re-introduces support that was lost going from 2.1.x -> 2.2.x but controls the behaviour through a feature gate so either the previous or current behaviour (default) can be achieved

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Signed-off-by: MichaelMorris <michael.morris@est.tech>
The newly added tests to e2e depend on local helm charts being installed, which is done in "Bootstrap Tests Using Local Helm Chart". However a condition exists on that step and on the already existing test cases that depend on it because that step cannot be run on a PR from a fork as the fork branch wont exist in the base repo.
Therefore the same condition needs to be placed on the newly added tests that also depend on that step.

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Support helm release upgrade on helm chart name change
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Upgrade source-controller API to v1.9.0
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Add backport:release/v1.6.x label
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.