You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2021/10/05 12:33:04 UTC

[camel-k] branch main updated (a9ff49a -> 45a79a3)

This is an automated email from the ASF dual-hosted git repository.

tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.


    from a9ff49a  feat: Add progress-deadline-seconds option to deployment trait
     new 563399c  fix(cli): kamel install fails with error: Object 'Kind' is missing in 'null'
     new 45a79a3  chore(cli): more friendly error message in case of kamel install failure

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pkg/install/operator.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

[camel-k] 01/02: fix(cli): kamel install fails with error: Object 'Kind' is missing in 'null'

Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 563399c0e64adc2cf2f7454a42acb78df86a06f8
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue Oct 5 16:21:01 2021 +0900

    fix(cli): kamel install fails with error: Object 'Kind' is missing in 'null'
    
    Fix #2674
---
 pkg/install/operator.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index 656eba6..c8ea505 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -224,7 +224,7 @@ func OperatorOrCollect(ctx context.Context, c client.Client, cfg OperatorConfigu
 		if err := installOpenShiftRoles(ctx, c, cfg.Namespace, customizer, collection, force); err != nil {
 			return err
 		}
-		if err := installClusterRoleBinding(ctx, c, collection, cfg.Namespace, "camel-k-operator-console-openshift", "/rbac/operator-cluster-role-console-binding-openshift.yaml"); err != nil {
+		if err := installClusterRoleBinding(ctx, c, collection, cfg.Namespace, "camel-k-operator-console-openshift", "/rbac/openshift/operator-cluster-role-console-binding-openshift.yaml"); err != nil {
 			if k8serrors.IsForbidden(err) {
 				fmt.Println("Warning: the operator will not be able to manage ConsoleCLIDownload resources. Try installing the operator as cluster-admin.")
 			} else {

[camel-k] 02/02: chore(cli): more friendly error message in case of kamel install failure

Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 45a79a39d7dcadb1f6bbab977d37e8950815cd6b
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue Oct 5 16:46:14 2021 +0900

    chore(cli): more friendly error message in case of kamel install failure
---
 pkg/install/operator.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index c8ea505..3003cfc 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -301,7 +301,11 @@ func installClusterRoleBinding(ctx context.Context, c client.Client, collection
 	existing, err := c.RbacV1().ClusterRoleBindings().Get(ctx, name, metav1.GetOptions{})
 	if k8serrors.IsNotFound(err) {
 		existing = nil
-		obj, err := kubernetes.LoadResourceFromYaml(c.GetScheme(), resources.ResourceAsString(path))
+		yaml := resources.ResourceAsString(path)
+		if yaml == "" {
+			return errors.Errorf("resource file %v not found", path)
+		}
+		obj, err := kubernetes.LoadResourceFromYaml(c.GetScheme(), yaml)
 		if err != nil {
 			return err
 		}