Merge pull request #18605 from sjenning/revert-18020

Automatic merge from submit-queue (batch tested with PRs 18624, 18605).

Revert "Admission plugin: openshift.io/ImageQualify"

This reverts commit 8bc3e07.  #18020

Render unneeded by upstream kubernetes/kubernetes#58955 and Origin pick #18340

Will live on forever in git history if we find a use case for it later.

Author: openshift-merge-robot

contrib/migration/unqualified-images.sh

@@ -21,8 +21,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/cmd/server/apis/config/v1/testing
     github.com/openshift/origin/pkg/image/admission/apis/imagepolicy
     github.com/openshift/origin/pkg/image/admission/apis/imagepolicy/v1
-    github.com/openshift/origin/pkg/image/admission/apis/imagequalify
-    github.com/openshift/origin/pkg/image/admission/apis/imagequalify/v1
     github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission
     github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission/v1
     github.com/openshift/origin/pkg/project/admission/lifecycle/testing

hack/update-generated-deep-copies.sh

@@ -17,7 +17,6 @@ import (
 	_ "github.com/openshift/origin/pkg/build/controller/build/apis/defaults/install"
 	_ "github.com/openshift/origin/pkg/build/controller/build/apis/overrides/install"
 	_ "github.com/openshift/origin/pkg/image/admission/apis/imagepolicy/install"
-	_ "github.com/openshift/origin/pkg/image/admission/apis/imagequalify/install"
 	_ "github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission/install"
 	_ "github.com/openshift/origin/pkg/project/admission/apis/requestlimit/install"
 	_ "github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride/install"

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

@@ -22,7 +22,6 @@ import (
 	configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
 	imageadmission "github.com/openshift/origin/pkg/image/admission"
 	imagepolicy "github.com/openshift/origin/pkg/image/admission/apis/imagepolicy"
-	imagequalify "github.com/openshift/origin/pkg/image/admission/apis/imagequalify"
 	ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
 	overrideapi "github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride"
 	sccadmission "github.com/openshift/origin/pkg/security/admission"
@@ -62,7 +61,6 @@ var (
 		serviceadmit.ExternalIPPluginName,
 		serviceadmit.RestrictedEndpointsPluginName,
 		imagepolicy.PluginName,
-		imagequalify.PluginName,
 		"ImagePolicyWebhook",
 		"PodPreset",
 		"InitialResources",
@@ -121,7 +119,6 @@ var (
 		serviceadmit.ExternalIPPluginName,
 		serviceadmit.RestrictedEndpointsPluginName,
 		imagepolicy.PluginName,
-		imagequalify.PluginName,
 		"ImagePolicyWebhook",
 		"PodPreset",
 		"InitialResources",

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

@@ -17,7 +17,6 @@ import (
 	buildstrategyrestrictions "github.com/openshift/origin/pkg/build/admission/strategyrestrictions"
 	imageadmission "github.com/openshift/origin/pkg/image/admission"
 	imagepolicy "github.com/openshift/origin/pkg/image/admission/imagepolicy"
-	imagequalify "github.com/openshift/origin/pkg/image/admission/imagequalify"
 	ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
 	projectlifecycle "github.com/openshift/origin/pkg/project/admission/lifecycle"
 	projectnodeenv "github.com/openshift/origin/pkg/project/admission/nodeenv"
@@ -34,7 +33,6 @@ import (
 	storageclassdefaultadmission "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault"
 
 	imagepolicyapi "github.com/openshift/origin/pkg/image/admission/apis/imagepolicy"
-	imagequalifyapi "github.com/openshift/origin/pkg/image/admission/apis/imagequalify"
 	overrideapi "github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride"
 	"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
 
@@ -62,7 +60,6 @@ func registerOpenshiftAdmissionPlugins(plugins *admission.Plugins) {
 	buildstrategyrestrictions.Register(plugins)
 	imageadmission.Register(plugins)
 	imagepolicy.Register(plugins)
-	imagequalify.Register(plugins)
 	ingressadmission.Register(plugins)
 	projectlifecycle.Register(plugins)
 	projectnodeenv.Register(plugins)
@@ -112,7 +109,6 @@ var (
 		"PodNodeConstraints",
 		overrideapi.PluginName,
 		imagepolicyapi.PluginName,
-		imagequalifyapi.PluginName,
 		"AlwaysPullImages",
 		"ImagePolicyWebhook",
 		"openshift.io/RestrictSubjectBindings",