Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Metering 1.2.1 #13185

Merged
merged 3 commits into from
Mar 27, 2024
Merged

Bump to Metering 1.2.1 #13185

merged 3 commits into from
Mar 27, 2024

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Mar 17, 2024

What this PR does / why we need it:
Metering v1.2.1 adds JSON support, new columns, nonroot runtime and updated dependencies. This PR makes the reporting format configurable in KKP and bumps the used metering version.

The new columns are added at the end of the CSV files, so I do not think this is a breaking change. Because of that I would also like to backport this PR into 2.25, the changes in 1.2.1 are just too good to keep them from users for 6 more months.

What type of PR is this?
/kind feature

Does this PR introduce a user-facing change? Then add your Release Note here:

- Update Metering to v1.2.1.
- Add `format` to metering report configuration, allowing to generate JSON files instead of CSV.
- Add `cloud-provider`, `datacenter` and `cluster-owner` columns to the generated metering reports.

Documentation:

NONE

@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/feature Categorizes issue or PR as related to a new feature. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels Mar 17, 2024
@xrstf xrstf marked this pull request as draft March 17, 2024 14:08
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 17, 2024
@xrstf xrstf self-assigned this Mar 17, 2024
@xrstf xrstf added this to the KKP 2.26 milestone Mar 17, 2024
@xrstf xrstf changed the title Bump to Metering 1.2.0 Bump to Metering 1.2.1 Mar 27, 2024
@xrstf xrstf marked this pull request as ready for review March 27, 2024 15:38
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 27, 2024
@xrstf
Copy link
Contributor Author

xrstf commented Mar 27, 2024

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2024
@xrstf xrstf requested a review from xmudrii March 27, 2024 16:36
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

Just a nit, but looks good to me
/lgtm
/approve

@@ -499,6 +499,8 @@ spec:
# ReportConfigurations is a map of report configuration definitions.
reports:
weekly:
# Format is the file format of the generated report, one of "csv" or "json" (defaults to "csv").
format: ""
Copy link
Member

Choose a reason for hiding this comment

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

Tiny nit: if the default format is csv, why is this not format: "csv"?

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 32b5dba039146f37f32aab9d5a432c97a783d11b

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xmudrii

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 27, 2024
@kubermatic-bot kubermatic-bot merged commit 9920245 into kubermatic:main Mar 27, 2024
17 checks passed
@kubermatic-bot kubermatic-bot removed this from the KKP 2.26 milestone Mar 27, 2024
@kubermatic-bot kubermatic-bot added this to the KKP 2.25 milestone Mar 27, 2024
@xrstf xrstf deleted the metering-1.2 branch March 27, 2024 19:14
@xrstf
Copy link
Contributor Author

xrstf commented Mar 28, 2024

/cherrypick release/v2.25

@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #13227

In response to this:

/cherrypick release/v2.25

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants