github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Omit invalid affinity error in admission

pull/6/head
Harry Zhang 2016-06-19 10:59:13 -04:00
parent 8f5d081194
commit 080b49276e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/admission/antiaffinity/admission.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrors "k8s.io/kubernetes/pkg/api/errors" apierrors "k8s.io/kubernetes/pkg/api/errors"
@ -59,7 +60,8 @@ func (p *plugin) Admit(attributes admission.Attributes) (err error) {
} }
affinity, err := api.GetAffinityFromPodAnnotations(pod.Annotations) affinity, err := api.GetAffinityFromPodAnnotations(pod.Annotations)
if err != nil { if err != nil {
return err glog.V(5).Infof("Invalid Affinity detected, but we will leave handling of this to validation phase")
return nil
} }
if affinity.PodAntiAffinity != nil { if affinity.PodAntiAffinity != nil {
var podAntiAffinityTerms []api.PodAffinityTerm var podAntiAffinityTerms []api.PodAffinityTerm