Skip to content

Commit ef9a4ae

Browse files
authored
Update Kubernetes client libraries to 1.13.0 (#687)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent c48dbfc commit ef9a4ae

File tree

9 files changed

+22
-17
lines changed

9 files changed

+22
-17
lines changed

backup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77

88
"github.com/appscode/go/log"
99
v "github.com/appscode/go/version"
10-
"github.com/appscode/kutil/meta"
11-
"github.com/appscode/kutil/tools/cli"
1210
api "github.com/appscode/stash/apis/stash/v1alpha1"
1311
cs "github.com/appscode/stash/client/clientset/versioned"
1412
"github.com/appscode/stash/pkg/backup"
@@ -18,6 +16,8 @@ import (
1816
"github.com/spf13/cobra"
1917
"k8s.io/client-go/kubernetes"
2018
"k8s.io/client-go/tools/clientcmd"
19+
"kmodules.xyz/client-go/meta"
20+
"kmodules.xyz/client-go/tools/cli"
2121
)
2222

2323
func NewCmdBackup() *cobra.Command {

check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package cmds
22

33
import (
44
"github.com/appscode/go/log"
5-
"github.com/appscode/kutil/meta"
65
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
76
"github.com/appscode/stash/pkg/check"
87
"github.com/spf13/cobra"
98
"k8s.io/client-go/kubernetes"
109
"k8s.io/client-go/tools/clientcmd"
10+
"kmodules.xyz/client-go/meta"
1111
)
1212

1313
func NewCmdCheck() *cobra.Command {

forget.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package cmds
33
import (
44
"fmt"
55

6-
"github.com/appscode/kutil/meta"
76
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
87
"github.com/appscode/stash/pkg/registry/snapshot"
98
"github.com/spf13/cobra"
109
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1110
"k8s.io/client-go/tools/clientcmd"
11+
"kmodules.xyz/client-go/meta"
1212
)
1313

1414
func NewCmdForget() *cobra.Command {

recover.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"time"
55

66
"github.com/appscode/go/log"
7-
"github.com/appscode/kutil/meta"
87
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
98
"github.com/appscode/stash/pkg/recovery"
109
"github.com/spf13/cobra"
1110
"k8s.io/client-go/kubernetes"
1211
"k8s.io/client-go/tools/clientcmd"
12+
"kmodules.xyz/client-go/meta"
1313
)
1414

1515
func NewCmdRecover() *cobra.Command {

root.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import (
77
"github.com/appscode/go/flags"
88
"github.com/appscode/go/log/golog"
99
v "github.com/appscode/go/version"
10-
"github.com/appscode/kutil/tools/cli"
1110
"github.com/appscode/stash/apis"
1211
"github.com/appscode/stash/client/clientset/versioned/scheme"
1312
"github.com/appscode/stash/pkg/util"
1413
"github.com/spf13/cobra"
1514
genericapiserver "k8s.io/apiserver/pkg/server"
1615
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
1716
"k8s.io/kubernetes/pkg/api/legacyscheme"
17+
"kmodules.xyz/client-go/logs"
18+
"kmodules.xyz/client-go/tools/cli"
1819
)
1920

2021
func NewRootCmd() *cobra.Command {
@@ -33,8 +34,7 @@ func NewRootCmd() *cobra.Command {
3334
},
3435
}
3536
rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
36-
// ref: https://github.com/kubernetes/kubernetes/issues/17162#issuecomment-225596212
37-
flag.CommandLine.Parse([]string{})
37+
logs.ParseFlags()
3838
rootCmd.PersistentFlags().StringVar(&util.ServiceName, "service-name", "stash-operator", "Stash service name.")
3939
rootCmd.PersistentFlags().BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics")
4040
rootCmd.PersistentFlags().BoolVar(&apis.EnableStatusSubresource, "enable-status-subresource", apis.EnableStatusSubresource, "If true, uses sub resource for crds.")

run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"github.com/appscode/go/log"
77
v "github.com/appscode/go/version"
8-
"github.com/appscode/kutil/tools/cli"
98
"github.com/appscode/stash/pkg/cmds/server"
109
"github.com/spf13/cobra"
10+
"kmodules.xyz/client-go/tools/cli"
1111
)
1212

1313
func NewCmdRun(out, errOut io.Writer, stopCh <-chan struct{}) *cobra.Command {

scaledown.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package cmds
22

33
import (
44
"github.com/appscode/go/log"
5-
"github.com/appscode/kutil/meta"
65
"github.com/appscode/stash/pkg/scale"
76
"github.com/spf13/cobra"
87
"k8s.io/client-go/kubernetes"
98
"k8s.io/client-go/tools/clientcmd"
9+
"kmodules.xyz/client-go/meta"
1010
)
1111

1212
func NewCmdScaleDown() *cobra.Command {

server/start.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"io"
66
"net"
77

8-
"github.com/appscode/kutil/tools/clientcmd"
98
"github.com/appscode/stash/apis/repositories/v1alpha1"
109
"github.com/appscode/stash/pkg/controller"
1110
"github.com/appscode/stash/pkg/server"
@@ -14,6 +13,8 @@ import (
1413
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
1514
genericapiserver "k8s.io/apiserver/pkg/server"
1615
genericoptions "k8s.io/apiserver/pkg/server/options"
16+
"kmodules.xyz/client-go/meta"
17+
"kmodules.xyz/client-go/tools/clientcmd"
1718
)
1819

1920
const defaultEtcdPathPrefix = "/registry/stash.appscode.com"
@@ -29,10 +30,14 @@ type StashOptions struct {
2930
func NewStashOptions(out, errOut io.Writer) *StashOptions {
3031
o := &StashOptions{
3132
// TODO we will nil out the etcd storage options. This requires a later level of k8s.io/apiserver
32-
RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, server.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion)),
33-
ExtraOptions: NewExtraOptions(),
34-
StdOut: out,
35-
StdErr: errOut,
33+
RecommendedOptions: genericoptions.NewRecommendedOptions(
34+
defaultEtcdPathPrefix,
35+
server.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion),
36+
genericoptions.NewProcessInfo("stash-operator", meta.Namespace()),
37+
),
38+
ExtraOptions: NewExtraOptions(),
39+
StdOut: out,
40+
StdErr: errOut,
3641
}
3742
o.RecommendedOptions.Etcd = nil
3843
o.RecommendedOptions.Admission = nil
@@ -67,7 +72,7 @@ func (o StashOptions) Config() (*server.StashConfig, error) {
6772
clientcmd.Fix(serverConfig.ClientConfig)
6873

6974
serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(v1alpha1.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(server.Scheme))
70-
serverConfig.OpenAPIConfig.Info.Title = "stash-server"
75+
serverConfig.OpenAPIConfig.Info.Title = "stash-operator"
7176
serverConfig.OpenAPIConfig.Info.Version = v1alpha1.SchemeGroupVersion.Version
7277
serverConfig.OpenAPIConfig.IgnorePrefixes = []string{
7378
"/swaggerapi",

snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"encoding/json"
55
"fmt"
66

7-
"github.com/appscode/kutil/meta"
87
cs "github.com/appscode/stash/client/clientset/versioned/typed/stash/v1alpha1"
98
"github.com/appscode/stash/pkg/registry/snapshot"
109
"github.com/spf13/cobra"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211
"k8s.io/client-go/tools/clientcmd"
12+
"kmodules.xyz/client-go/meta"
1313
)
1414

1515
func NewCmdSnapshots() *cobra.Command {

0 commit comments

Comments
 (0)