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

Add variables to support cert-manager generated certificates #905

Merged
merged 4 commits into from
Aug 23, 2023

Conversation

benzch
Copy link
Contributor

@benzch benzch commented Aug 21, 2023

What does this PR do?

When Issuing the SSL certificate with Cert-manager it creates Kubernetes secret of type kubernetes.io/tls without the ability to define the secret keys (jks file is stored in keystore.jks). Since the helm chart expects the keystore file in the hardcoded key name it is not possible to use cert-manager issued certificate.

This PR adds the ability to use a secret that already has SSL keystore with a variable name key in the secret and not just the default "jenkins-jks-file".

  • Fixes #

If you modified files in the ./charts/jenkins/ directory, please also include the following:

Submitter checklist

Special notes for your reviewer

This is mostly inspired by #404

@benzch benzch requested a review from a team as a code owner August 21, 2023 12:10
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

@benzch
Copy link
Contributor Author

benzch commented Aug 22, 2023

@timja added 2 unit test, let me know if there any thing else needed.

@NotMyFault NotMyFault requested a review from timja August 23, 2023 14:39
@NotMyFault
Copy link
Member

@benzch Thanks a lot, could you rebase your PR, please? Currently, it conflicts with the default branch.

@benzch
Copy link
Contributor Author

benzch commented Aug 23, 2023

@NotMyFault rebased main, no more conflicts.

@timja timja merged commit fa9c3e1 into jenkinsci:main Aug 23, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants