Merge pull request #374 from waveywaves/seedjobs/update-slave-image
Update deprecated agent to supported image used in SeedJobs Agents
This commit is contained in:
		
						commit
						db7866953c
					
				|  | @ -7,7 +7,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -731,7 +731,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -153,7 +153,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -725,7 +725,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -154,7 +154,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -730,7 +730,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -152,7 +152,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -730,7 +730,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/&q | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -153,7 +153,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -420,7 +420,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  | @ -726,7 +726,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  | @ -1026,7 +1026,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  | @ -1289,7 +1289,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operato | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -409,7 +409,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri | ||||||
| 					Containers: []corev1.Container{ | 					Containers: []corev1.Container{ | ||||||
| 						{ | 						{ | ||||||
| 							Name:  "jnlp", | 							Name:  "jnlp", | ||||||
| 							Image: "jenkins/jnlp-slave:alpine", | 							Image: "jenkins/inbound-agent:alpine", | ||||||
| 							Env: []corev1.EnvVar{ | 							Env: []corev1.EnvVar{ | ||||||
| 								{ | 								{ | ||||||
| 									Name: "JENKINS_TUNNEL", | 									Name: "JENKINS_TUNNEL", | ||||||
|  |  | ||||||
|  | @ -61,7 +61,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -59,7 +59,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -61,7 +61,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
|  | @ -61,7 +61,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" | ||||||
| 
 | 
 | ||||||
| podTemplate(label: label, | podTemplate(label: label, | ||||||
|         containers: [ |         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), |                 containerTemplate(name: 'go', image: 'golang:1-alpine', command: 'cat', ttyEnabled: true), | ||||||
|         ], |         ], | ||||||
|         envVars: [ |         envVars: [ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue