github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Remove UniqueLabelKey from deployment spec

Browse Source
This commit is contained in:
Janet Kuo
2016-02-05 14:45:05 -08:00
parent 8f3eb93626
commit 7e9fb97b7d
20 changed files with 12444 additions and 12636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/apis/extensions/v1beta1/defaults_test.go
View File

@@ -198,7 +198,6 @@ func TestSetDefaultDaemonSet(t *testing.T) {
func TestSetDefaultDeployment(t *testing.T) {
defaultIntOrString := intstr.FromInt(1)
differentIntOrString := intstr.FromInt(5)
deploymentLabelKey := DefaultDeploymentUniqueLabelKey
period := int64(v1.DefaultTerminationGracePeriodSeconds)
defaultTemplate := v1.PodTemplateSpec{
Spec: v1.PodSpec{
@@ -224,8 +223,7 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString,
},
},
Template: defaultTemplate,
UniqueLabelKey: newString(deploymentLabelKey),
Template: defaultTemplate,
},
},
},
@@ -250,8 +248,7 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString,
},
},
Template: defaultTemplate,
UniqueLabelKey: newString(deploymentLabelKey),
Template: defaultTemplate,
},
},
},
@@ -270,8 +267,7 @@ func TestSetDefaultDeployment(t *testing.T) {
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
Template: defaultTemplate,
UniqueLabelKey: newString(deploymentLabelKey),
Template: defaultTemplate,
},
},
},
@@ -282,7 +278,6 @@ func TestSetDefaultDeployment(t *testing.T) {
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
UniqueLabelKey: newString("customDeploymentKey"),
},
},
expected: &Deployment{
@@ -291,8 +286,7 @@ func TestSetDefaultDeployment(t *testing.T) {
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
Template: defaultTemplate,
UniqueLabelKey: newString("customDeploymentKey"),
Template: defaultTemplate,
},
},
},