diff --git a/docs/docs/getting-started/index.html b/docs/docs/getting-started/index.html index 7676684c..9f8b3859 100644 --- a/docs/docs/getting-started/index.html +++ b/docs/docs/getting-started/index.html @@ -474,7 +474,7 @@

Prepare your Kubernetes cluster and set up your kubectl access.

-

Once you have running Kubernetes cluster you can focus on installing Jenkins Operator according to the Installation guide.

+

Once you have a running Kubernetes cluster you can focus on installing Jenkins Operator according to the Installation guide.

diff --git a/docs/docs/getting-started/latest/custom-backup-and-restore/index.html b/docs/docs/getting-started/latest/custom-backup-and-restore/index.html index 43b64181..ee5728e9 100644 --- a/docs/docs/getting-started/latest/custom-backup-and-restore/index.html +++ b/docs/docs/getting-started/latest/custom-backup-and-restore/index.html @@ -634,7 +634,7 @@ for backup and restore are required, e.g.:

echo "Running backup #${backup_number}" BACKUP_TMP_DIR=$(mktemp -d) - tar -C ${JENKINS_HOME} -czf "${BACKUP_TMP_DIR}/${backup_number}.tar.gz" --exclude jobs/*/config.xml --exclude jobs/*/workspace* -c jobs && \ + tar -C ${JENKINS_HOME} -czf "${BACKUP_TMP_DIR}/${backup_number}.tar.gz" --exclude jobs/*/workspace* -c jobs && \ aws s3 cp ${BACKUP_TMP_DIR}/${backup_number}.tar.gz s3://${BACKUP_BUCKET}/${BACKUP_PATH}/${backup_number}.tar.gz echo Done diff --git a/docs/docs/getting-started/latest/index.xml b/docs/docs/getting-started/latest/index.xml index f240c7dd..1eb1214e 100644 --- a/docs/docs/getting-started/latest/index.xml +++ b/docs/docs/getting-started/latest/index.xml @@ -809,7 +809,7 @@ for backup and restore are required, e.g.:</p> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>echo<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#4e9a06">&#34;Running backup #${backup_number}&#34;</span><span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>BACKUP_TMP_DIR=$(mktemp<span style="color:#f8f8f8;text-decoration:underline"> </span>-d)<span style="color:#f8f8f8;text-decoration:underline"> -</span><span style="color:#f8f8f8;text-decoration:underline"> </span>tar<span style="color:#f8f8f8;text-decoration:underline"> </span>-C<span style="color:#f8f8f8;text-decoration:underline"> </span>${JENKINS_HOME}<span style="color:#f8f8f8;text-decoration:underline"> </span>-czf<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#4e9a06">&#34;${BACKUP_TMP_DIR}/${backup_number}.tar.gz&#34;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>--exclude<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs/<span style="color:#8f5902;font-style:italic">*/config.xml</span><span style="color:#f8f8f8;text-decoration:underline"> </span>--exclude<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs/<span style="color:#8f5902;font-style:italic">*/workspace*</span><span style="color:#f8f8f8;text-decoration:underline"> </span>-c<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#8f5902;font-style:italic">&amp;&amp;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>\<span style="color:#f8f8f8;text-decoration:underline"> +</span><span style="color:#f8f8f8;text-decoration:underline"> </span>tar<span style="color:#f8f8f8;text-decoration:underline"> </span>-C<span style="color:#f8f8f8;text-decoration:underline"> </span>${JENKINS_HOME}<span style="color:#f8f8f8;text-decoration:underline"> </span>-czf<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#4e9a06">&#34;${BACKUP_TMP_DIR}/${backup_number}.tar.gz&#34;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>--exclude<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs/<span style="color:#8f5902;font-style:italic">*/workspace*</span><span style="color:#f8f8f8;text-decoration:underline"> </span>-c<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#8f5902;font-style:italic">&amp;&amp;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>\<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>aws<span style="color:#f8f8f8;text-decoration:underline"> </span>s3<span style="color:#f8f8f8;text-decoration:underline"> </span>cp<span style="color:#f8f8f8;text-decoration:underline"> </span>${BACKUP_TMP_DIR}/${backup_number}.tar.gz<span style="color:#f8f8f8;text-decoration:underline"> </span>s3<span style="color:#000;font-weight:bold">:</span>//${BACKUP_BUCKET}/${BACKUP_PATH}/${backup_number}.tar.gz<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>echo<span style="color:#f8f8f8;text-decoration:underline"> </span>Done<span style="color:#f8f8f8;text-decoration:underline"> @@ -871,7 +871,7 @@ the number of backups under control, e.g. Cloud Formation fragment:</p> <p>In <code>v0.1.x</code> <strong>Jenkins Operator</strong> user configuration application was implemented using <strong>Jenkins</strong> jobs and this mechanism was replaced since <code>v0.2.0</code> with Groovy scripts implementing the same functionality.</p> -<p>As a result the <strong>Jenkins</strong> configuration jobs (&ldquo;Configure Seed Jobs&rdquo;, &ldquo;jenkins-operator-base-configuration&rdquo;, &ldquo;jenkins-operator-user-configuration&rdquo;) are no longer visible in <strong>Jenkins</strong> UI.</p> +<p>As a result, the <strong>Jenkins</strong> configuration jobs (&ldquo;Configure Seed Jobs&rdquo;, &ldquo;jenkins-operator-base-configuration&rdquo;, &ldquo;jenkins-operator-user-configuration&rdquo;) are no longer visible in <strong>Jenkins</strong> UI.</p> <p>In <code>v0.1.x</code> you can see if any of the configuration jobs failed or succeded in the <strong>Jenkins</strong> UI (job build logs). Instead, you can make sure the operator is running correctly by inspecting its logs, e.g.:</p> diff --git a/docs/docs/getting-started/latest/migration/index.html b/docs/docs/getting-started/latest/migration/index.html index bfc07feb..96fa137f 100644 --- a/docs/docs/getting-started/latest/migration/index.html +++ b/docs/docs/getting-started/latest/migration/index.html @@ -520,7 +520,7 @@

