Skip to content

Commit

Permalink
Merge pull request openshift#535 from tkashem/pin-kube-1.17
Browse files Browse the repository at this point in the history
Bump to kubernetes-1.17.0-rc.2
  • Loading branch information
openshift-merge-robot committed Dec 6, 2019
2 parents 9f834e3 + 9eba4cd commit 377b5e2
Show file tree
Hide file tree
Showing 1,992 changed files with 229,953 additions and 118,334 deletions.
2 changes: 1 addition & 1 deletion config/v1/0000_10_config-operator_01_build.crd.yaml
Expand Up @@ -162,7 +162,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.'
status.podIP, status.podIPs.'
type: object
required:
- fieldPath
Expand Down
36 changes: 23 additions & 13 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions glide.yaml
@@ -1,11 +1,11 @@
package: github.com/openshift/api
import:
- package: k8s.io/apimachinery
version: kubernetes-1.16.0
version: kubernetes-1.17.0-rc.2
- package: k8s.io/api
version: kubernetes-1.16.0
version: kubernetes-1.17.0-rc.2
- package: k8s.io/code-generator
version: kubernetes-1.16.0
version: kubernetes-1.17.0-rc.2
# this matches the code-generator version
- package: k8s.io/gengo
version: 26a664648505d962332bda642b27306bc10d1082
Expand Down
23 changes: 18 additions & 5 deletions vendor/github.com/golang/protobuf/jsonpb/jsonpb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 44 additions & 13 deletions vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions vendor/github.com/golang/protobuf/proto/properties.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 377b5e2

Please sign in to comment.