Skip to content

Commit ef5208c

Browse files
pepovamuraru
andauthored
Upgrade to 1.17 libs (#26)
* Update k8s dependencies to 0.17.4 * ignore legacy test for 1.17 * try with kubernetes 1.17.0 * Ignore options for StatfulSet volumeClaimTemplate status and typeMeta fields * separate integration test for 1.17.0 and 1.17.4 * remove 1.12 and 1.13 tests and guards * remove obsolete test Co-authored-by: Adi Muraru <amuraru@adobe.com>
1 parent ac3c322 commit ef5208c

File tree

6 files changed

+350
-162
lines changed

6 files changed

+350
-162
lines changed

.circleci/config.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,18 @@ jobs:
136136
name: Run verification
137137
command: make
138138

139+
integration-test-k8s1-17:
140+
<<: *integration-test-base
141+
environment:
142+
<<: *integration-test-environment
143+
K8S_VERSION: v1.17.0
144+
145+
integration-test-k8s1-17-4:
146+
<<: *integration-test-base
147+
environment:
148+
<<: *integration-test-environment
149+
K8S_VERSION: v1.17.4
150+
139151
integration-test-k8s1-16:
140152
<<: *integration-test-base
141153
environment:
@@ -177,18 +189,18 @@ workflows:
177189
ci:
178190
jobs:
179191
- check
180-
- integration-test-k8s1-16:
192+
- integration-test-k8s1-17:
181193
requires:
182194
- check
183-
- integration-test-k8s1-15:
195+
- integration-test-k8s1-17-4:
184196
requires:
185197
- check
186-
- integration-test-k8s1-14:
198+
- integration-test-k8s1-16:
187199
requires:
188200
- check
189-
- integration-test-k8s1-13:
201+
- integration-test-k8s1-15:
190202
requires:
191203
- check
192-
- integration-test-k8s1-12:
204+
- integration-test-k8s1-14:
193205
requires:
194206
- check

go.mod

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
module github.com/banzaicloud/k8s-objectmatcher
22

3-
go 1.12
3+
go 1.13
44

55
require (
66
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
7-
github.com/gogo/protobuf v1.2.1 // indirect
8-
github.com/golang/protobuf v1.3.2 // indirect
9-
github.com/googleapis/gnostic v0.3.0 // indirect
7+
github.com/golang/protobuf v1.3.5 // indirect
8+
github.com/googleapis/gnostic v0.3.1 // indirect
109
github.com/goph/emperror v0.17.2
1110
github.com/imdario/mergo v0.3.7 // indirect
12-
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be
11+
github.com/json-iterator/go v1.1.9
1312
github.com/pkg/errors v0.8.1
14-
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
15-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
16-
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
17-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
1813
google.golang.org/appengine v1.6.1 // indirect
19-
gopkg.in/inf.v0 v0.9.1 // indirect
20-
k8s.io/api v0.15.7
21-
k8s.io/apiextensions-apiserver v0.15.7
22-
k8s.io/apimachinery v0.15.7
23-
k8s.io/client-go v0.15.7
24-
k8s.io/klog v0.4.0
25-
k8s.io/kube-openapi v0.0.0-20190722073852-5e22f3d471e6 // indirect
26-
k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a
14+
k8s.io/api v0.17.4
15+
k8s.io/apiextensions-apiserver v0.17.4
16+
k8s.io/apimachinery v0.17.4
17+
k8s.io/client-go v0.17.4
18+
k8s.io/klog v1.0.0
19+
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
2720
)

0 commit comments

Comments
 (0)