In v0.1.x Jenkins Operator user configuration application was implemented using Jenkins jobs and this mechanism was replaced since v0.2.0 with Groovy scripts implementing the same functionality.

-

As a result the Jenkins configuration jobs (“Configure Seed Jobs”, “jenkins-operator-base-configuration”, “jenkins-operator-user-configuration”) are no longer visible in Jenkins UI.

+

As a result, the Jenkins configuration jobs (“Configure Seed Jobs”, “jenkins-operator-base-configuration”, “jenkins-operator-user-configuration”) are no longer visible in Jenkins UI.

In v0.1.x you can see if any of the configuration jobs failed or succeded in the Jenkins UI (job build logs). Instead, you can make sure the operator is running correctly by inspecting its logs, e.g.:

diff --git a/docs/docs/getting-started/v0.1.x/customization/index.html b/docs/docs/getting-started/v0.1.x/customization/index.html index 2a3d803d..73d9a590 100644 --- a/docs/docs/getting-started/v0.1.x/customization/index.html +++ b/docs/docs/getting-started/v0.1.x/customization/index.html @@ -35,7 +35,7 @@ - + @@ -489,12 +489,12 @@
How to customize Jenkins
-

Jenkins can be customized using by groovy scripts or the Jenkins Configuration as Code Plugin. All custom configuration is stored in +

Jenkins can be customized by using groovy scripts or the Jenkins Configuration as a Code Plugin. All custom configuration is stored in the jenkins-operator-user-configuration- ConfigMap, which is automatically created by the Jenkins Operator.

The Jenkins Operator creates a jenkins-operator-user-configuration- secret where the user can store sensitive information used for custom configuration. If you have an entry in the secret named PASSWORD then you can use it in the -Jenkins Configuration as Code Plugin as adminAddress: "${PASSWORD}".

