github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-05-01 00:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.11

Browse Source 
Kubernetes-commit: 4e3b2843df571c3b80c834d7c23bc6da1a22aab8
This commit is contained in:
Kubernetes Publisher
2018-05-31 14:24:28 -04:00
parent 0b991a6b31 085c1da033
commit 5561807b20
27 changed files with 1945 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/k8s.io/apimachinery/pkg/runtime/scheme.go
Generated Vendored
+1 -1
View File
@@ -122,7 +122,7 @@ func (s *Scheme) nameFunc(t reflect.Type) string {
for _, gvk := range gvks {
internalGV := gvk.GroupVersion()
internalGV.Version = "__internal" // this is hacky and maybe should be passed in
internalGV.Version = APIVersionInternal // this is hacky and maybe should be passed in
internalGVK := internalGV.WithKind(gvk.Kind)
if internalType, exists := s.gvkToType[internalGVK]; exists {