Skip to content

Commit

Permalink
Use client-go 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@tamalsaha
tamalsaha committed Oct 16, 2017
1 parent 091541e commit f945ccd
Show file tree
Hide file tree
Showing 1,276 changed files with 176,776 additions and 293,774 deletions.
213 changes: 123 additions & 90 deletions glide.lock
View file

Large diffs are not rendered by default.

24 changes: 16 additions & 8 deletions glide.yaml
View file
Expand Up @@ -5,30 +5,32 @@ import:
- package: github.com/appscode/go-notify
version: master
- package: github.com/appscode/kutil
version: release-4.0
version: client-go-5
- package: github.com/appscode/go-term
version: master
- package: github.com/appscode/go
version: master
- package: github.com/appscode/pat
version: master
- package: github.com/appscode/searchlight
version: master
version: client-go-5
- package: github.com/appscode/stash
version: master
version: client-go-5
- package: github.com/appscode/voyager
version: master
version: client-go-5
- package: github.com/blevesearch/bleve
version: v0.5.0
- package: github.com/coreos/prometheus-operator
version: v0.12.0
repo: https://github.com/appscode/prometheus-operator.git
vcs: git
version: client-go-5
- package: github.com/ghodss/yaml
version: v1.0.0
- package: github.com/influxdata/influxdb
version: v0.11.0
- package: github.com/jpillora/go-ogle-analytics
- package: github.com/k8sdb/apimachinery
version: master
version: client-go-5
- package: github.com/spf13/cobra
version: master
- package: github.com/spf13/pflag
Expand All @@ -37,10 +39,14 @@ import:
version: v3.0.59
- package: github.com/robfig/cron
version: master
- package: k8s.io/api
version: fe29995db37613b9c5b2a647544cf627bfa8d299
- package: k8s.io/apiextensions-apiserver
version: a5bbfd114a9b122acd741c61d88c84812375d9e1
- package: k8s.io/apimachinery
version: 1fd2e63a9a370677308a42f24fd40c86438afddf
version: 9d38e20d609d27e00d4ec18f7b9db67105a2bde0
- package: k8s.io/client-go
version: v4.0.0
version: release-5.0
- package: github.com/graymeta/stow
repo: https://github.com/appscode/stow.git
version: master
Expand All @@ -63,6 +69,8 @@ import:
repo: https://github.com/appscode/go-version.git
version: master
vcs: git
- package: github.com/mattn/go-isatty
version: 57fdcb988a5c543893cc61bce354a6e24ab70022
testImport:
- package: github.com/google/certificate-transparency
- package: github.com/stretchr/testify
Expand Down
2 changes: 1 addition & 1 deletion hack/config/main.go
View file
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/config"
"github.com/ghodss/yaml"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions hack/libbuild/reimport.py
View file
Expand Up @@ -37,15 +37,15 @@ def reimport(*paths):
END_IMPORT_REGEX = ur'\)\s*'

