github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73258 from Betula-L/master

Browse Source 
fix test config pod spec affinity mishandling
This commit is contained in:
Kubernetes Prow Robot 2019-02-05 10:48:59 -08:00 committed by GitHub
commit fdfc3b86d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/utils/runners.go
View File

@ -27,7 +27,7 @@ import (
apps "k8s.io/api/apps/v1" apps "k8s.io/api/apps/v1"
batch "k8s.io/api/batch/v1" batch "k8s.io/api/batch/v1"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
apierrs "k8s.io/apimachinery/pkg/api/errors" apierrs "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
@ -317,6 +317,7 @@ func (config *DeploymentConfig) create() error {
Annotations: config.Annotations, Annotations: config.Annotations,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Affinity: config.Affinity,
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: config.Name, Name: config.Name,
@ -392,6 +393,7 @@ func (config *ReplicaSetConfig) create() error {
Annotations: config.Annotations, Annotations: config.Annotations,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Affinity: config.Affinity,
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: config.Name, Name: config.Name,
@ -459,6 +461,7 @@ func (config *JobConfig) create() error {
Annotations: config.Annotations, Annotations: config.Annotations,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Affinity: config.Affinity,
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: config.Name, Name: config.Name,