keel-hq
/
keel
mirror of https://github.com/keel-hq/keel/tree/master/chart/keel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated client-go

pull/154/head
Karolis Rusenas 2018-03-03 20:05:58 +00:00
parent 9edadc0bb0
commit 755733e244
8 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
provider/kubernetes/approvals_test.go
View File

@ -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) {

15
provider/kubernetes/implementer.go
View File

@ -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)
}

6
provider/kubernetes/kubernetes.go
View File

@ -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"

4
provider/kubernetes/kubernetes_test.go
View File

@ -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 {

2
provider/kubernetes/unversioned_updates.go
View File

@ -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"

4
provider/kubernetes/unversioned_updates_test.go
View File

@ -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) {

8
provider/kubernetes/versioned_updates.go
View File

@ -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"

4
provider/kubernetes/versioned_updates_test.go
View File

@ -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 {