Skip to content

Conversation

nickytd
Copy link
Contributor

@nickytd nickytd commented Mar 13, 2025

/area logging
/kind enhancement

This PR brings the latest released updates in fluent-operator v3.3.0

  • It updates fluent-operator module dependency from v2 to v3
  • It regenerates all respective fluent-operator CRDs
  • It adapts all current project imports to refer v3 APIs
  • It brings latest released fluent-operator to v3.3.0

The rational behind the upgrade is that the latest APIs and CRDs support latest fluent-bit log processors as well as new default yaml configuration format. V3 is backwards compatible and does not require any specific handling.

`fluent-operator` APIs and CRDs are updated from v2 to v3

@gardener-prow gardener-prow bot added area/logging Logging related kind/enhancement Enhancement, improvement, extension cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Mar 13, 2025
@gardener-prow gardener-prow bot requested review from acumino and ialidzhikov March 13, 2025 20:47
@gardener-prow gardener-prow bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 13, 2025
@rfranzke
Copy link
Member

/approve

@rfranzke
Copy link
Member

/cc @tobschli

@gardener-prow gardener-prow bot requested a review from tobschli March 14, 2025 08:58
Copy link
Contributor

gardener-prow bot commented Mar 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rfranzke

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 14, 2025
Copy link
Member

@tobschli tobschli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Mar 14, 2025
Copy link
Contributor

gardener-prow bot commented Mar 14, 2025

LGTM label has been added.

Git tree hash: 6b28abf570392fb84c9dc7903d682ce871988222

@gardener-prow gardener-prow bot merged commit 2702141 into gardener:master Mar 14, 2025
19 checks passed
@nickytd nickytd deleted the with-fluent-operator-v3 branch March 14, 2025 16:28
ialidzhikov added a commit to ialidzhikov/gardener that referenced this pull request Jul 29, 2025
With gardener#11673, the fluent-operator imports were updated from `github.com/fluent/fluent-operator/v2` to `github.com/fluent/fluent-operator/v3`.
gardener-prow bot pushed a commit that referenced this pull request Aug 13, 2025
* Clean up exclusion of non-existing `pkg/client/extensions` path

Extension clients are no longer generated after #4592.

* Clean up exclusion of non-existing `builtin$` path

I don't find in the project a path matching `builtin$`.

* Clean up exclusion of non-existing `examples$` path

I don't find in the project a path matching `examples$`. We have a dir named `example/`, not `examples/`.

* Update fluent-operator import alias

With #11673, the fluent-operator imports were updated from `github.com/fluent/fluent-operator/v2` to `github.com/fluent/fluent-operator/v3`.

* Clean up import alias for non-existing pkg

`github.com/gardener/gardener/extensions/pkg/apis/config` was removed with #11056.

* Clean up import alias for non-existing pkg(s)

Internal component config APIs were removed. See #11043

* Add `pkg/client/security` to the list of excluded dirs

`pkg/client/security` contains generated clientset, informers and listers. Similar to the other generated dirs, it should be excluded.

* Update the import alias for etcd-druid crds pkg

Introduced with #11545. The correct pkg is `github.com/gardener/etcd-druid/api/core/v1alpha1/crds`, not `github.com/gardener/etcd-druid/api/core/crds`.

* Clean up paths with generated code from `linters.exclusions.paths`

We already use `linters.exclusions.generated=lax`. `lax` mode should automatically detect and ignore generated files.
Ref https://golangci-lint.run/usage/configuration/#linters-configuration

* Clean up the exclusion of the `third_party` path

In the Makefile, we explicitly pass the paths to be checked. `third_party` is not among them. Hence, there is no need to exclude it as we don't check for it.
https://github.com/gardener/gardener/blob/v1.124.0/Makefile#L165

* Don't check for imports under `third_party`

`third_party` currently contains a forked dependency and generated mocks. Hence, I don't see much value for checking for imports there as it does not contain a pkg which is not generated or not copied.

* Address PR review feedback from dimitar-kostadinov
Duciwuci pushed a commit to stackitcloud/gardener that referenced this pull request Sep 1, 2025
* Clean up exclusion of non-existing `pkg/client/extensions` path

Extension clients are no longer generated after gardener#4592.

* Clean up exclusion of non-existing `builtin$` path

I don't find in the project a path matching `builtin$`.

* Clean up exclusion of non-existing `examples$` path

I don't find in the project a path matching `examples$`. We have a dir named `example/`, not `examples/`.

* Update fluent-operator import alias

With gardener#11673, the fluent-operator imports were updated from `github.com/fluent/fluent-operator/v2` to `github.com/fluent/fluent-operator/v3`.

* Clean up import alias for non-existing pkg

`github.com/gardener/gardener/extensions/pkg/apis/config` was removed with gardener#11056.

* Clean up import alias for non-existing pkg(s)

Internal component config APIs were removed. See gardener#11043

* Add `pkg/client/security` to the list of excluded dirs

`pkg/client/security` contains generated clientset, informers and listers. Similar to the other generated dirs, it should be excluded.

* Update the import alias for etcd-druid crds pkg

Introduced with gardener#11545. The correct pkg is `github.com/gardener/etcd-druid/api/core/v1alpha1/crds`, not `github.com/gardener/etcd-druid/api/core/crds`.

* Clean up paths with generated code from `linters.exclusions.paths`

We already use `linters.exclusions.generated=lax`. `lax` mode should automatically detect and ignore generated files.
Ref https://golangci-lint.run/usage/configuration/#linters-configuration

* Clean up the exclusion of the `third_party` path

In the Makefile, we explicitly pass the paths to be checked. `third_party` is not among them. Hence, there is no need to exclude it as we don't check for it.
https://github.com/gardener/gardener/blob/v1.124.0/Makefile#L165

* Don't check for imports under `third_party`

`third_party` currently contains a forked dependency and generated mocks. Hence, I don't see much value for checking for imports there as it does not contain a pkg which is not generated or not copied.

* Address PR review feedback from dimitar-kostadinov
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/logging Logging related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants