Skip to content

Commit e791289

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #319 from marun/kube-1.16
⚠️ Update kube deps to 1.16
2 parents b97a1f6 + 4a98cd1 commit e791289

File tree

12 files changed

+417
-112
lines changed

12 files changed

+417
-112
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ ignored = [
44

55
[[constraint]]
66
name="k8s.io/api"
7-
version="kubernetes-1.15.0"
7+
version="kubernetes-1.16.0"
88

99
[[constraint]]
1010
name="k8s.io/apiextensions-apiserver"
11-
version="kubernetes-1.15.0"
11+
version="kubernetes-1.16.0"
1212

1313
[[constraint]]
1414
name="k8s.io/apimachinery"
15-
version="kubernetes-1.15.0"
15+
version="kubernetes-1.16.0"
1616

1717
[[constraint]]
1818
name = "github.com/spf13/cobra"
19-
version = "v0.0.3"
19+
version = "v0.0.5"
2020

2121
[[constraint]]
2222
name = "sigs.k8s.io/yaml"

‎go.mod

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,17 @@ go 1.12
55
require (
66
github.com/fatih/color v1.7.0
77
github.com/gobuffalo/flect v0.1.5
8-
github.com/gogo/protobuf v1.2.1 // indirect
98
github.com/google/go-cmp v0.3.0
10-
github.com/json-iterator/go v1.1.6 // indirect
11-
github.com/kr/pretty v0.1.0 // indirect
129
github.com/mattn/go-colorable v0.1.2 // indirect
1310
github.com/onsi/ginkgo v1.8.0
1411
github.com/onsi/gomega v1.5.0
15-
github.com/spf13/cobra v0.0.3
12+
github.com/spf13/cobra v0.0.5
1613
github.com/spf13/pflag v1.0.3
17-
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 // indirect
18-
golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 // indirect
19-
golang.org/x/text v0.3.2 // indirect
20-
golang.org/x/tools v0.0.0-20190501045030-23463209683d
21-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
14+
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac
2215
gopkg.in/inf.v0 v0.9.1 // indirect
23-
gopkg.in/yaml.v2 v2.2.2 // indirect
2416
gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966
25-
k8s.io/api v0.0.0-20190620084959-7cf5895f2711
26-
k8s.io/apiextensions-apiserver v0.0.0-20190620085554-14e95df34f1f
27-
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
28-
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
17+
k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
18+
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
19+
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
2920
sigs.k8s.io/yaml v1.1.0
3021
)

‎go.sum

Lines changed: 245 additions & 75 deletions
Large diffs are not rendered by default.

‎pkg/schemapatcher/testdata/expected/kubebuilder-example-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ spec:
2121
apiVersion:
2222
description: 'APIVersion defines the versioned schema of this representation
2323
of an object. Servers should convert recognized schemas to the latest
24-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
24+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2525
type: string
2626
kind:
2727
description: 'Kind is a string value representing the REST resource this
2828
object represents. Servers may infer this from the endpoint the client
29-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
29+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3030
type: string
3131
metadata:
3232
type: object

‎pkg/schemapatcher/testdata/expected/kubebuilder-unchanged-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ spec:
2121
apiVersion:
2222
description: 'APIVersion defines the versioned schema of this representation
2323
of an object. Servers should convert recognized schemas to the latest
24-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
24+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2525
type: string
2626
kind:
2727
description: 'Kind is a string value representing the REST resource this
2828
object represents. Servers may infer this from the endpoint the client
29-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
29+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3030
type: string
3131
metadata:
3232
type: object

‎pkg/schemapatcher/testdata/expected/legacy-example-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ spec:
2525
apiVersion:
2626
description: 'APIVersion defines the versioned schema of this representation
2727
of an object. Servers should convert recognized schemas to the latest
28-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2929
type: string
3030
kind:
3131
description: 'Kind is a string value representing the REST resource this
3232
object represents. Servers may infer this from the endpoint the client
33-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
33+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3434
type: string
3535
metadata:
3636
type: object

‎pkg/schemapatcher/testdata/expected/legacy-unchanged-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ spec:
2626
apiVersion:
2727
description: 'APIVersion defines the versioned schema of this representation
2828
of an object. Servers should convert recognized schemas to the latest
29-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
29+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
3030
type: string
3131
kind:
3232
description: 'Kind is a string value representing the REST resource this
3333
object represents. Servers may infer this from the endpoint the client
34-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
34+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3535
type: string
3636
metadata:
3737
type: object

‎pkg/schemapatcher/testdata/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module testdata.kubebuilder.io/inplaceschema
33
go 1.12
44

55
require (
6-
k8s.io/apimachinery v0.0.0-20190806215851-162a2dabc72f
6+
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
77
sigs.k8s.io/controller-tools v0.0.0-00010101000000-000000000000 // indirect
88
)
99

0 commit comments

Comments
 (0)