Skip to content

Commit

Permalink
Fix kubectl version parsing generation in GKE (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
tamalsaha committed Jan 3, 2018
1 parent 326aea4 commit e2e79c6
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions run.go
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/appscode/stash/pkg/controller"
"github.com/appscode/stash/pkg/docker"
"github.com/appscode/stash/pkg/migrator"
"github.com/hashicorp/go-version"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
crd_cs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
Expand Down Expand Up @@ -52,13 +53,16 @@ func NewCmdRun() *cobra.Command {
crdClient := crd_cs.NewForConfigOrDie(config)

// get kube api server version
version, err := kubeClient.Discovery().ServerVersion()
info, err := kubeClient.Discovery().ServerVersion()
if err != nil {
log.Fatalf("Error getting server version, reason: %s\n", err)
}

gv, err := version.NewVersion(info.GitVersion)
if err != nil {
log.Fatalf("Failed to parse server version, reason: %s\n", err)
}
// check kubectl image
opts.KubectlImageTag = version.Major + "." + version.Minor + ".0"
opts.KubectlImageTag = gv.ToMutator().ResetMetadata().ResetPrerelease().ResetPatch().String()
if err := docker.CheckDockerImageVersion(docker.ImageKubectl, opts.KubectlImageTag); err != nil {
log.Fatalf(`Image %v:%v not found.`, docker.ImageKubectl, opts.KubectlImageTag)
}
Expand Down

0 comments on commit e2e79c6

Please sign in to comment.