Merge pull request #67395 from mengqiy/webhook

Automatic merge from submit-queue (batch tested with PRs 67396, 67097, 67395, 67365, 67099). 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>. add admissionv1beta1 in scheme We need to register admissionv1beta1 types for decoding in https://github.com/kubernetes/kubernetes/blob/master/test/images/webhook/main.go#L71-L72 ```release-note NONE ```

Merge pull request #67395 from mengqiy/webhook
50ae6afd · Kubernetes Submit Queue · GitHub · 5aea00d8 · 00d4325c · 50ae6afd
Unverified Commit 50ae6afd authored Aug 15, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

scheme.go test/images/webhook/scheme.go +2 -0

No files found.
--- a/test/images/webhook/scheme.go
+++ b/test/images/webhook/scheme.go
@@ -17,6 +17,7 @@ limitations under the License.
 package main

 import (
+	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -33,5 +34,6 @@ func init() {

 func addToScheme(scheme *runtime.Scheme) {
 	utilruntime.Must(corev1.AddToScheme(scheme))
+	utilruntime.Must(admissionv1beta1.AddToScheme(scheme))
 	utilruntime.Must(admissionregistrationv1beta1.AddToScheme(scheme))
 }