Skip to content

Commit a5898ba

Browse files
Merge pull request #33 from banzaicloud/kubernetes-1.19
chore(deps): upgrade kubernetes to 1.19
2 parents 7608074 + 863a8d1 commit a5898ba

File tree

6 files changed

+312
-147
lines changed

6 files changed

+312
-147
lines changed

.circleci/config.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22

33
integration-test-environment: &integration-test-environment
4-
GO_VERSION: "1.13.4"
4+
GO_VERSION: "1.15.2"
55
KUBECONFIG: /home/circleci/.kube/config
6-
MINIKUBE_VERSION: v1.6.2
6+
MINIKUBE_VERSION: v1.13.1
77
MINIKUBE_WANTUPDATENOTIFICATION: false
88
MINIKUBE_WANTREPORTERRORPROMPT: false
99
MINIKUBE_HOME: /home/circleci
@@ -17,6 +17,13 @@ integration-test-base: &integration-test-base
1717
image: ubuntu-1604:201903-01
1818
docker_layer_caching: true
1919
steps:
20+
# Required by Kubernetes 1.18 and 1.19
21+
- run:
22+
name: Install conntrack
23+
command: |
24+
sudo apt-get update -y
25+
sudo apt-get install -y conntrack
26+
2027
- run:
2128
name: Setup minikube
2229
command: |
@@ -83,7 +90,7 @@ integration-test-base: &integration-test-base
8390
jobs:
8491
check:
8592
docker:
86-
- image: circleci/golang:1.12
93+
- image: circleci/golang:1.15
8794
environment:
8895
GOFLAG: -mod=readonly
8996

@@ -136,23 +143,29 @@ jobs:
136143
name: Run verification
137144
command: make
138145

139-
integration-test-k8s1-17:
146+
integration-test-k8s1-19:
140147
<<: *integration-test-base
141148
environment:
142149
<<: *integration-test-environment
143-
K8S_VERSION: v1.17.0
150+
K8S_VERSION: v1.19.2
144151

145-
integration-test-k8s1-17-4:
152+
integration-test-k8s1-18:
146153
<<: *integration-test-base
147154
environment:
148155
<<: *integration-test-environment
149-
K8S_VERSION: v1.17.4
156+
K8S_VERSION: v1.18.9
157+
158+
integration-test-k8s1-17:
159+
<<: *integration-test-base
160+
environment:
161+
<<: *integration-test-environment
162+
K8S_VERSION: v1.17.12
150163

151164
integration-test-k8s1-16:
152165
<<: *integration-test-base
153166
environment:
154167
<<: *integration-test-environment
155-
K8S_VERSION: v1.16.4
168+
K8S_VERSION: v1.16.15
156169

157170
integration-test-k8s1-15:
158171
<<: *integration-test-base
@@ -189,10 +202,13 @@ workflows:
189202
ci:
190203
jobs:
191204
- check
192-
- integration-test-k8s1-17:
205+
- integration-test-k8s1-19:
193206
requires:
194207
- check
195-
- integration-test-k8s1-17-4:
208+
- integration-test-k8s1-18:
209+
requires:
210+
- check
211+
- integration-test-k8s1-17:
196212
requires:
197213
- check
198214
- integration-test-k8s1-16:

.licensei.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ ignored = [
1515
"go.uber.org/atomic",
1616
"go.uber.org/multierr",
1717
"emperror.dev/errors",
18+
"k8s.io/klog/v2",
19+
"sigs.k8s.io/structured-merge-diff/v4",
20+
"google.golang.org/protobuf",
1821
]

go.mod

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@ go 1.13
44

55
require (
66
emperror.dev/errors v0.8.0
7-
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
8-
github.com/golang/protobuf v1.3.5 // indirect
9-
github.com/googleapis/gnostic v0.3.1 // indirect
107
github.com/imdario/mergo v0.3.7 // indirect
11-
github.com/json-iterator/go v1.1.9
12-
google.golang.org/appengine v1.6.1 // indirect
13-
k8s.io/api v0.17.4
14-
k8s.io/apiextensions-apiserver v0.17.4
15-
k8s.io/apimachinery v0.17.4
16-
k8s.io/client-go v0.17.4
17-
k8s.io/klog v1.0.0
18-
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
8+
github.com/json-iterator/go v1.1.10
9+
k8s.io/api v0.19.2
10+
k8s.io/apiextensions-apiserver v0.19.2
11+
k8s.io/apimachinery v0.19.2
12+
k8s.io/client-go v0.19.2
13+
k8s.io/klog/v2 v2.3.0
1914
)

0 commit comments

Comments
 (0)