Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add validation to k8s version, improve error messages #26

Merged
merged 2 commits into from
Nov 23, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions cmd/down.go
Original file line number Diff line number Diff line change
@@ -17,7 +17,10 @@ limitations under the License.
package cmd

import (
"fmt"

"github.com/ksonnet/kubecfg/pkg/kubecfg"
"github.com/ksonnet/kubecfg/utils"
"github.com/spf13/cobra"
)

@@ -33,24 +36,36 @@ var downCmd = &cobra.Command{
var err error
c.GracePeriod, err = cmd.Flags().GetInt64("grace-period")
if err != nil {
return err
return fmt.Errorf("can't get --grace-period flag: %v", err)
}

c.ClientPool, c.Discovery, err = restClientPool()
if err != nil {
return err
return fmt.Errorf("can't get Kubernetes client: %v", err)
}
// validate k8s version
version, err := utils.FetchVersion(c.Discovery)
if err != nil {
return fmt.Errorf("can't verify Kubernetes version: %v", err)
}
if version.Major <= 1 && version.Minor < 7 {
return fmt.Errorf("kubernetes with RBAC enabled (v1.7+) is required to run Kubeapps")
}

manifest, err := fsGetFile("/kubeapps-objs.yaml")
if err != nil {
return err
return fmt.Errorf("can't read kubeapps manifest: %v", err)
}
objs, err := parseObjects(manifest)
if err != nil {
return err
return fmt.Errorf("can't parse kubeapps manifest: %v", err)
}
if err = c.Run(objs); err != nil {
return fmt.Errorf("can't uninstall kubeapps components: %v", err)
}

return c.Run(objs)
fmt.Println("successfully uninstalled kubeapps")
return nil
},
}

2 changes: 2 additions & 0 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -51,6 +51,8 @@ var RootCmd = &cobra.Command{
Long: `kubeapps installs the Kubeapps components into your cluster.

Find more information at https://github.com/kubeapps/kubeapps.`,
SilenceErrors: true,
SilenceUsage: true,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
out := cmd.OutOrStderr()
logrus.SetOutput(out)
39 changes: 29 additions & 10 deletions cmd/up.go
Original file line number Diff line number Diff line change
@@ -17,12 +17,14 @@ limitations under the License.
package cmd

import (
"fmt"
"os"
"strings"

"github.com/ksonnet/kubecfg/metadata"
"github.com/ksonnet/kubecfg/pkg/kubecfg"
"github.com/kubeapps/kubeapps/pkg/gke"
"github.com/ksonnet/kubecfg/utils"
"github.com/spf13/cobra"
"k8s.io/client-go/discovery"
)
@@ -51,29 +53,39 @@ List of components that kubeapps up installs:

c.DryRun, err = cmd.Flags().GetBool("dry-run")
if err != nil {
return err
return fmt.Errorf("can't get --dry-run flag: %v", err)
}

c.GcTag = GcTag

c.ClientPool, c.Discovery, err = restClientPool()
if err != nil {
return err
return fmt.Errorf("can't get Kubernetes client: %v", err)
}

// validate k8s version
version, err := utils.FetchVersion(c.Discovery)
if err != nil {
return fmt.Errorf("can't verify Kubernetes version: %v", err)
}
if version.Major <= 1 && version.Minor < 7 {
return fmt.Errorf("kubernetes with RBAC enabled (v1.7+) is required to run Kubeapps")
}

cwd, err := os.Getwd()
if err != nil {
return err
return fmt.Errorf("can't get current directory: %v", err)
}
wd := metadata.AbsPath(cwd)

manifest, err := fsGetFile("/kubeapps-objs.yaml")
if err != nil {
return err
return fmt.Errorf("can't read kubeapps manifest: %v", err)
}

objs, err := parseObjects(manifest)
if err != nil {
return err
return fmt.Errorf("can't parse kubeapps manifest: %v", err)
}

// k8s on GKE
@@ -82,28 +94,35 @@ List of components that kubeapps up installs:
} else if ok {
gcloudPath, err := gke.SdkConfigPath()
if err != nil {
return err
return fmt.Errorf("can't get sdk config path: %v", err)
}

user, err := gke.GetActiveUser(gcloudPath)
if err != nil {
return err
return fmt.Errorf("can't get active gke user: %v", err)
}

crb, err := gke.BuildCrbObject(user)
if err != nil {
return err
return fmt.Errorf("can't assign cluster-admin permission to the current user: %v", err)
}

//(tuna): we force the deployment ordering here:
// this clusterrolebinding will be created before others for granting the proper permission.
// when the installation finishes, it will be gc'd immediately.
c.SkipGc = true
c.Run(crb, wd)
err = c.Run(crb, wd)
if err != nil {
return fmt.Errorf("can't assign cluster-admin permission to the current user: %v", err)
}
c.SkipGc = false
}

return c.Run(objs, wd)
if err = c.Run(objs, wd); err != nil {
return fmt.Errorf("can't install kubeapps components: %v", err)
}
fmt.Println("successfully installed kubeapps")
return nil
},
}