Skip to content

Commit

Permalink
Update Kubernetes client libraries to 1.13.0 (#687)
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
tamalsaha committed Feb 26, 2019
1 parent c48dbfc commit ef9a4ae
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 17 deletions.
4 changes: 2 additions & 2 deletions backup.go
Expand Up @@ -7,8 +7,6 @@ import (

"github.com/appscode/go/log"
v "github.com/appscode/go/version"
"github.com/appscode/kutil/meta"
"github.com/appscode/kutil/tools/cli"
api "github.com/appscode/stash/apis/stash/v1alpha1"
cs "github.com/appscode/stash/client/clientset/versioned"
"github.com/appscode/stash/pkg/backup"
Expand All @@ -18,6 +16,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"kmodules.xyz/client-go/meta"
"kmodules.xyz/client-go/tools/cli"
)

func NewCmdBackup() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion check.go
Expand Up @@ -2,12 +2,12 @@ package cmds

import (
"github.com/appscode/go/log"
"github.com/appscode/kutil/meta"
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
"github.com/appscode/stash/pkg/check"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"kmodules.xyz/client-go/meta"
)

func NewCmdCheck() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion forget.go
Expand Up @@ -3,12 +3,12 @@ package cmds
import (
"fmt"

"github.com/appscode/kutil/meta"
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
"github.com/appscode/stash/pkg/registry/snapshot"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/clientcmd"
"kmodules.xyz/client-go/meta"
)

func NewCmdForget() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion recover.go
Expand Up @@ -4,12 +4,12 @@ import (
"time"

"github.com/appscode/go/log"
"github.com/appscode/kutil/meta"
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
"github.com/appscode/stash/pkg/recovery"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"kmodules.xyz/client-go/meta"
)

func NewCmdRecover() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions root.go
Expand Up @@ -7,14 +7,15 @@ import (
"github.com/appscode/go/flags"
"github.com/appscode/go/log/golog"
v "github.com/appscode/go/version"
"github.com/appscode/kutil/tools/cli"
"github.com/appscode/stash/apis"
"github.com/appscode/stash/client/clientset/versioned/scheme"
"github.com/appscode/stash/pkg/util"
"github.com/spf13/cobra"
genericapiserver "k8s.io/apiserver/pkg/server"
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"kmodules.xyz/client-go/logs"
"kmodules.xyz/client-go/tools/cli"
)

func NewRootCmd() *cobra.Command {
Expand All @@ -33,8 +34,7 @@ func NewRootCmd() *cobra.Command {
},
}
rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
// ref: https://github.com/kubernetes/kubernetes/issues/17162#issuecomment-225596212
flag.CommandLine.Parse([]string{})
logs.ParseFlags()
rootCmd.PersistentFlags().StringVar(&util.ServiceName, "service-name", "stash-operator", "Stash service name.")
rootCmd.PersistentFlags().BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics")
rootCmd.PersistentFlags().BoolVar(&apis.EnableStatusSubresource, "enable-status-subresource", apis.EnableStatusSubresource, "If true, uses sub resource for crds.")
Expand Down
2 changes: 1 addition & 1 deletion run.go
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/appscode/go/log"
v "github.com/appscode/go/version"
"github.com/appscode/kutil/tools/cli"
"github.com/appscode/stash/pkg/cmds/server"
"github.com/spf13/cobra"
"kmodules.xyz/client-go/tools/cli"
)

func NewCmdRun(out, errOut io.Writer, stopCh <-chan struct{}) *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion scaledown.go
Expand Up @@ -2,11 +2,11 @@ package cmds

import (
"github.com/appscode/go/log"
"github.com/appscode/kutil/meta"
"github.com/appscode/stash/pkg/scale"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"kmodules.xyz/client-go/meta"
)

func NewCmdScaleDown() *cobra.Command {
Expand Down
17 changes: 11 additions & 6 deletions server/start.go
Expand Up @@ -5,7 +5,6 @@ import (
"io"
"net"

"github.com/appscode/kutil/tools/clientcmd"
"github.com/appscode/stash/apis/repositories/v1alpha1"
"github.com/appscode/stash/pkg/controller"
"github.com/appscode/stash/pkg/server"
Expand All @@ -14,6 +13,8 @@ import (
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
genericapiserver "k8s.io/apiserver/pkg/server"
genericoptions "k8s.io/apiserver/pkg/server/options"
"kmodules.xyz/client-go/meta"
"kmodules.xyz/client-go/tools/clientcmd"
)

const defaultEtcdPathPrefix = "/registry/stash.appscode.com"
Expand All @@ -29,10 +30,14 @@ type StashOptions struct {
func NewStashOptions(out, errOut io.Writer) *StashOptions {
o := &StashOptions{
// TODO we will nil out the etcd storage options. This requires a later level of k8s.io/apiserver
RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, server.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion)),
ExtraOptions: NewExtraOptions(),
StdOut: out,
StdErr: errOut,
RecommendedOptions: genericoptions.NewRecommendedOptions(
defaultEtcdPathPrefix,
server.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion),
genericoptions.NewProcessInfo("stash-operator", meta.Namespace()),
),
ExtraOptions: NewExtraOptions(),
StdOut: out,
StdErr: errOut,
}
o.RecommendedOptions.Etcd = nil
o.RecommendedOptions.Admission = nil
Expand Down Expand Up @@ -67,7 +72,7 @@ func (o StashOptions) Config() (*server.StashConfig, error) {
clientcmd.Fix(serverConfig.ClientConfig)

serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(v1alpha1.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(server.Scheme))
serverConfig.OpenAPIConfig.Info.Title = "stash-server"
serverConfig.OpenAPIConfig.Info.Title = "stash-operator"
serverConfig.OpenAPIConfig.Info.Version = v1alpha1.SchemeGroupVersion.Version
serverConfig.OpenAPIConfig.IgnorePrefixes = []string{
"/swaggerapi",
Expand Down
2 changes: 1 addition & 1 deletion snapshot.go
Expand Up @@ -4,12 +4,12 @@ import (
"encoding/json"
"fmt"

"github.com/appscode/kutil/meta"
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
"github.com/appscode/stash/pkg/registry/snapshot"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/clientcmd"
"kmodules.xyz/client-go/meta"
)

func NewCmdSnapshots() *cobra.Command {
Expand Down

0 comments on commit ef9a4ae

Please sign in to comment.