github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 05:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67395 from mengqiy/webhook

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue
2018-08-15 05:45:21 -07:00
committed by GitHub
parent 5aea00d885 00d4325cf2
commit 50ae6afd7a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/webhook/scheme.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package main package main
import ( import (
admissionv1beta1 "k8s.io/api/admission/v1beta1"
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -33,5 +34,6 @@ func init() {
func addToScheme(scheme *runtime.Scheme) { func addToScheme(scheme *runtime.Scheme) {
utilruntime.Must(corev1.AddToScheme(scheme)) utilruntime.Must(corev1.AddToScheme(scheme))
utilruntime.Must(admissionv1beta1.AddToScheme(scheme))
utilruntime.Must(admissionregistrationv1beta1.AddToScheme(scheme)) utilruntime.Must(admissionregistrationv1beta1.AddToScheme(scheme))
} }