Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: bump to kube-1.11.0-beta.2 #1610

Merged
merged 1 commit into from Jun 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM golang:1.8
FROM golang:1.10

# libseccomp in jessie is not _quite_ new enough -- need backports version
RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
Expand All @@ -18,6 +18,8 @@ RUN apt-get update && apt-get install -y \
libaio-dev \
libcap-dev \
libfuse-dev \
libnet-dev \
libnl-3-dev \
libostree-dev \
libprotobuf-dev \
libprotobuf-c0-dev \
Expand All @@ -28,6 +30,7 @@ RUN apt-get update && apt-get install -y \
protobuf-c-compiler \
protobuf-compiler \
python-minimal \
python-protobuf \
libglib2.0-dev \
btrfs-tools \
libdevmapper1.02.1 \
Expand All @@ -48,7 +51,7 @@ RUN cd /tmp \
&& ./install.sh /usr/local

# install criu
ENV CRIU_VERSION 1.7
ENV CRIU_VERSION 3.9
RUN mkdir -p /usr/src/criu \
&& curl -sSL https://github.com/xemul/criu/archive/v${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \
&& cd /usr/src/criu \
Expand Down
16 changes: 4 additions & 12 deletions contrib/test/integration/main.yml
Expand Up @@ -45,6 +45,10 @@
- node-e2e
- critest
tasks:
- name: install Golang tools
include: golang.yml
vars:
version: "1.10.3"
- name: clone build and install cri-o
include: "build/cri-o.yml"
post_tasks:
Expand Down Expand Up @@ -73,10 +77,6 @@
tags:
- critest
tasks:
- name: install Golang tools
include: golang.yml
vars:
version: "1.10.2"
- name: setup critest
include: "build/cri-tools.yml"
vars:
Expand All @@ -92,10 +92,6 @@
tags:
- node-e2e
tasks:
- name: install Golang tools
include: golang.yml
vars:
version: "1.10.2"
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
vars:
Expand All @@ -113,10 +109,6 @@
tags:
- e2e
tasks:
- name: install Golang tools
include: golang.yml
vars:
version: "1.10.2"
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
vars:
Expand Down
14 changes: 7 additions & 7 deletions vendor.conf
@@ -1,11 +1,11 @@
k8s.io/kubernetes 89b56c25f88fd3e06f005110ca3150125f78a30a https://github.com/kubernetes/kubernetes
k8s.io/client-go b7d03ad8c68365c7c0623d94f74ece73e0cd64d4 https://github.com/kubernetes/client-go
k8s.io/apimachinery 5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e https://github.com/kubernetes/apimachinery
k8s.io/apiserver b66f10671f89152b72794ab044cfe3d0f13e1d4e https://github.com/kubernetes/apiserver
k8s.io/kubernetes v1.11.0-beta.2 https://github.com/kubernetes/kubernetes
k8s.io/client-go release-8.0 https://github.com/kubernetes/client-go
k8s.io/apimachinery release-1.11 https://github.com/kubernetes/apimachinery
k8s.io/apiserver release-1.11 https://github.com/kubernetes/apiserver
k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils
k8s.io/api c4ebf33f93081f8c7602d29a59944e4a9f684ac2 https://github.com/kubernetes/api
k8s.io/kube-openapi cd0308977f05a0de033c0e8ce1860b317e360dca https://github.com/kubernetes/kube-openapi
k8s.io/apiextensions-apiserver 63d2ac876c27ef8ae23cf03816279ab619a0159d https://github.com/kubernetes/apiextensions-apiserver
k8s.io/api release-1.11 https://github.com/kubernetes/api
k8s.io/kube-openapi bf40560368791a7dddfeea9b3cfcf89b34139f44 https://github.com/kubernetes/kube-openapi
k8s.io/apiextensions-apiserver release-1.11 https://github.com/kubernetes/apiextensions-apiserver
#
github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba
github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6
Expand Down

This file was deleted.

55 changes: 0 additions & 55 deletions vendor/github.com/docker/docker/hack/README.md

This file was deleted.

This file was deleted.

This file was deleted.