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

✨ Improve key value pairs consistency in logging (II) #7075

Merged
merged 1 commit into from
Aug 19, 2022

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Aug 17, 2022

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
Follow-up to #6150. I'll open another PR where I focus on adding k/v pairs of the resource hierarchies in Reconcile funcs and verify log outputs

Most of the changes are:

  • upper case kind, as this was changed in controller-runtime: ⚠️ Fix broken kind logging controller-runtime#1954
  • avoid adding a k/v pair multiple times
    • on multiple levels of the func hierarchy
    • adding the reconciled object in the Reconcile func even though CR already does it
  • adding the Cluster k/v pair as soon as we know namespace/name

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Follow-up to #6150

@k8s-ci-robot
Copy link
Contributor

@sbueringer: This issue is currently awaiting triage.

If CAPI contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Aug 17, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 17, 2022
@sbueringer
Copy link
Member Author

/retest

@sbueringer
Copy link
Member Author

sbueringer commented Aug 17, 2022

apidiff is fine. It only removes non-released funcs. No idea why the build log is not shown and only visible in the "YAML" tab: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/7075/pull-cluster-api-apidiff-main/1559908707746189312

          sigs.k8s.io/cluster-api/util
            Incompatible changes:
            - LowerCamelCase: removed
            - LowerCamelCaseKind: removed

          sigs.k8s.io/cluster-api/bootstrap/util
            Incompatible changes:
            - ConfigOwner.LowerCamelCaseKind: removed

Following up on this here: https://kubernetes.slack.com/archives/C7J9RP96G/p1660747134682139

@killianmuldoon
Copy link
Contributor

/retest

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main bbe7c2f link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/lgtm

I found a couple of additional instances in the code, but I can do those in a follow-up as it'll be quicker than adding them to this PR.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 18, 2022
@sbueringer
Copy link
Member Author

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2022
@k8s-ci-robot k8s-ci-robot merged commit dcdb6bf into kubernetes-sigs:main Aug 19, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Aug 19, 2022
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants