diff --git a/pkg/apps/apis/apps/v1/conversion.go b/pkg/apps/apis/apps/v1/conversion.go index d4c2c2afc66f..2a6dd46c55e0 100644 --- a/pkg/apps/apis/apps/v1/conversion.go +++ b/pkg/apps/apis/apps/v1/conversion.go @@ -108,7 +108,7 @@ func Convert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrateg func Convert_v1_DeploymentTriggerPolicies_To_apps_DeploymentTriggerPolicy(in *DeploymentTriggerPolicies, out *[]newer.DeploymentTriggerPolicy, s conversion.Scope) error { if in != nil { - policies := *out + policies := []newer.DeploymentTriggerPolicy{} for i := range *in { tmp := newer.DeploymentTriggerPolicy{} if err := s.Convert(&(*in)[i], &tmp, 0); err != nil { @@ -123,7 +123,7 @@ func Convert_v1_DeploymentTriggerPolicies_To_apps_DeploymentTriggerPolicy(in *De func Convert_apps_DeploymentTriggerPolicy_To_v1_DeploymentTriggerPolicies(in *[]newer.DeploymentTriggerPolicy, out *DeploymentTriggerPolicies, s conversion.Scope) error { if in != nil { - policies := *out + policies := DeploymentTriggerPolicies{} for i := range *in { tmp := DeploymentTriggerPolicy{} if err := s.Convert(&(*in)[i], &tmp, 0); err != nil { diff --git a/test/integration/deploy_defaults_test.go b/test/integration/deploy_defaults_test.go index 7ee15b3006ff..bf13a29d6dc7 100644 --- a/test/integration/deploy_defaults_test.go +++ b/test/integration/deploy_defaults_test.go @@ -75,7 +75,9 @@ func setEssentialDefaults(dc *deployapi.DeploymentConfig) *deployapi.DeploymentC MaxSurge: intstr.FromString("25%"), } dc.Spec.Strategy.ActiveDeadlineSeconds = int64ptr(21600) - dc.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{} + dc.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{ + {Type: deployapi.DeploymentTriggerOnConfigChange}, + } dc.Spec.Template.Spec.Containers[0].TerminationMessagePath = "/dev/termination-log" dc.Spec.Template.Spec.Containers[0].TerminationMessagePolicy = "File" dc.Spec.Template.Spec.Containers[0].ImagePullPolicy = "IfNotPresent" @@ -219,7 +221,7 @@ func TestDeploymentConfigDefaults(t *testing.T) { clearTransient(appsDC) if !reflect.DeepEqual(appsDC, tc.apps) { - t.Errorf("Apps DC differs from expected output: %s", diff.ObjectReflectDiff(&appsDC, tc.apps)) + t.Errorf("Apps DC differs from expected output: %s", diff.ObjectReflectDiff(appsDC, tc.apps)) } }) }