Skip to content

Commit 1a8a8e8

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents cb2f9f8 + 6400e07 commit 1a8a8e8

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/admission/config.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/options/admission.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)