Skip to content

Commit 110fef4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #70 from droot/k8s-1.11
K8s 1.11
2 parents 62b5a17 + 8b69956 commit 110fef4

1,370 files changed

Lines changed: 23568 additions & 19236 deletions

File tree

Some content is hidden

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

‎Gopkg.lock‎

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

‎Gopkg.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ required = [
1414

1515
[[constraint]]
1616
name="k8s.io/api"
17-
version="kubernetes-1.10.1"
17+
version="kubernetes-1.11.2"
1818

1919
[[constraint]]
2020
name="k8s.io/apiextensions-apiserver"
21-
version="kubernetes-1.10.1"
21+
version="kubernetes-1.11.2"
2222

2323
[[constraint]]
2424
name="k8s.io/apimachinery"
25-
version="kubernetes-1.10.1"
25+
version="kubernetes-1.11.2"
2626

2727
[[constraint]]
2828
name="k8s.io/code-generator"
29-
version="kubernetes-1.10.1"
29+
version="kubernetes-1.11.2"
3030

3131
[[constraint]]
3232
name="k8s.io/client-go"
33-
version="kubernetes-1.10.1"
33+
version="kubernetes-1.11.2"
3434

3535
[[constraint]]
3636
name = "github.com/onsi/ginkgo"

‎pkg/crd/generator/generator_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestGenerator(t *testing.T) {
5959
t.Fatalf("reading file failed %v", err)
6060
}
6161
if !reflect.DeepEqual(crdContent, expectedContent) {
62-
t.Fatalf("CRD output does not match exp:%v got:%v \n", expectedContent, crdContent)
62+
t.Fatalf("CRD output does not match exp:%v got:%v \n", string(expectedContent), string(crdContent))
6363
}
6464
}
6565
// examine content of the in-memory filesystem

‎pkg/crd/generator/testData/config/crds/fun_v1alpha1_toy.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,4 @@ status:
9090
kind: ""
9191
plural: ""
9292
conditions: null
93+
storedVersions: null

‎test.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ else
3838
reset=''
3939
fi
4040

41-
k8s_version=1.10.1
41+
k8s_version=1.11.0
42+
# keeping older version around to reproduce any issue (just in case)
43+
#k8s_version=1.10.1
4244
goarch=amd64
4345
goos="unknown"
4446

@@ -146,4 +148,4 @@ header_text "running test package tests"
146148

147149
cd test
148150
make
149-
cd -
151+
cd -

‎test/config/crds/creatures_v2alpha1_kraken.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ status:
3030
kind: ""
3131
plural: ""
3232
conditions: null
33+
storedVersions: null

‎test/config/crds/crew_v1_firstmate.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ status:
3030
kind: ""
3131
plural: ""
3232
conditions: null
33+
storedVersions: null

‎test/config/crds/policy_v1beta1_healthcheckpolicy.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ status:
3030
kind: ""
3131
plural: ""
3232
conditions: null
33+
storedVersions: null

‎test/config/crds/ship_v1beta1_frigate.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ status:
3030
kind: ""
3131
plural: ""
3232
conditions: null
33+
storedVersions: null

‎vendor/github.com/google/btree/.travis.yml‎

Lines changed: 1 addition & 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)