Fix #2158: fix bash completion and binding handling

apache · Mar 25, 2021 · 1e8039d · 1e8039d
1 parent 6b506ae
commit 1e8039d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 {