Merge pull request #57243 from munnerz/fix-sample-ctrl

Automatic merge from submit-queue (batch tested with PRs 56403, 57243). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Register metav1 types into samplecontroller api scheme **What this PR does / why we need it**: Registers metav1 resource types (e.g. ListOptions) with sample-controller scheme. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #57205 **Release note**: ```release-note NONE ``` /cc @sttts @nikhita

Merge pull request #57243 from munnerz/fix-sample-ctrl
0d42e742 · Kubernetes Submit Queue · GitHub · 8deab517 · 9efe8569 · 0d42e742
Unverified Commit 0d42e742 authored Dec 19, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

register.go ...controller/pkg/apis/samplecontroller/v1alpha1/register.go +2 -0

No files found.
--- a/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/register.go
+++ b/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/register.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

@@ -47,5 +48,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Foo{},
 		&FooList{},
 	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }