This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1e8039dfc36228150134db5c534b0fe647b8409d Author: nicolaferraro <ni.ferr...@gmail.com> AuthorDate: Wed Mar 24 23:56:38 2021 +0100 Fix #2158: fix bash completion and binding handling --- pkg/cmd/completion_bash.go | 2 +- pkg/trait/service_binding.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/completion_bash.go b/pkg/cmd/completion_bash.go index 6d554c1..7da2b7b 100644 --- a/pkg/cmd/completion_bash.go +++ b/pkg/cmd/completion_bash.go @@ -108,7 +108,7 @@ __kamel_kubectl_get_servicebinding() { version=$(echo ${resource} | cut -d'/' -f 3) group=$(echo ${resource} | cut -d'/' -f 2) kind=$(echo ${resource} | cut -d'/' -f 1) - services_list="${services_list} ${kind}.${version}.${group}/${name}" + services_list="${services_list} ${group}/${version}:${kind}:${name}" done COMPREPLY=( $( compgen -W "${services_list[*]}" -- "$cur" ) ) fi diff --git a/pkg/trait/service_binding.go b/pkg/trait/service_binding.go index 10ff8ce..611a387 100644 --- a/pkg/trait/service_binding.go +++ b/pkg/trait/service_binding.go @@ -207,8 +207,11 @@ func (t *serviceBindingTrait) parseServiceBindings(e *Environment) ([]string, er if err != nil { return serviceBindings, err } + if ref.Namespace == "" { + ref.Namespace = e.Integration.Namespace + } if ref.Kind == "ServiceBinding" { - if ref.GroupVersionKind().String() != sb.GroupVersion.String() { + if ref.GroupVersionKind().GroupVersion().String() != sb.GroupVersion.String() { return nil, fmt.Errorf("ServiceBinding: %q api version should be %q", s, sb.GroupVersion.String()) } if ref.Namespace != e.Integration.Namespace {