Skip to content
This repository was archived by the owner on Apr 27, 2020. It is now read-only.

Commit 3f15d3e

Browse files
Update the base image to ubuntu:18.04 (#40)
* Update the base image to ubuntu:18.04 * Update ci/pipeline.yaml * Make base-image resource name to a variable
1 parent 4fc4eb5 commit 3f15d3e

File tree

5 files changed

+37
-28
lines changed

5 files changed

+37
-28
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ script:
3838
- ./scripts/verify-authors.sh
3939
- make lint
4040
- make test
41+
- make image

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM golang:1.10
33
RUN set -x && \
44
go get -u -v github.com/kubernetes-sigs/aws-iam-authenticator/cmd/aws-iam-authenticator
55

6-
FROM ubuntu:16.04
6+
FROM ubuntu:18.04
77

88
MAINTAINER Kazuki Suda <ksuda@zlab.co.jp>
99

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
IMAGE := zlabjp/kubernetes-resource
2+
3+
.PHONY: image
4+
image:
5+
docker build -t $(IMAGE) .
6+
17
.PHONY: test
28
test:
39
@scripts/run-bats.sh

ci/pipeline.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# DO NOT MAKE CHANGES TO THIS FILE. Instead, modify ci/pipeline.yml.erb and
55
# execute build-pipeline-yml.
66
#
7-
# created: 2018-08-21T15:18:07+09:00
7+
# created: 2018-08-27T15:50:45+09:00
88
#
99
resource_types:
1010
- name: slack-notification
@@ -19,11 +19,11 @@ resource_types:
1919
tag: latest
2020

2121
resources:
22-
- name: ubuntu-16.04
22+
- name: ubuntu-18.04
2323
type: docker-image
2424
source:
2525
repository: ubuntu
26-
tag: "16.04"
26+
tag: "18.04"
2727

2828
- name: kubernetes-resource
2929
type: git
@@ -162,7 +162,7 @@ jobs:
162162
- aggregate:
163163
- get: kubernetes-resource
164164
trigger: true
165-
- get: ubuntu-16.04
165+
- get: ubuntu-18.04
166166
params: {save: true}
167167
trigger: true
168168
- get: latest
@@ -173,7 +173,7 @@ jobs:
173173
- put: kubernetes-resource-image-edge
174174
params:
175175
build: kubernetes-resource
176-
load_base: ubuntu-16.04
176+
load_base: ubuntu-18.04
177177
build_args_file: output/build-args-file
178178
on_success:
179179
put: notify
@@ -201,7 +201,7 @@ jobs:
201201
- aggregate:
202202
- get: kubernetes-resource-release
203203
trigger: true
204-
- get: ubuntu-16.04
204+
- get: ubuntu-18.04
205205
params: {save: true}
206206
trigger: true
207207
- get: stable-1.6
@@ -212,7 +212,7 @@ jobs:
212212
- put: kubernetes-resource-image-1.6
213213
params:
214214
build: kubernetes-resource-release
215-
load_base: ubuntu-16.04
215+
load_base: ubuntu-18.04
216216
build_args_file: output/build-args-file
217217
on_success:
218218
put: notify
@@ -239,7 +239,7 @@ jobs:
239239
- aggregate:
240240
- get: kubernetes-resource-release
241241
trigger: true
242-
- get: ubuntu-16.04
242+
- get: ubuntu-18.04
243243
params: {save: true}
244244
trigger: true
245245
- get: stable-1.7
@@ -250,7 +250,7 @@ jobs:
250250
- put: kubernetes-resource-image-1.7
251251
params:
252252
build: kubernetes-resource-release
253-
load_base: ubuntu-16.04
253+
load_base: ubuntu-18.04
254254
build_args_file: output/build-args-file
255255
on_success:
256256
put: notify
@@ -277,7 +277,7 @@ jobs:
277277
- aggregate:
278278
- get: kubernetes-resource-release
279279
trigger: true
280-
- get: ubuntu-16.04
280+
- get: ubuntu-18.04
281281
params: {save: true}
282282
trigger: true
283283
- get: stable-1.8
@@ -288,7 +288,7 @@ jobs:
288288
- put: kubernetes-resource-image-1.8
289289
params:
290290
build: kubernetes-resource-release
291-
load_base: ubuntu-16.04
291+
load_base: ubuntu-18.04
292292
build_args_file: output/build-args-file
293293
on_success:
294294
put: notify
@@ -315,7 +315,7 @@ jobs:
315315
- aggregate:
316316
- get: kubernetes-resource-release
317317
trigger: true
318-
- get: ubuntu-16.04
318+
- get: ubuntu-18.04
319319
params: {save: true}
320320
trigger: true
321321
- get: stable-1.9
@@ -326,7 +326,7 @@ jobs:
326326
- put: kubernetes-resource-image-1.9
327327
params:
328328
build: kubernetes-resource-release
329-
load_base: ubuntu-16.04
329+
load_base: ubuntu-18.04
330330
build_args_file: output/build-args-file
331331
on_success:
332332
put: notify
@@ -353,7 +353,7 @@ jobs:
353353
- aggregate:
354354
- get: kubernetes-resource-release
355355
trigger: true
356-
- get: ubuntu-16.04
356+
- get: ubuntu-18.04
357357
params: {save: true}
358358
trigger: true
359359
- get: stable-1.10
@@ -364,7 +364,7 @@ jobs:
364364
- put: kubernetes-resource-image-1.10
365365
params:
366366
build: kubernetes-resource-release
367-
load_base: ubuntu-16.04
367+
load_base: ubuntu-18.04
368368
build_args_file: output/build-args-file
369369
on_success:
370370
put: notify
@@ -391,7 +391,7 @@ jobs:
391391
- aggregate:
392392
- get: kubernetes-resource-release
393393
trigger: true
394-
- get: ubuntu-16.04
394+
- get: ubuntu-18.04
395395
params: {save: true}
396396
trigger: true
397397
- get: stable-1.11
@@ -402,7 +402,7 @@ jobs:
402402
- put: kubernetes-resource-image-1.11
403403
params:
404404
build: kubernetes-resource-release
405-
load_base: ubuntu-16.04
405+
load_base: ubuntu-18.04
406406
build_args_file: output/build-args-file
407407
on_success:
408408
put: notify
@@ -429,7 +429,7 @@ jobs:
429429
- aggregate:
430430
- get: kubernetes-resource-release
431431
trigger: true
432-
- get: ubuntu-16.04
432+
- get: ubuntu-18.04
433433
params: {save: true}
434434
trigger: true
435435
- get: latest
@@ -440,7 +440,7 @@ jobs:
440440
- put: kubernetes-resource-image-latest
441441
params:
442442
build: kubernetes-resource-release
443-
load_base: ubuntu-16.04
443+
load_base: ubuntu-18.04
444444
build_args_file: output/build-args-file
445445
on_success:
446446
put: notify

ci/pipeline.yml.erb

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<%
2+
kubernetes_versions = %w(stable-1.6 stable-1.7 stable-1.8 stable-1.9 stable-1.10 stable-1.11 latest)
23
def tag(version); version.sub(/^stable-/, ''); end
34
def image_resource_name(version); "kubernetes-resource-image-" + tag(version); end
45

5-
kubernetes_versions = %w(stable-1.6 stable-1.7 stable-1.8 stable-1.9 stable-1.10 stable-1.11 latest)
6+
base_image = {repository: 'ubuntu', tag: '18.04'}
7+
def base_image.to_s; "#{self[:repository]}-#{self[:tag]}"; end
68
%>
79
# ci/pipeline.yml
810
#
@@ -24,11 +26,11 @@ resource_types:
2426
tag: latest
2527

2628
resources:
27-
- name: ubuntu-16.04
29+
- name: <%= base_image %>
2830
type: docker-image
2931
source:
30-
repository: ubuntu
31-
tag: "16.04"
32+
repository: <%= base_image[:repository] %>
33+
tag: "<%= base_image[:tag] %>"
3234

3335
- name: kubernetes-resource
3436
type: git
@@ -83,7 +85,7 @@ jobs:
8385
- aggregate:
8486
- get: kubernetes-resource
8587
trigger: true
86-
- get: ubuntu-16.04
88+
- get: <%= base_image %>
8789
params: {save: true}
8890
trigger: true
8991
- get: latest
@@ -94,7 +96,7 @@ jobs:
9496
- put: <%= image_resource_name("edge") %>
9597
params:
9698
build: kubernetes-resource
97-
load_base: ubuntu-16.04
99+
load_base: <%= base_image %>
98100
build_args_file: output/build-args-file
99101
on_success:
100102
put: notify
@@ -122,7 +124,7 @@ jobs:
122124
- aggregate:
123125
- get: kubernetes-resource-release
124126
trigger: true
125-
- get: ubuntu-16.04
127+
- get: <%= base_image %>
126128
params: {save: true}
127129
trigger: true
128130
- get: <%= version %>
@@ -133,7 +135,7 @@ jobs:
133135
- put: <%= image_resource_name(version) %>
134136
params:
135137
build: kubernetes-resource-release
136-
load_base: ubuntu-16.04
138+
load_base: <%= base_image %>
137139
build_args_file: output/build-args-file
138140
on_success:
139141
put: notify

0 commit comments

Comments
 (0)