Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update k8s client version to 4.0.0 (#351)

Browse Source 
Move to client-go v4.0.0 from 1.5.
This commit is contained in:
Ta-Ching Chen
2017-09-29 07:37:36 -07:00
committed by Soam Vasani
parent e4d42797e6
commit a25c167d23
66 changed files with 825 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/functionServiceMap.go
+5 -5
View File
@@ -21,7 +21,7 @@ import (
"net/url"
"time"
"k8s.io/client-go/1.5/pkg/api"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission/cache"
)
@@ -31,7 +31,7 @@ type (
cache *cache.Cache // map[metadataKey]*url.URL
}
// api.ObjectMeta is not hashable, so we make a hashable copy
// metav1.ObjectMeta is not hashable, so we make a hashable copy
// of the subset of its fields that are identifiable.
metadataKey struct {
Name string
@@ -46,7 +46,7 @@ func makeFunctionServiceMap(expiry time.Duration) *functionServiceMap {
}
}
func keyFromMetadata(m *api.ObjectMeta) *metadataKey {
func keyFromMetadata(m *metav1.ObjectMeta) *metadataKey {
return &metadataKey{
Name: m.Name,
Namespace: m.Namespace,
@@ -54,7 +54,7 @@ func keyFromMetadata(m *api.ObjectMeta) *metadataKey {
}
}
func (fmap *functionServiceMap) lookup(f *api.ObjectMeta) (*url.URL, error) {
func (fmap *functionServiceMap) lookup(f *metav1.ObjectMeta) (*url.URL, error) {
mk := keyFromMetadata(f)
item, err := fmap.cache.Get(*mk)
if err != nil {
@@ -64,7 +64,7 @@ func (fmap *functionServiceMap) lookup(f *api.ObjectMeta) (*url.URL, error) {
return u, nil
}
func (fmap *functionServiceMap) assign(f *api.ObjectMeta, serviceUrl *url.URL) {
func (fmap *functionServiceMap) assign(f *metav1.ObjectMeta, serviceUrl *url.URL) {
mk := keyFromMetadata(f)
err, old := fmap.cache.Set(*mk, serviceUrl)
if err != nil {