diff --git a/go.mod b/go.mod index 730b9fe8..04c4754a 100644 --- a/go.mod +++ b/go.mod @@ -77,3 +77,5 @@ replace ( git.apache.org/thrift.git => github.com/apache/thrift v0.12.0 github.com/golang/lint v0.0.0-20190409202823-959b441ac422 => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 ) + +go 1.13 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 f6e0c845..8968114f 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 @@ -122,11 +122,11 @@ spec: You can verify if deploy keys were successfully configured in Jenkins **Credentials** tab. -![jenkins](/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. -![jenkins](/img/jenkins-seed.png) +![jenkins](/kubernetes-operator/img/jenkins-seed.png) If your GitHub repository is **private** you have to configure SSH or username/password authentication. diff --git a/website/content/en/docs/Getting Started/v0.1.1/deploy-jenkins.md b/website/content/en/docs/Getting Started/v0.1.1/deploy-jenkins.md index 892f3be3..11ece335 100644 --- a/website/content/en/docs/Getting Started/v0.1.1/deploy-jenkins.md +++ b/website/content/en/docs/Getting Started/v0.1.1/deploy-jenkins.md @@ -88,4 +88,4 @@ Connect to Jenkins (actual Kubernetes cluster): kubectl port-forward jenkins- 8080:8080 ``` Then open browser with address `http://localhost:8080`. -![jenkins](/img/jenkins.png) +![jenkins](/kubernetes-operator/img/jenkins.png) diff --git a/website/content/en/docs/Getting Started/v0.2.0/configuration.md b/website/content/en/docs/Getting Started/v0.2.0/configuration.md index 90a1b3c8..092ea4fb 100644 --- a/website/content/en/docs/Getting Started/v0.2.0/configuration.md +++ b/website/content/en/docs/Getting Started/v0.2.0/configuration.md @@ -124,11 +124,11 @@ spec: You can verify if deploy keys were successfully configured in Jenkins **Credentials** tab. -![jenkins](/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. -![jenkins](/img/jenkins-seed.png) +![jenkins](/kubernetes-operator/img/jenkins-seed.png) If your GitHub repository is **private** you have to configure SSH or username/password authentication. diff --git a/website/content/en/docs/How it works/architecture-and-design.md b/website/content/en/docs/How it works/architecture-and-design.md index 321ad698..6b933f0c 100644 --- a/website/content/en/docs/How it works/architecture-and-design.md +++ b/website/content/en/docs/How it works/architecture-and-design.md @@ -11,7 +11,7 @@ The **jenkins-operator** design incorporates the following concepts: - watches any changes of manifests and maintain the desired state according to deployed custom resource manifest - implements the main reconciliation loop which consists of two smaller reconciliation loops - base and user -![reconcile](/img/reconcile.png) +![reconcile](/kubernetes-operator/img/reconcile.png) **Base** reconciliation loop takes care of reconciling base Jenkins configuration, which consists of: - Ensure Manifests - monitors any changes in manifests @@ -25,7 +25,7 @@ The **jenkins-operator** design incorporates the following concepts: - Ensure User Configuration - executed user provided configuration, like groovy scripts, configuration as code or plugins - Ensure Backup Job - creates Backup job and ensures that backup has been successfully performed -![reconcile](/img/phases.png) +![reconcile](/kubernetes-operator/img/phases.png) ## Operator State