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

Commit 0241270

Browse files
superbrotherssuperbrothers
authored
Add support for Kubernetes 1.15 (#76)
* Add support for Kubernetes 1.15 In addition, we drop support for 1.12. * Upgrade kind to v0.3.0
1 parent bd56e90 commit 0241270

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ language: bash
22

33
env:
44
matrix:
5-
- KUBECTL_VERSION=v1.14.0 NODE_VERSION=v1.14.0
6-
- KUBECTL_VERSION=v1.13.0 NODE_VERSION=v1.13.3
7-
- KUBECTL_VERSION=v1.12.0 NODE_VERSION=v1.12.3
5+
- KUBECTL_VERSION=v1.15.0 NODE_VERSION=v1.14.2@sha256:33539d830a6cf20e3e0a75d0c46a4e94730d78c7375435e6b49833d81448c319
6+
- KUBECTL_VERSION=v1.14.0 NODE_VERSION=v1.14.2@sha256:33539d830a6cf20e3e0a75d0c46a4e94730d78c7375435e6b49833d81448c319
7+
- KUBECTL_VERSION=v1.13.0 NODE_VERSION=v1.13.6@sha256:9e07014fb48c746deb98ec8aafd58c3918622eca6063e643c6e6d86c86e170b4
88

99
services:
1010
- docker
@@ -13,7 +13,7 @@ before_script:
1313
# Download and install kubectl
1414
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
1515
# Download and install kind
16-
- curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64 && chmod +x kind && sudo mv kind /usr/local/bin/
16+
- curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.3.0/kind-linux-amd64 && chmod +x kind && sudo mv kind /usr/local/bin/
1717
# Create a new kubernetes cluster
1818
- kind create cluster --image="kindest/node:${NODE_VERSION}"
1919
# Set KUBECONFIG environment variable

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ A Concourse resource for controlling the Kubernetes cluster.
1010

1111
The version of this resource corresponds to the version of kubectl. We recommend using different version depending on the kubernetes version of the cluster.
1212

13+
- `zlabjp/kubernetes-resource:1.15` ([stable-1.15](https://storage.googleapis.com/kubernetes-release/release/stable-1.15.txt))
1314
- `zlabjp/kubernetes-resource:1.14` ([stable-1.14](https://storage.googleapis.com/kubernetes-release/release/stable-1.14.txt))
1415
- `zlabjp/kubernetes-resource:1.13` ([stable-1.13](https://storage.googleapis.com/kubernetes-release/release/stable-1.13.txt))
15-
- `zlabjp/kubernetes-resource:1.12` ([stable-1.12](https://storage.googleapis.com/kubernetes-release/release/stable-1.12.txt))
1616
- `zlabjp/kubernetes-resource:latest` ([latest](https://storage.googleapis.com/kubernetes-release/release/latest.txt))
1717

1818
## Source Configuration

‎ci/pipeline.yml

Lines changed: 31 additions & 31 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: 2019-04-01T14:18:59+09:00
7+
# created: 2019-06-21T05:05:12+00:00
88
#
99
resource_types:
1010
- name: slack-notification
@@ -44,27 +44,27 @@ resources:
4444
url: ((slack-url))
4545

4646

47-
- name: kubernetes-resource-image-1.12
47+
- name: kubernetes-resource-image-1.13
4848
type: docker-image
4949
source:
5050
repository: zlabjp/kubernetes-resource
51-
tag: "1.12"
51+
tag: "1.13"
5252
username: ((docker-username))
5353
password: ((docker-password))
5454

55-
- name: kubernetes-resource-image-1.13
55+
- name: kubernetes-resource-image-1.14
5656
type: docker-image
5757
source:
5858
repository: zlabjp/kubernetes-resource
59-
tag: "1.13"
59+
tag: "1.14"
6060
username: ((docker-username))
6161
password: ((docker-password))
6262

63-
- name: kubernetes-resource-image-1.14
63+
- name: kubernetes-resource-image-1.15
6464
type: docker-image
6565
source:
6666
repository: zlabjp/kubernetes-resource
67-
tag: "1.14"
67+
tag: "1.15"
6868
username: ((docker-username))
6969
password: ((docker-password))
7070

@@ -86,12 +86,6 @@ resources:
8686
password: ((docker-password))
8787

8888

89-
- name: stable-1.12
90-
type: file-url
91-
source:
92-
url: https://storage.googleapis.com/kubernetes-release/release/stable-1.12.txt
93-
filename: version
94-
9589
- name: stable-1.13
9690
type: file-url
9791
source:
@@ -104,6 +98,12 @@ resources:
10498
url: https://storage.googleapis.com/kubernetes-release/release/stable-1.14.txt
10599
filename: version
106100

101+
- name: stable-1.15
102+
type: file-url
103+
source:
104+
url: https://storage.googleapis.com/kubernetes-release/release/stable-1.15.txt
105+
filename: version
106+
107107
- name: latest
108108
type: file-url
109109
source:
@@ -151,7 +151,7 @@ jobs:
151151
Failure! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
152152
153153
154-
- name: build-kubernetes-resource-image-1.12
154+
- name: build-kubernetes-resource-image-1.13
155155
public: true
156156
serial: true
157157
plan:
@@ -162,12 +162,12 @@ jobs:
162162
- get: ubuntu-18.04
163163
params: {save: true}
164164
trigger: true
165-
- get: stable-1.12
165+
- get: stable-1.13
166166
trigger: true
167167
- task: build-build-args-file
168168
file: kubernetes-resource-release/ci/tasks/build-build-args-file.yml
169-
input_mapping: {version: stable-1.12}
170-
- put: kubernetes-resource-image-1.12
169+
input_mapping: {version: stable-1.13}
170+
- put: kubernetes-resource-image-1.13
171171
params:
172172
build: kubernetes-resource-release
173173
load_base: ubuntu-18.04
@@ -176,20 +176,20 @@ jobs:
176176
put: notify
177177
params:
178178
channel: ((slack-success-channel))
179-
username: concourse / kubernetes-resource-image-1.12
179+
username: concourse / kubernetes-resource-image-1.13
180180
icon_emoji: ":dancing-penguin:"
181181
text: |
182182
Success! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
183183
on_failure:
184184
put: notify
185185
params:
186186
channel: ((slack-failure-channel))
187-
username: concourse / kubernetes-resource-image-1.12
187+
username: concourse / kubernetes-resource-image-1.13
188188
icon_emoji: ":rage:"
189189
text: |
190190
Failure! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
191191
192-
- name: build-kubernetes-resource-image-1.13
192+
- name: build-kubernetes-resource-image-1.14
193193
public: true
194194
serial: true
195195
plan:
@@ -200,12 +200,12 @@ jobs:
200200
- get: ubuntu-18.04
201201
params: {save: true}
202202
trigger: true
203-
- get: stable-1.13
203+
- get: stable-1.14
204204
trigger: true
205205
- task: build-build-args-file
206206
file: kubernetes-resource-release/ci/tasks/build-build-args-file.yml
207-
input_mapping: {version: stable-1.13}
208-
- put: kubernetes-resource-image-1.13
207+
input_mapping: {version: stable-1.14}
208+
- put: kubernetes-resource-image-1.14
209209
params:
210210
build: kubernetes-resource-release
211211
load_base: ubuntu-18.04
@@ -214,20 +214,20 @@ jobs:
214214
put: notify
215215
params:
216216
channel: ((slack-success-channel))
217-
username: concourse / kubernetes-resource-image-1.13
217+
username: concourse / kubernetes-resource-image-1.14
218218
icon_emoji: ":dancing-penguin:"
219219
text: |
220220
Success! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
221221
on_failure:
222222
put: notify
223223
params:
224224
channel: ((slack-failure-channel))
225-
username: concourse / kubernetes-resource-image-1.13
225+
username: concourse / kubernetes-resource-image-1.14
226226
icon_emoji: ":rage:"
227227
text: |
228228
Failure! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
229229
230-
- name: build-kubernetes-resource-image-1.14
230+
- name: build-kubernetes-resource-image-1.15
231231
public: true
232232
serial: true
233233
plan:
@@ -238,12 +238,12 @@ jobs:
238238
- get: ubuntu-18.04
239239
params: {save: true}
240240
trigger: true
241-
- get: stable-1.14
241+
- get: stable-1.15
242242
trigger: true
243243
- task: build-build-args-file
244244
file: kubernetes-resource-release/ci/tasks/build-build-args-file.yml
245-
input_mapping: {version: stable-1.14}
246-
- put: kubernetes-resource-image-1.14
245+
input_mapping: {version: stable-1.15}
246+
- put: kubernetes-resource-image-1.15
247247
params:
248248
build: kubernetes-resource-release
249249
load_base: ubuntu-18.04
@@ -252,15 +252,15 @@ jobs:
252252
put: notify
253253
params:
254254
channel: ((slack-success-channel))
255-
username: concourse / kubernetes-resource-image-1.14
255+
username: concourse / kubernetes-resource-image-1.15
256256
icon_emoji: ":dancing-penguin:"
257257
text: |
258258
Success! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
259259
on_failure:
260260
put: notify
261261
params:
262262
channel: ((slack-failure-channel))
263-
username: concourse / kubernetes-resource-image-1.14
263+
username: concourse / kubernetes-resource-image-1.15
264264
icon_emoji: ":rage:"
265265
text: |
266266
Failure! $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME

‎ci/pipeline.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%
2-
kubernetes_versions = %w(stable-1.12 stable-1.13 stable-1.14 latest)
2+
kubernetes_versions = %w(stable-1.13 stable-1.14 stable-1.15 latest)
33
def tag(version); version.sub(/^stable-/, ''); end
44
def image_resource_name(version); "kubernetes-resource-image-" + tag(version); end
55

0 commit comments

Comments
 (0)