From 490b9f6df92651a4b676df4adf6b83da1083e586 Mon Sep 17 00:00:00 2001
From: nferraro <ni.ferraro@gmail.com>
Date: Mon, 22 Jul 2019 12:02:33 +0200
Subject: [PATCH] Fix #791: fix after rebase

---
 pkg/trait/container.go            |  4 ++--
 pkg/trait/knative_service.go      | 21 ++++++++++++---------
 pkg/trait/knative_service_test.go |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index d3044d99a8..82eb5f0242 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -131,11 +131,11 @@ func (t *containerTrait) Apply(e *Environment) error {
 		}
 
 		e.ConfigureVolumesAndMounts(
-			&service.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Volumes,
+			&service.Spec.ConfigurationSpec.GetTemplate().Spec.Volumes,
 			&container.VolumeMounts,
 		)
 
-		service.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container = container
+		service.Spec.ConfigurationSpec.GetTemplate().Spec.Containers = append(service.Spec.ConfigurationSpec.GetTemplate().Spec.Containers , container)
 	})
 
 	if t.Expose != nil && *t.Expose {
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index 8c1f33420d..63b56b760b 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -25,6 +25,7 @@ import (
 	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 	"github.com/apache/camel-k/pkg/metadata"
 	serving "github.com/knative/serving/pkg/apis/serving/v1alpha1"
+	servingbeta "github.com/knative/serving/pkg/apis/serving/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -198,15 +199,17 @@ func (t *knativeServiceTrait) getServiceFor(e *Environment) *serving.Service {
 			Annotations: e.Integration.Annotations,
 		},
 		Spec: serving.ServiceSpec{
-			RunLatest: &serving.RunLatestType{
-				Configuration: serving.ConfigurationSpec{
-					RevisionTemplate: serving.RevisionTemplateSpec{
-						ObjectMeta: metav1.ObjectMeta{
-							Labels:      labels,
-							Annotations: annotations,
-						},
-						Spec: serving.RevisionSpec{
-							ServiceAccountName: e.Integration.Spec.ServiceAccountName,
+			ConfigurationSpec: serving.ConfigurationSpec{
+				Template: &serving.RevisionTemplateSpec{
+					ObjectMeta: metav1.ObjectMeta{
+						Labels:      labels,
+						Annotations: annotations,
+					},
+					Spec: serving.RevisionSpec{
+						RevisionSpec: servingbeta.RevisionSpec{
+							PodSpec: corev1.PodSpec{
+								ServiceAccountName: e.Integration.Spec.ServiceAccountName,
+							},
 						},
 					},
 				},
diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go
index ed6846d378..91efd1400c 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -254,6 +254,6 @@ func TestKnativeServiceWithCustomContainerName(t *testing.T) {
 	assert.Equal(
 		t,
 		environment.Integration.Spec.Traits["container"].Configuration["name"],
-		s.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container.Name,
+		s.Spec.ConfigurationSpec.GetTemplate().Spec.Containers[0].Name,
 	)
 }