From 5a70001fc75ffbc6f43f2b0958718192d648a9e5 Mon Sep 17 00:00:00 2001 From: Jon Brohauge Date: Wed, 16 Oct 2019 19:42:53 +0200 Subject: [PATCH] Add a bit of extra words to make complete sentences --- .../Getting Started/v0.1.1/configuration.md | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/website/content/en/docs/Getting Started/v0.1.1/configuration.md b/website/content/en/docs/Getting Started/v0.1.1/configuration.md index 23824347..dd91c6b2 100644 --- a/website/content/en/docs/Getting Started/v0.1.1/configuration.md +++ b/website/content/en/docs/Getting Started/v0.1.1/configuration.md @@ -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 @@ -118,13 +118,13 @@ spec: 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) -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) @@ -163,7 +163,7 @@ If key was generated by `ssh-keygen` the public key content is located in ` in namespace where Jenkins CR has been deployed. +The operator automatically generates a Jenkins username and password and stores it in Kubernetes secret named +`jenkins-operator-credentials-` in the namespace where Jenkins CR has been deployed. If you want change it you can override the secret: @@ -263,7 +263,7 @@ data: 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. ## Override default Jenkins container command @@ -277,7 +277,7 @@ command: - /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. The `/sbin/tini -s -- /usr/local/bin/jenkins.sh` command runs the Jenkins master main process.