Fix helm loglevel parsing by ChrisDevo · Pull Request #5860 · cert-manager/cert-manager

ChrisDevo · 2023-03-11T22:54:01Z

Pull Request Motivation

Proposed fix for this issue

Kind

Release Note

NONE

jetstack-bot · 2023-03-11T22:54:11Z

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.

Details

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.

irbekrm

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

deploy/charts/cert-manager/values.yaml

deploy/charts/cert-manager/templates/cainjector-deployment.yaml

jetstack-bot · 2023-11-15T16:50:42Z

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 · 2023-12-15T17:28:39Z

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

…clusive) Signed-off-by: ChrisDevo <chris.devine@berkeley.edu>

Signed-off-by: ChrisDevo <chris.devine@berkeley.edu>

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>

inteon · 2024-01-03T09:55:13Z

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

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>

wallrj

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 · 2024-01-03T10:30:23Z

[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

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [wallrj]

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

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 force-pushed the fix-helm-loglevel-parsing branch from e51295f to e4e045d Compare March 11, 2023 23:22

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 suggested changes Mar 14, 2023

View reviewed changes

deploy/charts/cert-manager/values.yaml Outdated Show resolved Hide resolved

inteon reviewed May 25, 2023

View reviewed changes

deploy/charts/cert-manager/templates/cainjector-deployment.yaml Outdated Show resolved Hide resolved

inteon added this to the 1.14 milestone Aug 17, 2023

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 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 self-assigned this Jan 3, 2024

ChrisDevo and others added 3 commits January 3, 2024 10:39

Improve parsing of helm global.logLevel (only accept integers 0-5, in…

519197b

…clusive) Signed-off-by: ChrisDevo <chris.devine@berkeley.edu>

Fix comment about allowed logLevel values (see: pkg/logs/logs.go#L44-49)

449fb81

Signed-off-by: ChrisDevo <chris.devine@berkeley.edu>

make fix more general (eg. support levels > 5)

2882d4a

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>

inteon force-pushed the fix-helm-loglevel-parsing branch from e4e045d to 2882d4a Compare January 3, 2024 09:55

undo docs change

646a069

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>

inteon requested review from irbekrm and wallrj January 3, 2024 09:59

wallrj approved these changes Jan 3, 2024

View reviewed changes

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

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 merged commit d5b1c07 into cert-manager:master Jan 3, 2024

wallrj mentioned this pull request Jan 3, 2024

global.logLevel is not documented in the Helm README file #6588

Closed

inteon mentioned this pull request Feb 2, 2024

Fix the Helm trick that we use to differentiate between 0 and an empty value #6713

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix helm loglevel parsing#5860

Fix helm loglevel parsing#5860
jetstack-bot merged 4 commits intocert-manager:masterfrom
ChrisDevo:fix-helm-loglevel-parsing

ChrisDevo commented Mar 11, 2023

Uh oh!

jetstack-bot commented Mar 11, 2023

Uh oh!

irbekrm left a comment

Uh oh!

Uh oh!

Uh oh!

jetstack-bot commented Nov 15, 2023

Uh oh!

jetstack-bot commented Dec 15, 2023

Uh oh!

inteon commented Jan 3, 2024

Uh oh!

wallrj left a comment

Uh oh!

jetstack-bot commented Jan 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	\| `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 \| \|

Conversation

ChrisDevo commented Mar 11, 2023

Pull Request Motivation

Kind

Release Note

Uh oh!

jetstack-bot commented Mar 11, 2023

Uh oh!

irbekrm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jetstack-bot commented Nov 15, 2023

Uh oh!

jetstack-bot commented Dec 15, 2023

Uh oh!

inteon commented Jan 3, 2024

Uh oh!

wallrj left a comment

Choose a reason for hiding this comment

Uh oh!

jetstack-bot commented Jan 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants