Merge pull request #58595 from CaoShuFeng/LimitPodHardAntiAffinityTopology

Automatic merge from submit-queue (batch tested with PRs 58595, 58689). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix invalid admission name LimitPodHardAntiAffinityTopology @hzxuzhonghu @sttts **Release note**: ```release-note NONE ```

Merge pull request #58595 from CaoShuFeng/LimitPodHardAntiAffinityTopology
26c1a3a8 · Kubernetes Submit Queue · GitHub · ee14d2ed · 2a15776b · 26c1a3a8
Unverified Commit 26c1a3a8 authored Jan 23, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 23, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

plugins.go pkg/kubeapiserver/options/plugins.go +1 -1

admission.go plugin/pkg/admission/antiaffinity/admission.go +1 -1

No files found.
--- a/pkg/kubeapiserver/options/plugins.go
+++ b/pkg/kubeapiserver/options/plugins.go
@@ -67,7 +67,7 @@ var AllOrderedPlugins = []string{
 	lifecycle.PluginName,                  // NamespaceLifecycle
 	exists.PluginName,                     // NamespaceExists
 	scdeny.PluginName,                     // SecurityContextDeny
-	antiaffinity.PluginName,               // LimitPodHardAntiAffinity
+	antiaffinity.PluginName,               // LimitPodHardAntiAffinityTopology
 	initialresources.PluginName,           // InitialResources
 	podpreset.PluginName,                  // PodPreset
 	limitranger.PluginName,                // LimitRanger

--- a/plugin/pkg/admission/antiaffinity/admission.go
+++ b/plugin/pkg/admission/antiaffinity/admission.go
@@ -26,7 +26,7 @@ import (
 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
 )
-const PluginName = "LimitPodHardAntiAffinity"
+const PluginName = "LimitPodHardAntiAffinityTopology"
 // Register registers a plugin
 func Register(plugins *admission.Plugins) {