Skip to content

Commit 723d2e4

Browse files
committed
Add imagequalify to admission chains
1 parent 41dcb0e commit 723d2e4

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

pkg/cmd/server/origin/admission/chain_builder.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
2323
imageadmission "github.com/openshift/origin/pkg/image/admission"
2424
imagepolicy "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
25+
imagequalify "github.com/openshift/origin/pkg/image/admission/imagequalify/api"
2526
ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
2627
overrideapi "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"
2728
sccadmission "github.com/openshift/origin/pkg/security/admission"
@@ -57,6 +58,7 @@ var (
5758
serviceadmit.ExternalIPPluginName,
5859
serviceadmit.RestrictedEndpointsPluginName,
5960
imagepolicy.PluginName,
61+
imagequalify.PluginName,
6062
"ImagePolicyWebhook",
6163
"PodPreset",
6264
"LimitRanger",
@@ -103,6 +105,7 @@ var (
103105
serviceadmit.ExternalIPPluginName,
104106
serviceadmit.RestrictedEndpointsPluginName,
105107
imagepolicy.PluginName,
108+
imagequalify.PluginName,
106109
"ImagePolicyWebhook",
107110
"PodPreset",
108111
"LimitRanger",

pkg/cmd/server/origin/admission/register.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
buildstrategyrestrictions "github.com/openshift/origin/pkg/build/admission/strategyrestrictions"
1818
imageadmission "github.com/openshift/origin/pkg/image/admission"
1919
imagepolicy "github.com/openshift/origin/pkg/image/admission/imagepolicy"
20+
imagequalify "github.com/openshift/origin/pkg/image/admission/imagequalify"
2021
ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
2122
projectlifecycle "github.com/openshift/origin/pkg/project/admission/lifecycle"
2223
projectnodeenv "github.com/openshift/origin/pkg/project/admission/nodeenv"
@@ -32,6 +33,7 @@ import (
3233
storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
3334

3435
imagepolicyapi "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
36+
imagequalifyapi "github.com/openshift/origin/pkg/image/admission/imagequalify/api"
3537
overrideapi "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"
3638
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
3739

@@ -55,6 +57,7 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) {
5557
buildstrategyrestrictions.Register(plugins)
5658
imageadmission.Register(plugins)
5759
imagepolicy.Register(plugins)
60+
imagequalify.Register(plugins)
5861
ingressadmission.Register(plugins)
5962
projectlifecycle.Register(plugins)
6063
projectnodeenv.Register(plugins)
@@ -103,6 +106,7 @@ var (
103106
"PodNodeConstraints",
104107
overrideapi.PluginName,
105108
imagepolicyapi.PluginName,
109+
imagequalifyapi.PluginName,
106110
"AlwaysPullImages",
107111
"ImagePolicyWebhook",
108112
"openshift.io/RestrictSubjectBindings",

0 commit comments

Comments
 (0)