summaryrefslogtreecommitdiffstats
path: root/src/k8splugin/internal
diff options
context:
space:
mode:
authorKiran Kamineni <kiran.k.kamineni@intel.com>2019-09-13 12:59:47 -0700
committerKiran Kamineni <kiran.k.kamineni@intel.com>2019-09-13 12:59:52 -0700
commit1232846e9e6511ccc274c31cf9d2f573e2f62de9 (patch)
treecb0b8412501893384547ac81097fbe24b6a2cdeb /src/k8splugin/internal
parent7c1fb25948c06e4e0b572241ae292fc31a4f4af1 (diff)
Update to kubernetes 1.14.1
Updated package to use kubernetes 1.14.1 Also updated the other packages that no longer worked because of this change. Issue-ID: MULTICLOUD-666 Change-Id: Ibfdf7215d8d7beceabe1bf895a356017da0b7d9c Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Diffstat (limited to 'src/k8splugin/internal')
-rw-r--r--src/k8splugin/internal/app/client.go6
-rw-r--r--src/k8splugin/internal/namegenerator/namegenerator.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/k8splugin/internal/app/client.go b/src/k8splugin/internal/app/client.go
index 914a8eec..e52225d4 100644
--- a/src/k8splugin/internal/app/client.go
+++ b/src/k8splugin/internal/app/client.go
@@ -25,7 +25,7 @@ import (
pkgerrors "github.com/pkg/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
- "k8s.io/client-go/discovery"
+ "k8s.io/client-go/discovery/cached/disk"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/restmapper"
@@ -37,7 +37,7 @@ import (
type KubernetesClient struct {
clientSet kubernetes.Interface
dynamicClient dynamic.Interface
- discoverClient discovery.CachedDiscoveryInterface
+ discoverClient *disk.CachedDiscoveryClient
restMapper meta.RESTMapper
instanceID string
}
@@ -90,7 +90,7 @@ func (k *KubernetesClient) init(cloudregion string, iid string) error {
return pkgerrors.Wrap(err, "Creating dynamic client")
}
- k.discoverClient, err = discovery.NewCachedDiscoveryClientForConfig(config, os.TempDir(), "", 10*time.Minute)
+ k.discoverClient, err = disk.NewCachedDiscoveryClientForConfig(config, os.TempDir(), "", 10*time.Minute)
if err != nil {
return pkgerrors.Wrap(err, "Creating discovery client")
}
diff --git a/src/k8splugin/internal/namegenerator/namegenerator.go b/src/k8splugin/internal/namegenerator/namegenerator.go
index 1980944f..52eef366 100644
--- a/src/k8splugin/internal/namegenerator/namegenerator.go
+++ b/src/k8splugin/internal/namegenerator/namegenerator.go
@@ -24,7 +24,7 @@ import (
"github.com/onap/multicloud-k8s/src/k8splugin/internal/db"
- "github.com/moby/moby/pkg/namesgenerator"
+ "github.com/docker/engine/pkg/namesgenerator"
pkgerrors "github.com/pkg/errors"
)