public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add a bit of extra words to make complete sentences

This commit is contained in:
Jon Brohauge 2019-10-16 19:42:53 +02:00
parent 83e99c4d2b
commit 5a70001fc7
No known key found for this signature in database
GPG Key ID: 2402404D1764DBE8
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
website/content/en/docs/Getting Started/v0.1.1/configuration.md
View File

@ -47,7 +47,7 @@ pipelineJob('build-jenkins-operator') {
} }
``` ```
**cicd/jobs/build.jenkins** it's an actual Jenkins pipeline: **cicd/jobs/build.jenkins** is an actual Jenkins pipeline:
``` ```
#!/usr/bin/env groovy #!/usr/bin/env groovy
@ -118,13 +118,13 @@ spec:
repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git
``` ```
**Jenkins Operator** will automatically discover and configure all seed jobs. **Jenkins Operator** will automatically discover and configure all the seed jobs.
You can verify if deploy keys were successfully configured in Jenkins **Credentials** tab. You can verify if deploy keys were successfully configured in the Jenkins **Credentials** tab.
![jenkins](/kubernetes-operator/img/jenkins-credentials.png) ![jenkins](/kubernetes-operator/img/jenkins-credentials.png)
You can verify if your pipelines were successfully configured in Jenkins Seed Job console output. You can verify if your pipelines were successfully configured in the Jenkins Seed Job console output.
![jenkins](/kubernetes-operator/img/jenkins-seed.png) ![jenkins](/kubernetes-operator/img/jenkins-seed.png)
@ -163,7 +163,7 @@ If key was generated by `ssh-keygen` the public key content is located in <filen
#### Configure SSH authentication #### Configure SSH authentication
Configure seed job like: Configure a seed job like this:
``` ```
apiVersion: jenkins.io/v1alpha2 apiVersion: jenkins.io/v1alpha2
@ -181,7 +181,7 @@ spec:
repositoryUrl: git@github.com:jenkinsci/kubernetes-operator.git repositoryUrl: git@github.com:jenkinsci/kubernetes-operator.git
``` ```
and create Kubernetes Secret(name of secret should be the same from `credentialID` field): and create a Kubernetes Secret (name of secret should be the same from `credentialID` field):
``` ```
apiVersion: v1 apiVersion: v1
@ -199,7 +199,7 @@ stringData:
### Username & password authentication ### Username & password authentication
Configure seed job like: Configure a seed job like this:
``` ```
apiVersion: jenkins.io/v1alpha2 apiVersion: jenkins.io/v1alpha2
@ -217,7 +217,7 @@ spec:
repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git
``` ```
and create Kubernetes Secret(name of secret should be the same from `credentialID` field): and create a Kubernetes Secret (name of secret should be the same from `credentialID` field):
``` ```
apiVersion: v1 apiVersion: v1
@ -231,7 +231,7 @@ stringData:
## HTTP Proxy for downloading plugins ## HTTP Proxy for downloading plugins
To use forwarding proxy with operator to downloading plugins you need to put environment var to Jenkins CR, for e.g.: To use forwarding proxy with an operator to download plugins you need to add the following environment variable to Jenkins CR, for e.g.:
```yaml ```yaml
spec: spec:
@ -247,8 +247,8 @@ In `CURL_OPTIONS` var you can set additional arguments to curl command.
## Jenkins login credentials ## Jenkins login credentials
The operator automatically generate Jenkins user name and password and stores it in Kubernetes secret named The operator automatically generates a Jenkins username and password and stores it in Kubernetes secret named
`jenkins-operator-credentials-<cr_name>` in namespace where Jenkins CR has been deployed. `jenkins-operator-credentials-<cr_name>` in the namespace where Jenkins CR has been deployed.
If you want change it you can override the secret: If you want change it you can override the secret:
@ -263,7 +263,7 @@ data:
password: <base64-encoded-new-password> password: <base64-encoded-new-password>
``` ```
If needed **Jenkins Operator** will restart Jenkins master pod and then you can login with the new user and password If needed **Jenkins Operator** will restart the Jenkins master pod and then you can login with the new username and password
credentials. credentials.
## Override default Jenkins container command ## Override default Jenkins container command
@ -277,7 +277,7 @@ command:
- /var/jenkins/scripts/init.sh && /sbin/tini -s -- /usr/local/bin/jenkins.sh - /var/jenkins/scripts/init.sh && /sbin/tini -s -- /usr/local/bin/jenkins.sh
``` ```
The script`/var/jenkins/scripts/init.sh` is provided be the operator and configures init.groovy.d(creates Jenkins user) The script`/var/jenkins/scripts/init.sh` is provided by the operator and configures init.groovy.d (creates the Jenkins user)
and installs plugins. and installs plugins.
The `/sbin/tini -s -- /usr/local/bin/jenkins.sh` command runs the Jenkins master main process. The `/sbin/tini -s -- /usr/local/bin/jenkins.sh` command runs the Jenkins master main process.