Skip to content

Commit 55107c5

Browse files
slokslok
authored
Merge pull request #47 from slok/v1.10-stable
Update e2e tests to k8s v1.10
2 parents 7996b57 + 967520b commit 55107c5

File tree

282 files changed

+8654
-10941
lines changed

Some content is hidden

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

282 files changed

+8654
-10941
lines changed

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ script:
2121
env:
2222
global:
2323
- MINIKUBE_VERSION=v0.25.2
24-
- KUBERNETES_VERSION=v1.9.4
24+
- KUBERNETES_VERSION=v1.10.0

Diff for: ‎Gopkg.lock

+24-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Gopkg.toml

+12-5
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,30 @@
2222
# Note: Change all at once.
2323
[[constraint]]
2424
name = "k8s.io/client-go"
25-
version = "kubernetes-1.10.0"
25+
version = "kubernetes-1.10.5"
2626

2727
[[constraint]]
2828
name = "k8s.io/api"
29-
version = "kubernetes-1.10.0"
29+
version = "kubernetes-1.10.5"
3030

3131
[[constraint]]
3232
name = "k8s.io/apimachinery"
33-
version = "kubernetes-1.10.0"
33+
version = "kubernetes-1.10.5"
3434

3535
[[constraint]]
3636
name = "k8s.io/apiextensions-apiserver"
37-
version = "kubernetes-1.10.0"
37+
version = "kubernetes-1.10.5"
3838

3939
[[constraint]]
4040
name = "k8s.io/kubernetes"
41-
version = "v1.10.0"
41+
version = "v1.10.5"
42+
43+
# Fixes pinning versions for other dependencies with not correct dependency settings.
44+
45+
# Fix for "k8s.io/apimachinery"
46+
[[override]]
47+
name = "github.com/json-iterator/go"
48+
revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"
4249

4350
[prune]
4451
go-tests = true

Diff for: ‎hack/scripts/integration-test-minikube.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -o errexit
44
set -o nounset
55

6-
KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.9.4}
6+
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.10.0}
77
current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
88

99
SUDO=''
@@ -20,6 +20,7 @@ trap cleanup EXIT
2020

2121
echo "=> Preparing minikube for running integration tests"
2222
$SUDO minikube start \
23+
--logtostderr \
2324
--vm-driver=none \
2425
--feature-gates=CustomResourceSubresources=true \
2526
--kubernetes-version=${KUBERNETES_VERSION}

Diff for: ‎vendor/github.com/json-iterator/go/.gitignore

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/json-iterator/go/Gopkg.lock

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/json-iterator/go/Gopkg.toml

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/json-iterator/go/README.md

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/json-iterator/go/feature_adapter.go renamed to ‎vendor/github.com/json-iterator/go/adapter.go

+31-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)