From 755733e244bf266938883c952fa476f61af8d594 Mon Sep 17 00:00:00 2001 From: Karolis Rusenas Date: Sat, 3 Mar 2018 20:05:58 +0000 Subject: [PATCH] updated client-go --- provider/kubernetes/approvals_test.go | 4 ++-- provider/kubernetes/implementer.go | 15 +++++++++------ provider/kubernetes/kubernetes.go | 6 ++++-- provider/kubernetes/kubernetes_test.go | 4 ++-- provider/kubernetes/unversioned_updates.go | 2 +- provider/kubernetes/unversioned_updates_test.go | 4 ++-- provider/kubernetes/versioned_updates.go | 8 ++++++-- provider/kubernetes/versioned_updates_test.go | 4 ++-- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/provider/kubernetes/approvals_test.go b/provider/kubernetes/approvals_test.go index b899c227..7c04e407 100644 --- a/provider/kubernetes/approvals_test.go +++ b/provider/kubernetes/approvals_test.go @@ -6,9 +6,9 @@ import ( "github.com/keel-hq/keel/types" + "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" ) func TestCheckRequestedApproval(t *testing.T) { diff --git a/provider/kubernetes/implementer.go b/provider/kubernetes/implementer.go index a87f2d82..93c633a7 100644 --- a/provider/kubernetes/implementer.go +++ b/provider/kubernetes/implementer.go @@ -6,8 +6,11 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" core_v1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + // "k8s.io/api/core/v1" + + "k8s.io/api/core/v1" + + "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -81,7 +84,7 @@ func NewKubernetesImplementer(opts *Opts) (*KubernetesImplementer, error) { // Namespaces - get all namespaces func (i *KubernetesImplementer) Namespaces() (*v1.NamespaceList, error) { - namespaces := i.client.Namespaces() + namespaces := i.client.Core().Namespaces() return namespaces.List(meta_v1.ListOptions{}) } @@ -107,15 +110,15 @@ func (i *KubernetesImplementer) Update(deployment *v1beta1.Deployment) error { // Secret - get secret func (i *KubernetesImplementer) Secret(namespace, name string) (*v1.Secret, error) { - return i.client.Secrets(namespace).Get(name, meta_v1.GetOptions{}) + return i.client.Core().Secrets(namespace).Get(name, meta_v1.GetOptions{}) } // Pods - get pods func (i *KubernetesImplementer) Pods(namespace, labelSelector string) (*v1.PodList, error) { - return i.client.Pods(namespace).List(meta_v1.ListOptions{LabelSelector: labelSelector}) + return i.client.Core().Pods(namespace).List(meta_v1.ListOptions{LabelSelector: labelSelector}) } // ConfigMaps - returns an interface to config maps for a specified namespace func (i *KubernetesImplementer) ConfigMaps(namespace string) core_v1.ConfigMapInterface { - return i.client.ConfigMaps(namespace) + return i.client.Core().ConfigMaps(namespace) } diff --git a/provider/kubernetes/kubernetes.go b/provider/kubernetes/kubernetes.go index 484503a8..0b625f49 100644 --- a/provider/kubernetes/kubernetes.go +++ b/provider/kubernetes/kubernetes.go @@ -8,8 +8,10 @@ import ( "github.com/rusenask/cron" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + // "k8s.io/api/core/v1" + "k8s.io/api/core/v1" + + "k8s.io/api/extensions/v1beta1" "github.com/keel-hq/keel/approvals" "github.com/keel-hq/keel/extension/notification" diff --git a/provider/kubernetes/kubernetes_test.go b/provider/kubernetes/kubernetes_test.go index 088e9f9d..e0cddff6 100644 --- a/provider/kubernetes/kubernetes_test.go +++ b/provider/kubernetes/kubernetes_test.go @@ -10,10 +10,10 @@ import ( "github.com/keel-hq/keel/types" "github.com/keel-hq/keel/util/codecs" + "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" core_v1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" ) type fakeProvider struct { diff --git a/provider/kubernetes/unversioned_updates.go b/provider/kubernetes/unversioned_updates.go index fa7abf48..f6b55b8c 100644 --- a/provider/kubernetes/unversioned_updates.go +++ b/provider/kubernetes/unversioned_updates.go @@ -3,7 +3,7 @@ package kubernetes import ( "fmt" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "github.com/keel-hq/keel/types" "github.com/keel-hq/keel/util/image" diff --git a/provider/kubernetes/unversioned_updates_test.go b/provider/kubernetes/unversioned_updates_test.go index ba91ec7c..3c5c2cfe 100644 --- a/provider/kubernetes/unversioned_updates_test.go +++ b/provider/kubernetes/unversioned_updates_test.go @@ -7,9 +7,9 @@ import ( "github.com/keel-hq/keel/approvals" "github.com/keel-hq/keel/extension/notification" "github.com/keel-hq/keel/types" + "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" ) func TestProvider_checkUnversionedDeployment(t *testing.T) { diff --git a/provider/kubernetes/versioned_updates.go b/provider/kubernetes/versioned_updates.go index 5d200111..1e375f25 100644 --- a/provider/kubernetes/versioned_updates.go +++ b/provider/kubernetes/versioned_updates.go @@ -3,8 +3,12 @@ package kubernetes import ( "fmt" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + // "k8s.io/api/core/v1" + + "k8s.io/api/core/v1" + + // "k8s.io/api/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "github.com/keel-hq/keel/types" "github.com/keel-hq/keel/util/image" diff --git a/provider/kubernetes/versioned_updates_test.go b/provider/kubernetes/versioned_updates_test.go index 5681eac2..6927cfb2 100644 --- a/provider/kubernetes/versioned_updates_test.go +++ b/provider/kubernetes/versioned_updates_test.go @@ -11,8 +11,8 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" ) func unsafeGetVersion(ver string) *types.Version {