Skip to content

Commit

Permalink
remove import alias and fix naming
Browse files Browse the repository at this point in the history
  • Loading branch information
lburgazzoli authored and nicolaferraro committed Sep 11, 2018
1 parent dd3eafa commit b62b092
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions pkg/client/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ package cmd

import (
"fmt"
installutils "github.com/apache/camel-k/pkg/install"

"github.com/apache/camel-k/pkg/install"
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/api/errors"
)
Expand All @@ -43,7 +44,7 @@ func NewCmdInstall(rootCmdOptions *RootCmdOptions) *cobra.Command {
}

func (o *InstallCmdOptions) install(cmd *cobra.Command, args []string) error {
err := installutils.SetupClusterwideResources()
err := install.SetupClusterwideResources()
if err != nil && errors.IsForbidden(err) {
// TODO explain that this is a one time operation and add a flag to do cluster-level operations only when logged as admin
fmt.Println("Current user is not authorized to create cluster-wide objects like custom resource definitions or cluster roles: ", err)
Expand All @@ -53,7 +54,7 @@ func (o *InstallCmdOptions) install(cmd *cobra.Command, args []string) error {

namespace := o.Namespace

err = installutils.InstallOperator(namespace)
err = install.Operator(namespace)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/install/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func InstallOperator(namespace string) error {
func Operator(namespace string) error {
return installResources(namespace,
"operator-service-account.yaml",
"operator-role.yaml",
Expand Down

0 comments on commit b62b092

Please sign in to comment.