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.

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

Add crt file env var #152

Merged
merged 2 commits into from
Aug 23, 2017
Merged

Add crt file env var #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c150f5
eclipse format, spaces for tabs, all files
gabemontero Aug 23, 2017
6122479
add CA_CERT_FILE option for injecting cert overrides
gabemontero Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ Per the OpenShift documentation, see the commands `oc describe serviceaccount de

For the certificate, when running in the OpenShift Jenkins image, the CA certificate by default is pulled from the well known location ("/run/secrets/kubernetes.io/serviceaccount/ca.crt") where OpenShift mounts it, and then is stored into the Java KeyStore and X.509 TrustManager for subsequent verification against the OpenShift server on all subsequent interactions. If you wish to override the certificate used:

- For all steps of a given project, set a build parameter (again, of type `Text Parameter`) named `CA_CERT` to the string needed to construct the certificate.
- Since `Text Parameter` input fields are not available with the global key/value properties, the plug-in does not support defining certificates via a `CA_CERT` property across Jenkins projects.
- Option 1: set a either a project specific build parameter or global key/value property named `CA_CERT_FILE` to the file location of the certificate
- Option 2: For all steps of a given project, set a build parameter (again, of type `Text Parameter`) named `CA_CERT` to the string needed to construct the certificate. Since `Text Parameter` input fields are not available with the global key/value properties, the plug-in does not support defining certificates via a `CA_CERT` property across Jenkins projects.

If you want to skip TLS verification and allow for untrusted certificates, set the named parameter `SKIP_TLS` to any value other than `false`. Since this can be done with a Jenkins `String Parameter`, you can use this at either the global or project level.

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/openshift/jenkins/plugins/pipeline/Argument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

import java.io.Serializable;

public class Argument extends AbstractDescribableImpl<Argument> implements Serializable {
public class Argument extends AbstractDescribableImpl<Argument> implements
Serializable {

protected final String value;

Expand All @@ -22,7 +23,6 @@ public String getValue() {
return value;
}


@Extension
public static class DescriptorImpl extends Descriptor<Argument> {

Expand Down
Loading