Skip to content

Fix helm loglevel parsing #5860

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jan 3, 2024
Merged

Fix helm loglevel parsing #5860

merged 4 commits into from
Jan 3, 2024

Conversation

ChrisDevo
Copy link
Contributor

Pull Request Motivation

Proposed fix for this issue

Kind

Release Note

NONE

@jetstack-bot jetstack-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 11, 2023
@jetstack-bot
Copy link
Contributor

Hi @ChrisDevo. Thanks for your PR.

I'm waiting for a cert-manager member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@jetstack-bot jetstack-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/deploy Indicates a PR modifies deployment configuration labels Mar 11, 2023
@ChrisDevo ChrisDevo force-pushed the fix-helm-loglevel-parsing branch from e51295f to e4e045d Compare March 11, 2023 23:22
@jetstack-bot jetstack-bot added dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. and removed dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. labels Mar 11, 2023
irbekrm
irbekrm suggested changes Mar 14, 2023
View reviewed changes
Copy link
Contributor

@irbekrm irbekrm left a comment

Choose a reason for hiding this comment

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

Thank you for the PR @ChrisDevo ! I've left a comment about the cap on the upper log level.

inteon
inteon reviewed May 25, 2023
View reviewed changes
@inteon inteon added this to the 1.14 milestone Aug 17, 2023
@jetstack-bot
Copy link
Contributor

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Send feedback to jetstack.
/lifecycle stale

@jetstack-bot jetstack-bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 15, 2023
@jetstack-bot
Copy link
Contributor

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
If this issue is safe to close now please do so with /close.
Send feedback to jetstack.
/lifecycle rotten
/remove-lifecycle stale

@jetstack-bot jetstack-bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Dec 15, 2023
@inteon inteon self-assigned this Jan 3, 2024
ChrisDevo and others added 3 commits January 3, 2024 10:39
@ChrisDevo @inteon
Improve parsing of helm global.logLevel (only accept integers 0-5, in…
519197b 
…clusive)

Signed-off-by: ChrisDevo <chris.devine@berkeley.edu>
@ChrisDevo @inteon
Fix comment about allowed logLevel values (see: pkg/logs/logs.go#L44-49)
449fb81 
Signed-off-by: ChrisDevo <chris.devine@berkeley.edu>
@inteon
make fix more general (eg. support levels > 5)
2882d4a 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
@inteon inteon force-pushed the fix-helm-loglevel-parsing branch from e4e045d to 2882d4a Compare January 3, 2024 09:55
@inteon
Copy link
Member

inteon commented Jan 3, 2024

I generalised the fix so it works for arbitrary level values (fixes #5860 (comment)).

$ diff \
<(helm template _bin/cert-manager-v1.13.0-beta.0-229-g449fb815955d2e.tgz --set global.logLevel=) \
<(helm template _bin/cert-manager-v1.13.0-beta.0-229-g449fb815955d2e.tgz --set global.logLevel=0)

898a899
>           - --v=0
960a962
>           - --v=0
1041a1044
>           - --v=0

@inteon
undo docs change
646a069 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
@inteon inteon requested review from wallrj and irbekrm January 3, 2024 09:59
wallrj
wallrj approved these changes Jan 3, 2024
View reviewed changes
Copy link
Member

@wallrj wallrj left a comment

Choose a reason for hiding this comment

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

Thanks @inteon and @ChrisDevo.

I noticed that global.logLevel is not documented in the Helm README file, but that's a separate issue.

cert-manager/deploy/charts/cert-manager/README.template.md

Lines 77 to 86 in 65e78f3

| `global.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` |
| `global.commonLabels` | Labels to apply to all resources | `{}` |
| `global.rbac.create` | If `true`, create and use RBAC resources (includes sub-charts) | `true` |
| `global.priorityClassName`| Priority class name for cert-manager and webhook pods | `""` |
| `global.podSecurityPolicy.enabled` | If `true`, create and use PodSecurityPolicy (includes sub-charts) | `false` |
| `global.podSecurityPolicy.useAppArmor` | If `true`, use Apparmor seccomp profile in PSP | `true` |
| `global.leaderElection.namespace` | Override the namespace used to store the ConfigMap for leader election | `kube-system` |
| `global.leaderElection.leaseDuration` | The duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate | |
| `global.leaderElection.renewDeadline` | The interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration | |
| `global.leaderElection.retryPeriod` | The duration the clients should wait between attempting acquisition and renewal of a leadership | |

/lgtm
/approve

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 3, 2024
@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wallrj

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

@jetstack-bot jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2024
@jetstack-bot jetstack-bot merged commit d5b1c07 into cert-manager:master Jan 3, 2024
@wallrj wallrj mentioned this pull request Jan 3, 2024
Closed
@inteon inteon mentioned this pull request Feb 2, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@inteon inteon inteon left review comments

@wallrj wallrj wallrj approved these changes

@irbekrm irbekrm Awaiting requested review from irbekrm

Assignees

@inteon inteon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/deploy Indicates a PR modifies deployment configuration dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. lgtm Indicates that a PR is ready to be merged. lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.14
Development

Successfully merging this pull request may close these issues.
5 participants
@ChrisDevo @jetstack-bot @inteon @wallrj @irbekrm