From b0139762b123a365f06afb90df83f224dab5fc3d Mon Sep 17 00:00:00 2001 From: Vibhav Bobade Date: Thu, 7 May 2020 19:38:54 +0530 Subject: [PATCH] Update agent image used in SeedJobs jenkins/jnlp-slave:alpine is deprecated and replaced with jenkins/inbound-agent:alpine. --- cicd/pipelines/build.jenkins | 2 +- docs/docs/getting-started/latest/configuration/index.html | 2 +- docs/docs/getting-started/latest/index.xml | 2 +- docs/docs/getting-started/v0.1.x/configuration/index.html | 2 +- docs/docs/getting-started/v0.1.x/index.xml | 2 +- docs/docs/getting-started/v0.2.x/configuration/index.html | 2 +- docs/docs/getting-started/v0.2.x/index.xml | 2 +- docs/docs/getting-started/v0.3.x/configuration/index.html | 2 +- docs/docs/getting-started/v0.3.x/index.xml | 2 +- docs/docs/index.xml | 8 ++++---- .../jenkins/configuration/user/seedjobs/seedjobs.go | 2 +- .../en/docs/Getting Started/latest/configuration.md | 2 +- .../en/docs/Getting Started/v0.1.x/configuration.md | 2 +- .../en/docs/Getting Started/v0.2.x/configuration.md | 2 +- .../en/docs/Getting Started/v0.3.x/configuration.md | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cicd/pipelines/build.jenkins b/cicd/pipelines/build.jenkins index 43090f8d..1a463ce7 100644 --- a/cicd/pipelines/build.jenkins +++ b/cicd/pipelines/build.jenkins @@ -7,7 +7,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/latest/configuration/index.html b/docs/docs/getting-started/latest/configuration/index.html index d1b0f6a6..f86b1f31 100644 --- a/docs/docs/getting-started/latest/configuration/index.html +++ b/docs/docs/getting-started/latest/configuration/index.html @@ -731,7 +731,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/latest/index.xml b/docs/docs/getting-started/latest/index.xml index 52d64f00..af84dacc 100644 --- a/docs/docs/getting-started/latest/index.xml +++ b/docs/docs/getting-started/latest/index.xml @@ -153,7 +153,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/v0.1.x/configuration/index.html b/docs/docs/getting-started/v0.1.x/configuration/index.html index 133b2a17..f402b9ca 100644 --- a/docs/docs/getting-started/v0.1.x/configuration/index.html +++ b/docs/docs/getting-started/v0.1.x/configuration/index.html @@ -725,7 +725,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/v0.1.x/index.xml b/docs/docs/getting-started/v0.1.x/index.xml index 923a5d44..a76d628d 100644 --- a/docs/docs/getting-started/v0.1.x/index.xml +++ b/docs/docs/getting-started/v0.1.x/index.xml @@ -154,7 +154,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/v0.2.x/configuration/index.html b/docs/docs/getting-started/v0.2.x/configuration/index.html index b8ef8bd4..84833e5e 100644 --- a/docs/docs/getting-started/v0.2.x/configuration/index.html +++ b/docs/docs/getting-started/v0.2.x/configuration/index.html @@ -730,7 +730,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/v0.2.x/index.xml b/docs/docs/getting-started/v0.2.x/index.xml index 948bcd2f..5827955e 100644 --- a/docs/docs/getting-started/v0.2.x/index.xml +++ b/docs/docs/getting-started/v0.2.x/index.xml @@ -152,7 +152,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/v0.3.x/configuration/index.html b/docs/docs/getting-started/v0.3.x/configuration/index.html index 698039c7..e9e9b072 100644 --- a/docs/docs/getting-started/v0.3.x/configuration/index.html +++ b/docs/docs/getting-started/v0.3.x/configuration/index.html @@ -730,7 +730,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/getting-started/v0.3.x/index.xml b/docs/docs/getting-started/v0.3.x/index.xml index 9e71d036..fb171e91 100644 --- a/docs/docs/getting-started/v0.3.x/index.xml +++ b/docs/docs/getting-started/v0.3.x/index.xml @@ -153,7 +153,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/docs/docs/index.xml b/docs/docs/index.xml index 0cc70b11..b9274b86 100644 --- a/docs/docs/index.xml +++ b/docs/docs/index.xml @@ -420,7 +420,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ @@ -726,7 +726,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ @@ -1026,7 +1026,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ @@ -1289,7 +1289,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go index 33b0bb9b..e5237f0e 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go @@ -409,7 +409,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri Containers: []corev1.Container{ { Name: "jnlp", - Image: "jenkins/jnlp-slave:alpine", + Image: "jenkins/inbound-agent:alpine", Env: []corev1.EnvVar{ { Name: "JENKINS_TUNNEL", diff --git a/website/content/en/docs/Getting Started/latest/configuration.md b/website/content/en/docs/Getting Started/latest/configuration.md index 0c4b6860..c50d5d57 100644 --- a/website/content/en/docs/Getting Started/latest/configuration.md +++ b/website/content/en/docs/Getting Started/latest/configuration.md @@ -61,7 +61,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/website/content/en/docs/Getting Started/v0.1.x/configuration.md b/website/content/en/docs/Getting Started/v0.1.x/configuration.md index 45ccded1..90e6007e 100644 --- a/website/content/en/docs/Getting Started/v0.1.x/configuration.md +++ b/website/content/en/docs/Getting Started/v0.1.x/configuration.md @@ -59,7 +59,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/website/content/en/docs/Getting Started/v0.2.x/configuration.md b/website/content/en/docs/Getting Started/v0.2.x/configuration.md index ef8086b1..62ff8444 100644 --- a/website/content/en/docs/Getting Started/v0.2.x/configuration.md +++ b/website/content/en/docs/Getting Started/v0.2.x/configuration.md @@ -61,7 +61,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [ diff --git a/website/content/en/docs/Getting Started/v0.3.x/configuration.md b/website/content/en/docs/Getting Started/v0.3.x/configuration.md index 40ac0adb..4994f6b3 100644 --- a/website/content/en/docs/Getting Started/v0.3.x/configuration.md +++ b/website/content/en/docs/Getting Started/v0.3.x/configuration.md @@ -61,7 +61,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" podTemplate(label: label, containers: [ - containerTemplate(name: 'jnlp', image: 'jenkins/jnlp-slave:alpine'), + containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:alpine'), containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), ], envVars: [