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 5a780dd4cda861445a31c0a939b8d324934a6cb7
Author: lburgazzoli <lburgazzoli@gmail.com>
AuthorDate: Wed Sep 19 11:34:27 2018 +0200
chore: fix golint findings for pkg/install
---
pkg/install/cluster.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index 4fddf54..855d8f6 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -29,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/util/yaml"
)
+// SetupClusterwideResources --
func SetupClusterwideResources() error {
// Install CRD for Integration Context (if needed)
@@ -56,6 +57,7 @@ func SetupClusterwideResources() error {
return nil
}
+// IsCRDInstalled check if the given CRT kind is installed
func IsCRDInstalled(kind string) (bool, error) {
lst, err := k8sclient.GetKubeClient().Discovery().ServerResourcesForGroupVersion("camel.apache.org/v1alpha1")
if err != nil && errors.IsNotFound(err) {
@@ -82,7 +84,7 @@ func installCRD(kind string, resourceName string) error {
}
crd := []byte(deploy.Resources[resourceName])
- crdJson, err := yaml.ToJSON(crd)
+ crdJSON, err := yaml.ToJSON(crd)
if err != nil {
return err
}
@@ -93,7 +95,7 @@ func installCRD(kind string, resourceName string) error {
// Post using dynamic client
result := restClient.
Post().
- Body(crdJson).
+ Body(crdJSON).
Resource("customresourcedefinitions").
Do()
// Check result
@@ -104,6 +106,7 @@ func installCRD(kind string, resourceName string) error {
return nil
}
+// IsClusterRoleInstalled check if cluster role camel-k:edit is installed
func IsClusterRoleInstalled() (bool, error) {
clusterRole := v1.ClusterRole{
TypeMeta: metav1.TypeMeta{
|