Skip to content

Commit 230d419

Browse files
deads2kdeads2k
committed
make the jenkins service last so that you can retry on failures
1 parent a451237 commit 230d419

File tree

4 files changed

+106
-106
lines changed

4 files changed

+106
-106
lines changed

‎examples/jenkins/jenkins-ephemeral-template.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,6 @@
1111
}
1212
},
1313
"objects": [
14-
{
15-
"kind": "Service",
16-
"apiVersion": "v1",
17-
"metadata": {
18-
"name": "${JENKINS_SERVICE_NAME}",
19-
"creationTimestamp": null
20-
},
21-
"spec": {
22-
"ports": [
23-
{
24-
"name": "web",
25-
"protocol": "TCP",
26-
"port": 8080,
27-
"targetPort": 8080,
28-
"nodePort": 0
29-
}
30-
],
31-
"selector": {
32-
"name": "${JENKINS_SERVICE_NAME}"
33-
},
34-
"portalIP": "",
35-
"type": "ClusterIP",
36-
"sessionAffinity": "None"
37-
}
38-
},
3914
{
4015
"kind": "Route",
4116
"apiVersion": "v1",
@@ -158,6 +133,31 @@
158133
}
159134
}
160135
}
136+
},
137+
{
138+
"kind": "Service",
139+
"apiVersion": "v1",
140+
"metadata": {
141+
"name": "${JENKINS_SERVICE_NAME}",
142+
"creationTimestamp": null
143+
},
144+
"spec": {
145+
"ports": [
146+
{
147+
"name": "web",
148+
"protocol": "TCP",
149+
"port": 8080,
150+
"targetPort": 8080,
151+
"nodePort": 0
152+
}
153+
],
154+
"selector": {
155+
"name": "${JENKINS_SERVICE_NAME}"
156+
},
157+
"portalIP": "",
158+
"type": "ClusterIP",
159+
"sessionAffinity": "None"
160+
}
161161
}
162162
],
163163
"parameters": [

‎examples/jenkins/jenkins-persistent-template.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,6 @@
1111
}
1212
},
1313
"objects": [
14-
{
15-
"kind": "Service",
16-
"apiVersion": "v1",
17-
"metadata": {
18-
"name": "${JENKINS_SERVICE_NAME}",
19-
"creationTimestamp": null
20-
},
21-
"spec": {
22-
"ports": [
23-
{
24-
"name": "web",
25-
"protocol": "TCP",
26-
"port": 8080,
27-
"targetPort": 8080,
28-
"nodePort": 0
29-
}
30-
],
31-
"selector": {
32-
"name": "${JENKINS_SERVICE_NAME}"
33-
},
34-
"portalIP": "",
35-
"type": "ClusterIP",
36-
"sessionAffinity": "None"
37-
}
38-
},
3914
{
4015
"kind": "Route",
4116
"apiVersion": "v1",
@@ -175,6 +150,31 @@
175150
}
176151
}
177152
}
153+
},
154+
{
155+
"kind": "Service",
156+
"apiVersion": "v1",
157+
"metadata": {
158+
"name": "${JENKINS_SERVICE_NAME}",
159+
"creationTimestamp": null
160+
},
161+
"spec": {
162+
"ports": [
163+
{
164+
"name": "web",
165+
"protocol": "TCP",
166+
"port": 8080,
167+
"targetPort": 8080,
168+
"nodePort": 0
169+
}
170+
],
171+
"selector": {
172+
"name": "${JENKINS_SERVICE_NAME}"
173+
},
174+
"portalIP": "",
175+
"type": "ClusterIP",
176+
"sessionAffinity": "None"
177+
}
178178
}
179179
],
180180
"parameters": [

‎examples/jenkins/master-slave/jenkins-master-template.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,37 +51,6 @@
5151
}
5252
],
5353
"objects": [
54-
{
55-
"kind": "Service",
56-
"apiVersion": "v1",
57-
"metadata": {
58-
"name": "${JENKINS_SERVICE_NAME}"
59-
},
60-
"spec": {
61-
"ports": [
62-
{
63-
"name": "web",
64-
"protocol": "TCP",
65-
"port": 8080,
66-
"targetPort": 8080,
67-
"nodePort": 0
68-
},
69-
{
70-
"name": "jnlp",
71-
"protocol": "TCP",
72-
"port": 49187,
73-
"targetPort": 49187,
74-
"nodePort": 0
75-
}
76-
],
77-
"selector": {
78-
"name": "${JENKINS_SERVICE_NAME}"
79-
},
80-
"portalIP": "",
81-
"type": "ClusterIP",
82-
"sessionAffinity": "None"
83-
}
84-
},
8554
{
8655
"kind": "Route",
8756
"apiVersion": "v1",
@@ -260,6 +229,37 @@
260229
}
261230
}
262231
}
232+
},
233+
{
234+
"kind": "Service",
235+
"apiVersion": "v1",
236+
"metadata": {
237+
"name": "${JENKINS_SERVICE_NAME}"
238+
},
239+
"spec": {
240+
"ports": [
241+
{
242+
"name": "web",
243+
"protocol": "TCP",
244+
"port": 8080,
245+
"targetPort": 8080,
246+
"nodePort": 0
247+
},
248+
{
249+
"name": "jnlp",
250+
"protocol": "TCP",
251+
"port": 49187,
252+
"targetPort": 49187,
253+
"nodePort": 0
254+
}
255+
],
256+
"selector": {
257+
"name": "${JENKINS_SERVICE_NAME}"
258+
},
259+
"portalIP": "",
260+
"type": "ClusterIP",
261+
"sessionAffinity": "None"
262+
}
263263
}
264264
]
265265
}

‎examples/jenkins/pipeline/jenkinstemplate.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,6 @@
1111
}
1212
},
1313
"objects": [
14-
{
15-
"kind": "Service",
16-
"apiVersion": "v1",
17-
"metadata": {
18-
"name": "${JENKINS_SERVICE_NAME}",
19-
"creationTimestamp": null
20-
},
21-
"spec": {
22-
"ports": [
23-
{
24-
"name": "web",
25-
"protocol": "TCP",
26-
"port": 80,
27-
"targetPort": 8080,
28-
"nodePort": 0
29-
}
30-
],
31-
"selector": {
32-
"name": "${JENKINS_SERVICE_NAME}"
33-
},
34-
"portalIP": "",
35-
"type": "ClusterIP",
36-
"sessionAffinity": "None"
37-
}
38-
},
3914
{
4015
"kind": "Service",
4116
"apiVersion": "v1",
@@ -181,6 +156,31 @@
181156
}
182157
}
183158
}
159+
},
160+
{
161+
"kind": "Service",
162+
"apiVersion": "v1",
163+
"metadata": {
164+
"name": "${JENKINS_SERVICE_NAME}",
165+
"creationTimestamp": null
166+
},
167+
"spec": {
168+
"ports": [
169+
{
170+
"name": "web",
171+
"protocol": "TCP",
172+
"port": 80,
173+
"targetPort": 8080,
174+
"nodePort": 0
175+
}
176+
],
177+
"selector": {
178+
"name": "${JENKINS_SERVICE_NAME}"
179+
},
180+
"portalIP": "",
181+
"type": "ClusterIP",
182+
"sessionAffinity": "None"
183+
}
184184
}
185185
],
186186
"parameters": [

0 commit comments

Comments
 (0)