Merge pull request #18529 from liggitt/admission-config

Automatic merge from submit-queue (batch tested with PRs 18529, 18214). UPSTREAM: 58439: fix loading structured admission plugin config
openshift · Feb 10, 2018 · 1a8a8e8 · 1a8a8e8
2 parents cb2f9f8 + 6400e07
commit 1a8a8e8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/admission/config.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/admission/config.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/options/admission.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/options/admission.go