Skip to content

Commit f568952

Browse files
committed
Revert "Admission plugin: openshift.io/ImageQualify"
This reverts commit 8bc3e07.
1 parent 689dc7d commit f568952

34 files changed

+0
-2301
lines changed

contrib/migration/unqualified-images.sh

Lines changed: 0 additions & 77 deletions
This file was deleted.

hack/update-generated-deep-copies.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ ALL_FQ_APIS=(
2121
github.com/openshift/origin/pkg/cmd/server/apis/config/v1/testing
2222
github.com/openshift/origin/pkg/image/admission/apis/imagepolicy
2323
github.com/openshift/origin/pkg/image/admission/apis/imagepolicy/v1
24-
github.com/openshift/origin/pkg/image/admission/apis/imagequalify
25-
github.com/openshift/origin/pkg/image/admission/apis/imagequalify/v1
2624
github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission
2725
github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission/v1
2826
github.com/openshift/origin/pkg/project/admission/lifecycle/testing

pkg/cmd/server/apis/config/install/install.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
_ "github.com/openshift/origin/pkg/build/controller/build/apis/defaults/install"
1818
_ "github.com/openshift/origin/pkg/build/controller/build/apis/overrides/install"
1919
_ "github.com/openshift/origin/pkg/image/admission/apis/imagepolicy/install"
20-
_ "github.com/openshift/origin/pkg/image/admission/apis/imagequalify/install"
2120
_ "github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission/install"
2221
_ "github.com/openshift/origin/pkg/project/admission/apis/requestlimit/install"
2322
_ "github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride/install"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
2323
imageadmission "github.com/openshift/origin/pkg/image/admission"
2424
imagepolicy "github.com/openshift/origin/pkg/image/admission/apis/imagepolicy"
25-
imagequalify "github.com/openshift/origin/pkg/image/admission/apis/imagequalify"
2625
ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
2726
overrideapi "github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride"
2827
sccadmission "github.com/openshift/origin/pkg/security/admission"
@@ -62,7 +61,6 @@ var (
6261
serviceadmit.ExternalIPPluginName,
6362
serviceadmit.RestrictedEndpointsPluginName,
6463
imagepolicy.PluginName,
65-
imagequalify.PluginName,
6664
"ImagePolicyWebhook",
6765
"PodPreset",
6866
"InitialResources",
@@ -121,7 +119,6 @@ var (
121119
serviceadmit.ExternalIPPluginName,
122120
serviceadmit.RestrictedEndpointsPluginName,
123121
imagepolicy.PluginName,
124-
imagequalify.PluginName,
125122
"ImagePolicyWebhook",
126123
"PodPreset",
127124
"InitialResources",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ 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"
2120
ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
2221
projectlifecycle "github.com/openshift/origin/pkg/project/admission/lifecycle"
2322
projectnodeenv "github.com/openshift/origin/pkg/project/admission/nodeenv"
@@ -34,7 +33,6 @@ import (
3433
storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
3534

3635
imagepolicyapi "github.com/openshift/origin/pkg/image/admission/apis/imagepolicy"
37-
imagequalifyapi "github.com/openshift/origin/pkg/image/admission/apis/imagequalify"
3836
overrideapi "github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride"
3937
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
4038

@@ -62,7 +60,6 @@ func registerOpenshiftAdmissionPlugins(plugins *admission.Plugins) {
6260
buildstrategyrestrictions.Register(plugins)
6361
imageadmission.Register(plugins)
6462
imagepolicy.Register(plugins)
65-
imagequalify.Register(plugins)
6663
ingressadmission.Register(plugins)
6764
projectlifecycle.Register(plugins)
6865
projectnodeenv.Register(plugins)
@@ -112,7 +109,6 @@ var (
112109
"PodNodeConstraints",
113110
overrideapi.PluginName,
114111
imagepolicyapi.PluginName,
115-
imagequalifyapi.PluginName,
116112
"AlwaysPullImages",
117113
"ImagePolicyWebhook",
118114
"openshift.io/RestrictSubjectBindings",

pkg/image/admission/apis/imagequalify/doc.go

Lines changed: 0 additions & 4 deletions
This file was deleted.

pkg/image/admission/apis/imagequalify/install/install.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

pkg/image/admission/apis/imagequalify/name.go

Lines changed: 0 additions & 4 deletions
This file was deleted.

pkg/image/admission/apis/imagequalify/register.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

pkg/image/admission/apis/imagequalify/types.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)