Skip to content

chore: rebase onto upstream v1.4.5#7

Draft
estebany-qd wants to merge 216 commits intomainfrom
chore/estebany/rebase-onto-v1.4.5
Draft

chore: rebase onto upstream v1.4.5#7
estebany-qd wants to merge 216 commits intomainfrom
chore/estebany/rebase-onto-v1.4.5

Conversation

@estebany-qd
Copy link
Copy Markdown

No description provided.

dependabot Bot and others added 30 commits August 22, 2024 03:55
Bumps the ci group with 3 updates in the / directory: [korthout/backport-action](https://github.com/korthout/backport-action), [anchore/sbom-action](https://github.com/anchore/sbom-action) and [github/codeql-action](https://github.com/github/codeql-action).


Updates `korthout/backport-action` from 3.0.2 to 3.1.0
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@bd410d3...be567af)

Updates `anchore/sbom-action` from 0.17.1 to 0.17.2
- [Release notes](https://github.com/anchore/sbom-action/releases)
- [Commits](anchore/sbom-action@ab9d16d...61119d4)

Updates `github/codeql-action` from 3.26.2 to 3.26.4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@429e197...f0f3afe)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: anchore/sbom-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
...

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

Bump the ci group across 1 directory with 3 updates
When using Helm with both a values file and --set, the set will always
have precedence over the values.yaml. This allows specifying the normal
config inside a yaml file and specifying a secret outside that yaml via
--set.

When using flux, this normally works too (using inline values to specify
most of the config and a reference with targetPath to get a secret), but
if you want to overwrite a secret key inside an array the inline values
will always overwrite the whole array and the referenced secret key will
not appear at all.

By making sure that when you specify a targetPath it has precedence over
inline values it will be merged properly.

Signed-off-by: Ströger Florian <florian@florianstroeger.com>
…-overwrite

Allow overwriting inline values with targetPath
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Update Helm to v3.16.1 and enable the adoption of existing resources
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Closes fluxcd#1021

Signed-off-by: Chris Werner Rau <cwrau@cwrau.info>
Signed-off-by: Sunny <github@darkowlzz.space>
Signed-off-by: Sunny <github@darkowlzz.space>
fix: remove digest check to never ignore helm errors
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Add `disableSchemaValidation` to Helm install/upgrade actions
Signed-off-by: Sunny <github@darkowlzz.space>
Signed-off-by: Sunny <github@darkowlzz.space>
Update flux deps and k8s deps to 1.31.1
Bumps the ci group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action).


Updates `actions/checkout` from 4.1.7 to 4.2.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@692973e...d632683)

Updates `github/codeql-action` from 3.26.4 to 3.26.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@f0f3afe...461ef6c)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
...

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

Bump the ci group across 1 directory with 2 updates
Signed-off-by: Sunny <github@darkowlzz.space>
Update source-controller to v1.4.1
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Allow cross-shard dependency check
Signed-off-by: Sunny <github@darkowlzz.space>
Signed-off-by: Sunny <github@darkowlzz.space>
Merge `release/v1.1.x` back to `main`
matheuscscp and others added 30 commits October 8, 2025 17:03
…1.4.x

[release/v1.4.x] Update dependencies to Kubernetes v1.34.1 and Go 1.25.2
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
(cherry picked from commit 9120241)
…1.4.x

[release/v1.4.x] Fix status reporting for `RetryOnFailure` strategy
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
(cherry picked from commit 02a733b)
…1.4.x

[release/v1.4.x] Allow fetching charts from a local source-watcher
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
(cherry picked from commit 4c05838)
…1.4.x

[release/v1.4.x] Upgrade Helm to 3.19.1
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
(cherry picked from commit 6bebe68)
…1.4.x

[release/v1.4.x] Upgrade k8s to 1.34.2, c-r to 0.22.4 and helm to 3.19.2
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
(cherry picked from commit 0d78b8d)
…1.4.x

[release/v1.4.x] Add feature gate for disabling config watchers
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
(cherry picked from commit 831c8fc)
…1.4.x

[release/v1.4.x] Fix history truncation logic for RetryOnFailure
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
v1.4.5

# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQgRniGeyDuRFwVWQxGOfA4rij7/wUCaSgc3gAKCRBGOfA4rij7
# /625AP90Uq8zCJ36BtwLZnWbt1b3Rc7t9HRG4LLRp2+xsKIeNAEA+w5SR/pvmfsp
# nWNpTg0KfTQZdWPZP1FePy0eo/ZvnAA=
# =5ntr
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Nov 27 04:41:50 2025 -05
# gpg:                using EDDSA key 204678867B20EE445C15590C4639F038AE28FBFF
# gpg: Can't check signature: No public key

# Conflicts:
#	internal/postrender/origin_labels_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.