Skip to content

Commit c2d440a

Browse files
ldeztraefiker
authored andcommitted
chore: update docker and k8s
1 parent 2b5c7f9 commit c2d440a

File tree

1,283 files changed

+69088
-29265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,283 files changed

+69088
-29265
lines changed

Gopkg.lock

Lines changed: 152 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,19 +203,19 @@ required = [
203203

204204
[[constraint]]
205205
name = "k8s.io/client-go"
206-
version = "8.0.0" # 8.0.0
206+
version = "kubernetes-1.15.1" # kubernetes-1.15.1
207207

208208
[[constraint]]
209209
name = "k8s.io/code-generator"
210-
version = "kubernetes-1.11.7"
210+
version = "kubernetes-1.15.1" # "kubernetes-1.15.1"
211211

212212
[[constraint]]
213213
name = "k8s.io/api"
214-
version = "kubernetes-1.11.7" # "kubernetes-1.11.7"
214+
version = "kubernetes-1.15.1" # "kubernetes-1.15.1"
215215

216216
[[constraint]]
217217
name = "k8s.io/apimachinery"
218-
version = "kubernetes-1.11.7" # "kubernetes-1.11.7"
218+
version = "kubernetes-1.15.1" # "kubernetes-1.15.1"
219219

220220
[[override]]
221221
name = "github.com/json-iterator/go"
@@ -235,28 +235,29 @@ required = [
235235

236236
[[constraint]]
237237
name = "github.com/docker/docker"
238-
revision = "7848b8beb9d38a98a78b75f78e05f8d2255f9dfe"
238+
source = "github.com/docker/engine"
239+
version = "v19.03.1"
239240

240241
[[override]]
241242
name = "github.com/docker/docker"
242-
revision = "7848b8beb9d38a98a78b75f78e05f8d2255f9dfe"
243+
source = "github.com/docker/engine"
244+
version = "v19.03.1"
243245

244246
[[override]]
245247
name = "github.com/docker/cli"
246-
revision = "6b63d7b96a41055baddc3fa71f381c7f60bd5d8e"
248+
version = "v19.03.1"
247249

248250
[[override]]
249251
name = "github.com/docker/distribution"
250-
revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
252+
version = "v2.7.1"
251253

252254
[[override]]
253255
branch = "master"
254256
name = "github.com/docker/libcompose"
255257

256258
[[override]]
257-
name = "github.com/Nvveen/Gotty"
258-
revision = "a8b993ba6abdb0e0c12b0125c603323a71c7790c"
259-
source = "github.com/ijc25/Gotty"
259+
name = "github.com/xeipuuv/gojsonschema"
260+
version = "v1.1.0"
260261

261262
[[override]]
262263
# ALWAYS keep this override
@@ -282,3 +283,7 @@ required = [
282283
[[constraint]]
283284
name = "github.com/ExpediaDotCom/haystack-client-go"
284285
version = "0.2.3"
286+
287+
[[constraint]]
288+
name = "gopkg.in/yaml.v2"
289+
version = "v2.2.2"

pkg/provider/docker/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func taskState(state swarm.TaskState) func(*swarm.TaskStatus) {
134134

135135
func taskContainerStatus(id string) func(*swarm.TaskStatus) {
136136
return func(status *swarm.TaskStatus) {
137-
status.ContainerStatus = swarm.ContainerStatus{
137+
status.ContainerStatus = &swarm.ContainerStatus{
138138
ContainerID: id,
139139
}
140140
}

pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)