2 Commits

Author	SHA1	Message	Date
Kubernetes Publisher	9bcfb16e0e	Merge pull request #62028 from nikhita/automated-cherry-pick-of-#57243-upstream-release-1.9 ... Automatic merge from submit-queue. Automated cherry pick of #57243: Register metav1 types into samplecontroller api scheme Fixes kubernetes/sample-controller#14 Cherry pick of #57243 on release-1.9. #57243: Register metav1 types into samplecontroller api scheme ```release-note Fix error message regarding conversion of `v1.ListOptions` to `samplecontroller.k8s.io/v1alpha1`. ``` Kubernetes-commit: 53daf2849cdd6c31a7f801c987e8386bb2fd404d	2018-04-15 23:19:05 +00:00
Kubernetes Publisher	ec723b2112	Merge pull request #52753 from munnerz/sample-controller ... Automatic merge from submit-queue. 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>. sample-controller: add example CRD controller **What this PR does / why we need it**: Adds a sample-controller example repository fixes #52752 **Special notes for your reviewer**: This is currently based on the sttts:sttts-codegen-scripts branch and should not be merged until that is (ref https://github.com/kubernetes/kubernetes/pull/52186) **Release note**: ``` Add sample-controller repository ``` /cc @sttts @nikhita @colemickens Kubernetes-commit: 9a7800f7d2efb88b397674672ac56f898826cf7c	2017-10-26 12:35:59 +00:00