+Jenkins Configuration as a Code Plugin as adminAddress: "${PASSWORD}".

kubectl get secret jenkins-operator-user-configuration-<cr_name> -o yaml
 
diff --git a/docs/docs/getting-started/v0.1.x/index.xml b/docs/docs/getting-started/v0.1.x/index.xml
index bdc3100c..e5fb9ea8 100644
--- a/docs/docs/getting-started/v0.1.x/index.xml
+++ b/docs/docs/getting-started/v0.1.x/index.xml
@@ -366,12 +366,12 @@ The <code>/sbin/tini -s -- /usr/local/bin/jenkins.sh</code> command
         
         
 
-<p>Jenkins can be customized using by groovy scripts or the Jenkins Configuration as Code Plugin. All custom configuration is stored in
+<p>Jenkins can be customized by using groovy scripts or the Jenkins Configuration as a Code Plugin. All custom configuration is stored in
 the <strong>jenkins-operator-user-configuration-<cr_name></strong> ConfigMap, which is automatically created by the <strong>Jenkins Operator</strong>.</p>
 
 <p>The <strong>Jenkins Operator</strong> creates a <strong>jenkins-operator-user-configuration-<cr_name></strong> secret where the user can store sensitive
 information used for custom configuration. If you have an entry in the secret named <code>PASSWORD</code> then you can use it in the
-Jenkins Configuration as Code Plugin as <code>adminAddress: &quot;${PASSWORD}&quot;</code>.</p>
+Jenkins Configuration as a Code Plugin as <code>adminAddress: &quot;${PASSWORD}&quot;</code>.</p>
 
 <pre><code>kubectl get secret jenkins-operator-user-configuration-&lt;cr_name&gt; -o yaml
 
diff --git a/docs/docs/how-it-works/index.xml b/docs/docs/how-it-works/index.xml
index b19f3764..69e65866 100644
--- a/docs/docs/how-it-works/index.xml
+++ b/docs/docs/how-it-works/index.xml
@@ -79,7 +79,7 @@
         
         <p><strong>Jenkins Operator</strong> is fully compatible with <strong><code>jenkins:lts</code></strong> Docker image and does not introduce any hidden changes to the upstream Jenkins.</p>
 
-<p>If needed, the Docker image can easily be changed in custom resource manifest as long as it supports standard Jenkins file system structure.</p>
+<p>If needed, the Docker image can be easily changed in custom resource manifest as long as it supports standard Jenkins file system structure.</p>
 
       
     
diff --git a/docs/docs/how-it-works/jenkins-docker-images/index.html b/docs/docs/how-it-works/jenkins-docker-images/index.html
index dba16876..f9b67604 100644
--- a/docs/docs/how-it-works/jenkins-docker-images/index.html
+++ b/docs/docs/how-it-works/jenkins-docker-images/index.html
@@ -477,7 +477,7 @@
 	
Jenkins default image details

Jenkins Operator is fully compatible with jenkins:lts Docker image and does not introduce any hidden changes to the upstream Jenkins.

-

If needed, the Docker image can easily be changed in custom resource manifest as long as it supports standard Jenkins file system structure.

+

If needed, the Docker image can be easily changed in custom resource manifest as long as it supports standard Jenkins file system structure.

