This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit cf6295d674b5e6444e3dcc96e7cefed34a27e6d9
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Tue May 21 18:07:08 2019 +0200
Fix #669: make sure annotations are propagated correctly to the knative
service
---
pkg/trait/knative_service.go | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index bae73dd..692ea81 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -125,6 +125,14 @@ func (t *knativeServiceTrait) getServiceFor(e
*Environment) *serving.Service {
}
annotations := make(map[string]string)
+
+ // Copy annotations from the integration resource
+ if e.Integration.Annotations != nil {
+ for k, v := range e.Integration.Annotations {
+ annotations[k] = v
+ }
+ }
+
// Resolve registry host names when used
annotations["alpha.image.policy.openshift.io/resolve-names"] = "*"