PKG_MAP = {
'k8s.io/kubernetes/pkg/api': ['k8s.io/client-go/pkg/api/v1', 'apiv1'],
'k8s.io/kubernetes/pkg/api': ['k8s.io/api/core/v1', 'apiv1'],
'k8s.io/kubernetes/pkg/api/errors': ['k8s.io/apimachinery/pkg/api/errors', 'kerr'],
'k8s.io/kubernetes/pkg/api/unversioned': ['k8s.io/apimachinery/pkg/apis/meta/v1', 'metav1'],
'k8s.io/kubernetes/pkg/apimachinery/announced': ['k8s.io/apimachinery/pkg/apimachinery/announced'],
'k8s.io/kubernetes/pkg/apimachinery/registered': ['k8s.io/client-go/pkg/api', 'kapi'],
'k8s.io/kubernetes/pkg/apis/apps': ['k8s.io/client-go/pkg/apis/apps/v1beta1', 'apps'],
'k8s.io/kubernetes/pkg/apis/batch': ['k8s.io/client-go/pkg/apis/batch/v1', 'batch'],
'k8s.io/kubernetes/pkg/apis/extensions': ['k8s.io/client-go/pkg/apis/extensions/v1beta1', 'extensions'],
'k8s.io/kubernetes/pkg/apis/storage': ['k8s.io/client-go/pkg/apis/storage/v1', 'storage'],
'k8s.io/kubernetes/pkg/apis/apps': ['k8s.io/api/apps/v1beta1', 'apps'],
'k8s.io/kubernetes/pkg/apis/batch': ['k8s.io/api/batch/v1', 'batch'],
'k8s.io/kubernetes/pkg/apis/extensions': ['k8s.io/api/extensions/v1beta1', 'extensions'],
'k8s.io/kubernetes/pkg/apis/storage': ['k8s.io/api/storage/v1', 'storage'],
'k8s.io/kubernetes/pkg/client/cache': ['k8s.io/client-go/tools/cache'],
'k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset': ['k8s.io/client-go/kubernetes', 'clientset'],
'k8s.io/kubernetes/pkg/client/record': ['k8s.io/client-go/tools/record'],
Expand Down
6 changes: 6 additions & 0 deletions hack/release.sh
View file
Expand Up @@ -3,5 +3,11 @@
set -x
set -eou pipefail

GOPATH=$(go env GOPATH)
REPO_ROOT="$GOPATH/src/github.com/appscode/kubed"
rm -rf $REPO_ROOT/dist

./hack/docker/setup.sh
env APPSCODE_ENV=prod ./hack/docker/setup.sh release

rm $REPO_ROOT/dist/.tag
2 changes: 1 addition & 1 deletion pkg/backup/cluster.go
View file
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/appscode/go-term"
"github.com/appscode/go/log"
"github.com/ghodss/yaml"
kapi "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
kapi "k8s.io/client-go/pkg/api"
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/client-go/rest"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmds/run.go
View file
Expand Up @@ -16,8 +16,8 @@ import (
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
kcs "github.com/k8sdb/apimachinery/client/typed/kubedb/v1alpha1"
"github.com/spf13/cobra"
apiv1 "k8s.io/api/core/v1"
clientset "k8s.io/client-go/kubernetes"
apiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/clientcmd"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/eventer/forwarder.go
View file
Expand Up @@ -11,8 +11,8 @@ import (
stringz "github.com/appscode/go/strings"
"github.com/appscode/kubed/pkg/config"
"github.com/ghodss/yaml"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

type EventForwarder struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/indexers/reverse_index_test.go
View file
Expand Up @@ -7,9 +7,9 @@ import (
"testing"

"github.com/appscode/go/log"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api/v1"
)

func newTestReverseIndexer() *ReverseIndexer {
Expand Down
2 changes: 1 addition & 1 deletion pkg/indexers/service_index.go
View file
Expand Up @@ -11,11 +11,11 @@ import (
kutil "github.com/appscode/kutil/core/v1"
"github.com/appscode/pat"
"github.com/blevesearch/bleve"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
clientset "k8s.io/client-go/kubernetes"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

type ServiceIndexer interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/indexers/servicemonitor_index.go
View file
Expand Up @@ -11,11 +11,11 @@ import (
"github.com/appscode/pat"
"github.com/blevesearch/bleve"
prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
clientset "k8s.io/client-go/kubernetes"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

type ServiceMonitorIndexer interface {
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/cluster_role_v1alpha1.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/rbac/v1alpha1"
apiv1 "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
rbac "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/cluster_role_v1beta1.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/rbac/v1beta1"
apiv1 "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
rbac "k8s.io/client-go/pkg/apis/rbac/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/cluster_rolebinding_v1alpha1.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/rbac/v1alpha1"
apiv1 "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
rbac "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/cluster_rolebinding_v1beta1.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/rbac/v1alpha1"
apiv1 "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
rbac "k8s.io/client-go/pkg/apis/rbac/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configmap.go
View file
Expand Up @@ -8,11 +8,11 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/core/v1"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/csr_v1beta1.go
View file
Expand Up @@ -8,11 +8,11 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/certificates/v1beta1"
certificates "k8s.io/api/certificates/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
certificates "k8s.io/client-go/pkg/apis/certificates/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/daemonset.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/core/v1"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/deployment_app.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
apps "k8s.io/client-go/pkg/apis/apps/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/deployment_extension.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/extensions/v1beta1"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/endpoint.go
View file
Expand Up @@ -7,11 +7,11 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/core/v1"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache"
)

Expand Down
5 changes: 2 additions & 3 deletions pkg/operator/event.go
View file
Expand Up @@ -5,13 +5,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/core/v1"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/api"
apiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache"
)

Expand All @@ -24,7 +23,7 @@ func (op *Operator) WatchEvents() {

defer acrt.HandleCrash()

fs := fields.OneTermEqualSelector(api.EventTypeField, apiv1.EventTypeWarning).String()
fs := fields.OneTermEqualSelector("type", apiv1.EventTypeWarning).String()
lw := &cache.ListWatch{
ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
return op.KubeClient.CoreV1().Events(apiv1.NamespaceAll).List(metav1.ListOptions{
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/ingress.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/extensions/v1beta1"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/operator/job.go
View file
Expand Up @@ -8,13 +8,13 @@ import (
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/batch/v1"
batch "k8s.io/api/batch/v1"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
batch "k8s.io/client-go/pkg/apis/batch/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/tools/cache"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/kubedb_dormant_database.go
View file
Expand Up @@ -7,13 +7,13 @@ import (
"github.com/appscode/go/log"
acrt "github.com/appscode/go/runtime"
"github.com/appscode/kubed/pkg/util"
kutil "github.com/appscode/kutil/kubedb/v1alpha1"
tapi "github.com/k8sdb/apimachinery/apis/kubedb/v1alpha1"
kutil "github.com/k8sdb/apimachinery/client/typed/kubedb/v1alpha1/util"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
apiv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache"
)

Expand Down

0 comments on commit f945ccd

Please sign in to comment.