diff --git a/docs/docs/index.xml b/docs/docs/index.xml index e558004a..37fb59d0 100644 --- a/docs/docs/index.xml +++ b/docs/docs/index.xml @@ -954,12 +954,12 @@ spec: -<p>Jenkins can be customized using by groovy scripts or the Jenkins Configuration as Code Plugin. All custom configuration is stored in +<p>Jenkins can be customized by using groovy scripts or the Jenkins Configuration as a Code Plugin. All custom configuration is stored in the <strong>jenkins-operator-user-configuration-<cr_name></strong> ConfigMap, which is automatically created by the <strong>Jenkins Operator</strong>.</p> <p>The <strong>Jenkins Operator</strong> creates a <strong>jenkins-operator-user-configuration-<cr_name></strong> secret where the user can store sensitive information used for custom configuration. If you have an entry in the secret named <code>PASSWORD</code> then you can use it in the -Jenkins Configuration as Code Plugin as <code>adminAddress: &quot;${PASSWORD}&quot;</code>.</p> +Jenkins Configuration as a Code Plugin as <code>adminAddress: &quot;${PASSWORD}&quot;</code>.</p> <pre><code>kubectl get secret jenkins-operator-user-configuration-&lt;cr_name&gt; -o yaml @@ -1411,7 +1411,7 @@ for backup and restore are required, e.g.:</p> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>echo<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#4e9a06">&#34;Running backup #${backup_number}&#34;</span><span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>BACKUP_TMP_DIR=$(mktemp<span style="color:#f8f8f8;text-decoration:underline"> </span>-d)<span style="color:#f8f8f8;text-decoration:underline"> -</span><span style="color:#f8f8f8;text-decoration:underline"> </span>tar<span style="color:#f8f8f8;text-decoration:underline"> </span>-C<span style="color:#f8f8f8;text-decoration:underline"> </span>${JENKINS_HOME}<span style="color:#f8f8f8;text-decoration:underline"> </span>-czf<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#4e9a06">&#34;${BACKUP_TMP_DIR}/${backup_number}.tar.gz&#34;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>--exclude<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs/<span style="color:#8f5902;font-style:italic">*/config.xml</span><span style="color:#f8f8f8;text-decoration:underline"> </span>--exclude<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs/<span style="color:#8f5902;font-style:italic">*/workspace*</span><span style="color:#f8f8f8;text-decoration:underline"> </span>-c<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#8f5902;font-style:italic">&amp;&amp;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>\<span style="color:#f8f8f8;text-decoration:underline"> +</span><span style="color:#f8f8f8;text-decoration:underline"> </span>tar<span style="color:#f8f8f8;text-decoration:underline"> </span>-C<span style="color:#f8f8f8;text-decoration:underline"> </span>${JENKINS_HOME}<span style="color:#f8f8f8;text-decoration:underline"> </span>-czf<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#4e9a06">&#34;${BACKUP_TMP_DIR}/${backup_number}.tar.gz&#34;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>--exclude<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs/<span style="color:#8f5902;font-style:italic">*/workspace*</span><span style="color:#f8f8f8;text-decoration:underline"> </span>-c<span style="color:#f8f8f8;text-decoration:underline"> </span>jobs<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#8f5902;font-style:italic">&amp;&amp;</span><span style="color:#f8f8f8;text-decoration:underline"> </span>\<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>aws<span style="color:#f8f8f8;text-decoration:underline"> </span>s3<span style="color:#f8f8f8;text-decoration:underline"> </span>cp<span style="color:#f8f8f8;text-decoration:underline"> </span>${BACKUP_TMP_DIR}/${backup_number}.tar.gz<span style="color:#f8f8f8;text-decoration:underline"> </span>s3<span style="color:#000;font-weight:bold">:</span>//${BACKUP_BUCKET}/${BACKUP_PATH}/${backup_number}.tar.gz<span style="color:#f8f8f8;text-decoration:underline"> </span><span style="color:#f8f8f8;text-decoration:underline"> </span>echo<span style="color:#f8f8f8;text-decoration:underline"> </span>Done<span style="color:#f8f8f8;text-decoration:underline"> @@ -1460,7 +1460,7 @@ the number of backups under control, e.g. Cloud Formation fragment:</p> <p><strong>Jenkins Operator</strong> is fully compatible with <strong><code>jenkins:lts</code></strong> Docker image and does not introduce any hidden changes to the upstream Jenkins.</p> -<p>If needed, the Docker image can easily be changed in custom resource manifest as long as it supports standard Jenkins file system structure.</p> +<p>If needed, the Docker image can be easily changed in custom resource manifest as long as it supports standard Jenkins file system structure.</p> @@ -1489,7 +1489,7 @@ the number of backups under control, e.g. Cloud Formation fragment:</p> <p>In <code>v0.1.x</code> <strong>Jenkins Operator</strong> user configuration application was implemented using <strong>Jenkins</strong> jobs and this mechanism was replaced since <code>v0.2.0</code> with Groovy scripts implementing the same functionality.</p> -<p>As a result the <strong>Jenkins</strong> configuration jobs (&ldquo;Configure Seed Jobs&rdquo;, &ldquo;jenkins-operator-base-configuration&rdquo;, &ldquo;jenkins-operator-user-configuration&rdquo;) are no longer visible in <strong>Jenkins</strong> UI.</p> +<p>As a result, the <strong>Jenkins</strong> configuration jobs (&ldquo;Configure Seed Jobs&rdquo;, &ldquo;jenkins-operator-base-configuration&rdquo;, &ldquo;jenkins-operator-user-configuration&rdquo;) are no longer visible in <strong>Jenkins</strong> UI.</p> <p>In <code>v0.1.x</code> you can see if any of the configuration jobs failed or succeded in the <strong>Jenkins</strong> UI (job build logs). Instead, you can make sure the operator is running correctly by inspecting its logs, e.g.:</p> diff --git a/docs/docs/security/index.html b/docs/docs/security/index.html index cd10ad4a..8172ae6c 100644 --- a/docs/docs/security/index.html +++ b/docs/docs/security/index.html @@ -496,7 +496,7 @@ because Jenkins Operator calls Jenkins API.

  • basic settings - use Mode.EXCLUSIVE - Jobs must specify that they want to run on master node
  • enable CSRF - Cross Site Request Forgery Protection is enabled
  • disable usage stats - Jenkins usage stats submitting is disabled
  • -
  • enable master access control - Slave To Master Access Control is enabled
  • +
  • enable master access control - Slave to Master Access Control is enabled
  • disable old JNLP protocols - JNLP3-connect, JNLP2-connect and JNLP-connect are disabled
  • disable CLI - CLI access of /cli URL is disabled
  • configure kubernetes-plugin - secure configuration for Kubernetes plugin
  • diff --git a/docs/index.html b/docs/index.html index 9aa326c6..27a70242 100644 --- a/docs/index.html +++ b/docs/index.html @@ -225,12 +225,15 @@
    - +
    -

    Bugs

    -

    Help us work on the software by reporting or fixing bugs. Make the Jenkins Operator better.

    +

    Join #jenkins-operator on Slack!

    +

    Ask questions, receive help and talk with other users about operator on dedicated Slack channel.

    + +

    Invite form +Go to Slack

    -

    Read more …

    +
    diff --git a/website/content/en/_index.html b/website/content/en/_index.html index a9d312bd..5c197e47 100644 --- a/website/content/en/_index.html +++ b/website/content/en/_index.html @@ -66,11 +66,15 @@ We do a Pull Request contributions workflow on **GitHub**. New users are always {{% /blocks/feature %}} {{% blocks/feature icon="fas fa-folder-open" title="Documentation" url="/kubernetes-operator/docs" %}} -Learning the usage of Jenkins Operator will make your life easier. After that, you can easily contribute to the project. +Learning the usage of Jenkins Operator will make your life easier. After that, you can easily contribute to the project. {{% /blocks/feature %}} -{{% blocks/feature icon="fas fa-bug" title="Bugs" url="https://github.com/jenkinsci/kubernetes-operator/issues" %}} -Help us work on the software by reporting or fixing bugs. Make the Jenkins Operator better. +{{% blocks/feature icon="fab fa-slack" title="Join #jenkins-operator on Slack!" %}} +Ask questions, receive help and talk with other users about operator on dedicated Slack channel. + + +Invite form +Go to Slack {{% /blocks/feature %}}