Remove knative service container name (#102)

* Remove knative service container name * Update test to not check for ksvc container name
appsody · Sep 12, 2019 · 24dddc6 · 24dddc6
1 parent 56f59e0
commit 24dddc6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkg/controller/appsodyapplication/appsodyapplication_controller_test.go b/pkg/controller/appsodyapplication/appsodyapplication_controller_test.go
@@ -47,7 +47,6 @@ var (
 	stack                      = "java-microprofile"
 	genStack                   = "generic"
 	statefulSetSN              = name + "-headless"
-	defaultKSVCName            = "user-container"
 )
 
 type Test struct {
@@ -175,7 +174,6 @@ func TestAppsodyController(t *testing.T) {
 
 	// Check updated values in KnativeService
 	ksvcTests := []Test{
-		{"service name", defaultKSVCName, ksvc.Spec.Template.Spec.Containers[0].Name},
 		{"service image name", ksvcAppImage, ksvc.Spec.Template.Spec.Containers[0].Image},
 		{"pull policy", pullPolicy, ksvc.Spec.Template.Spec.Containers[0].ImagePullPolicy},
 		{"service account name", name, ksvc.Spec.Template.Spec.ServiceAccountName},

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -200,14 +200,13 @@ func CustomizeKnativeService(ksvc *servingv1alpha1.Service, cr *appsodyv1beta1.A
 		ksvc.Spec.Template = &servingv1alpha1.RevisionTemplateSpec{}
 	}
 	if len(ksvc.Spec.Template.Spec.Containers) == 0 {
-		ksvc.Spec.Template.Spec.Containers = append(ksvc.Spec.Template.Spec.Containers, corev1.Container{Name: "user-container"})
+		ksvc.Spec.Template.Spec.Containers = append(ksvc.Spec.Template.Spec.Containers, corev1.Container{})
 	}
 
 	if len(ksvc.Spec.Template.Spec.Containers[0].Ports) == 0 {
 		ksvc.Spec.Template.Spec.Containers[0].Ports = append(ksvc.Spec.Template.Spec.Containers[0].Ports, corev1.ContainerPort{})
 	}
 	ksvc.Spec.Template.Spec.Containers[0].Ports[0].ContainerPort = cr.Spec.Service.Port
-	ksvc.Spec.Template.Spec.Containers[0].Name = "user-container"
 	ksvc.Spec.Template.Spec.Containers[0].Image = cr.Spec.ApplicationImage
 	// Knative sets its own resource constraints
 	//ksvc.Spec.Template.Spec.Containers[0].Resources = *cr.Spec.ResourceConstraints