diff --git a/buildermgr/api.go b/buildermgr/api.go index c6e88d75..c5798634 100644 --- a/buildermgr/api.go +++ b/buildermgr/api.go @@ -26,8 +26,8 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -35,7 +35,7 @@ import ( type ( BuildRequest struct { - Package api.ObjectMeta `json:"package"` + Package metav1.ObjectMeta `json:"package"` } BuilderMgr struct { diff --git a/buildermgr/common.go b/buildermgr/common.go index 8094b607..a70904bf 100644 --- a/buildermgr/common.go +++ b/buildermgr/common.go @@ -21,8 +21,8 @@ import ( "log" "strings" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" "github.com/dchest/uniuri" "github.com/fission/fission" @@ -72,7 +72,7 @@ func buildPackage(fissionClient *tpr.FissionClient, kubernetesClient *kubernetes return e, fission.MakeError(500, e) } - env, err := fissionClient.Environments(api.NamespaceDefault).Get(pkg.Spec.Environment.Name) + env, err := fissionClient.Environments(metav1.NamespaceDefault).Get(pkg.Spec.Environment.Name) if err != nil { e := fmt.Sprintf("Error getting environment TPR info: %v", err) log.Println(e) @@ -144,7 +144,7 @@ func buildPackage(fissionClient *tpr.FissionClient, kubernetesClient *kubernetes } fnList, err := fissionClient. - Functions(api.NamespaceDefault).List(api.ListOptions{}) + Functions(metav1.NamespaceDefault).List(metav1.ListOptions{}) if err != nil { e := fmt.Sprintf("Error getting function list: %v", err) log.Println(e) @@ -200,7 +200,7 @@ func updatePackage(fissionClient *tpr.FissionClient, } // update package spec - pkg, err := fissionClient.Packages(api.NamespaceDefault).Update(pkg) + pkg, err := fissionClient.Packages(metav1.NamespaceDefault).Update(pkg) if err != nil { log.Printf("Error updating package: %v", err) return "", err diff --git a/buildermgr/envwatcher.go b/buildermgr/envwatcher.go index 016e8ecc..6c84579d 100644 --- a/buildermgr/envwatcher.go +++ b/buildermgr/envwatcher.go @@ -22,13 +22,13 @@ import ( "os" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/v1" - "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" - "k8s.io/client-go/1.5/pkg/labels" - "k8s.io/client-go/1.5/pkg/util/intstr" - "k8s.io/client-go/1.5/pkg/watch" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes" + apiv1 "k8s.io/client-go/pkg/api/v1" + "k8s.io/client-go/pkg/apis/extensions/v1beta1" "github.com/fission/fission/tpr" ) @@ -45,9 +45,9 @@ const ( type ( builderInfo struct { - envMetadata *api.ObjectMeta + envMetadata *metav1.ObjectMeta deployment *v1beta1.Deployment - service *v1.Service + service *apiv1.Service } envwRequest struct { @@ -69,7 +69,7 @@ type ( fissionClient *tpr.FissionClient kubernetesClient *kubernetes.Clientset fetcherImage string - fetcherImagePullPolicy v1.PullPolicy + fetcherImagePullPolicy apiv1.PullPolicy } ) @@ -86,14 +86,14 @@ func makeEnvironmentWatcher(fissionClient *tpr.FissionClient, fetcherImagePullPolicy = "IfNotPresent" } - var pullPolicy v1.PullPolicy + var pullPolicy apiv1.PullPolicy switch fetcherImagePullPolicy { case "Always": - pullPolicy = v1.PullAlways + pullPolicy = apiv1.PullAlways case "Never": - pullPolicy = v1.PullNever + pullPolicy = apiv1.PullNever default: - pullPolicy = v1.PullIfNotPresent + pullPolicy = apiv1.PullIfNotPresent } envWatcher := &environmentWatcher{ @@ -125,7 +125,7 @@ func (envw *environmentWatcher) getLabels(envName string, envResourceVersion str func (envw *environmentWatcher) watchEnvironments() { rv := "" for { - wi, err := envw.fissionClient.Environments(api.NamespaceAll).Watch(api.ListOptions{ + wi, err := envw.fissionClient.Environments(metav1.NamespaceAll).Watch(metav1.ListOptions{ ResourceVersion: rv, }) if err != nil { @@ -152,7 +152,7 @@ func (envw *environmentWatcher) watchEnvironments() { } func (envw *environmentWatcher) sync() { - envList, err := envw.fissionClient.Environments(api.NamespaceAll).List(api.ListOptions{}) + envList, err := envw.fissionClient.Environments(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Error syncing environment TPR resources: %v", err) } @@ -260,7 +260,7 @@ func (envw *environmentWatcher) cleanupEnvBuilders(envs []tpr.Environment) { } func (envw *environmentWatcher) createBuilder(env *tpr.Environment) (*builderInfo, error) { - var svc *v1.Service + var svc *apiv1.Service var deploy *v1beta1.Deployment sel := envw.getLabels(env.Metadata.Name, env.Metadata.ResourceVersion) @@ -305,7 +305,7 @@ func (envw *environmentWatcher) deleteBuilderService(sel map[string]string) erro // cascading deletion // https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/ falseVal := false - delOpt := &api.DeleteOptions{ + delOpt := &metav1.DeleteOptions{ OrphanDependents: &falseVal, } @@ -328,11 +328,11 @@ func (envw *environmentWatcher) deleteBuilderDeployment(sel map[string]string) e log.Printf("Removing builder deployment: %v", deploy.ObjectMeta.Name) falseVal := false - delOpt := &api.DeleteOptions{ + delOpt := &metav1.DeleteOptions{ OrphanDependents: &falseVal, } - err = envw.kubernetesClient. + err = envw.kubernetesClient.ExtensionsV1beta1(). Deployments(envw.builderNamespace). Delete(deploy.ObjectMeta.Name, delOpt) if err != nil { @@ -342,10 +342,10 @@ func (envw *environmentWatcher) deleteBuilderDeployment(sel map[string]string) e return nil } -func (envw *environmentWatcher) getBuilderServiceList(sel map[string]string) ([]v1.Service, error) { +func (envw *environmentWatcher) getBuilderServiceList(sel map[string]string) ([]apiv1.Service, error) { svcList, err := envw.kubernetesClient.Services(envw.builderNamespace).List( - api.ListOptions{ - LabelSelector: labels.Set(sel).AsSelector(), + metav1.ListOptions{ + LabelSelector: labels.Set(sel).AsSelector().String(), }) if err != nil { return nil, fmt.Errorf("Error getting builder service list: %v", err) @@ -353,22 +353,22 @@ func (envw *environmentWatcher) getBuilderServiceList(sel map[string]string) ([] return svcList.Items, nil } -func (envw *environmentWatcher) createBuilderService(env *tpr.Environment) (*v1.Service, error) { +func (envw *environmentWatcher) createBuilderService(env *tpr.Environment) (*apiv1.Service, error) { name := envw.getCacheKey(env.Metadata.Name, env.Metadata.ResourceVersion) sel := envw.getLabels(env.Metadata.Name, env.Metadata.ResourceVersion) - service := v1.Service{ - ObjectMeta: v1.ObjectMeta{ + service := apiv1.Service{ + ObjectMeta: metav1.ObjectMeta{ Namespace: envw.builderNamespace, Name: name, Labels: sel, }, - Spec: v1.ServiceSpec{ + Spec: apiv1.ServiceSpec{ Selector: sel, - Type: v1.ServiceTypeClusterIP, - Ports: []v1.ServicePort{ + Type: apiv1.ServiceTypeClusterIP, + Ports: []apiv1.ServicePort{ { Name: "fetcher-port", - Protocol: v1.ProtocolTCP, + Protocol: apiv1.ProtocolTCP, Port: 8000, TargetPort: intstr.IntOrString{ Type: intstr.Int, @@ -377,7 +377,7 @@ func (envw *environmentWatcher) createBuilderService(env *tpr.Environment) (*v1. }, { Name: "builder-port", - Protocol: v1.ProtocolTCP, + Protocol: apiv1.ProtocolTCP, Port: 8001, TargetPort: intstr.IntOrString{ Type: intstr.Int, @@ -396,9 +396,9 @@ func (envw *environmentWatcher) createBuilderService(env *tpr.Environment) (*v1. } func (envw *environmentWatcher) getBuilderDeploymentList(sel map[string]string) ([]v1beta1.Deployment, error) { - deployList, err := envw.kubernetesClient.Deployments(envw.builderNamespace).List( - api.ListOptions{ - LabelSelector: labels.Set(sel).AsSelector(), + deployList, err := envw.kubernetesClient.ExtensionsV1beta1().Deployments(envw.builderNamespace).List( + metav1.ListOptions{ + LabelSelector: labels.Set(sel).AsSelector().String(), }) if err != nil { return nil, fmt.Errorf("Error getting builder deployment list: %v", err) @@ -412,36 +412,36 @@ func (envw *environmentWatcher) createBuilderDeployment(env *tpr.Environment) (* sel := envw.getLabels(env.Metadata.Name, env.Metadata.ResourceVersion) var replicas int32 = 1 deployment := &v1beta1.Deployment{ - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Namespace: envw.builderNamespace, Name: name, Labels: sel, }, Spec: v1beta1.DeploymentSpec{ Replicas: &replicas, - Selector: &v1beta1.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: sel, }, - Template: v1.PodTemplateSpec{ - ObjectMeta: v1.ObjectMeta{ + Template: apiv1.PodTemplateSpec{ + ObjectMeta: metav1.ObjectMeta{ Labels: sel, }, - Spec: v1.PodSpec{ - Volumes: []v1.Volume{ + Spec: apiv1.PodSpec{ + Volumes: []apiv1.Volume{ { Name: "package", - VolumeSource: v1.VolumeSource{ - EmptyDir: &v1.EmptyDirVolumeSource{}, + VolumeSource: apiv1.VolumeSource{ + EmptyDir: &apiv1.EmptyDirVolumeSource{}, }, }, }, - Containers: []v1.Container{ + Containers: []apiv1.Container{ { Name: "builder", Image: env.Spec.Builder.Image, - ImagePullPolicy: v1.PullAlways, + ImagePullPolicy: apiv1.PullAlways, TerminationMessagePath: "/dev/termination-log", - VolumeMounts: []v1.VolumeMount{ + VolumeMounts: []apiv1.VolumeMount{ { Name: "package", MountPath: sharedMountPath, @@ -454,7 +454,7 @@ func (envw *environmentWatcher) createBuilderDeployment(env *tpr.Environment) (* Image: envw.fetcherImage, ImagePullPolicy: envw.fetcherImagePullPolicy, TerminationMessagePath: "/dev/termination-log", - VolumeMounts: []v1.VolumeMount{ + VolumeMounts: []apiv1.VolumeMount{ { Name: "package", MountPath: sharedMountPath, @@ -469,7 +469,7 @@ func (envw *environmentWatcher) createBuilderDeployment(env *tpr.Environment) (* }, } log.Printf("Creating builder deployment: %v", envw.getCacheKey(env.Metadata.Name, env.Metadata.ResourceVersion)) - _, err := envw.kubernetesClient.Deployments(envw.builderNamespace).Create(deployment) + _, err := envw.kubernetesClient.ExtensionsV1beta1().Deployments(envw.builderNamespace).Create(deployment) if err != nil { return nil, err } diff --git a/buildermgr/pkgwatcher.go b/buildermgr/pkgwatcher.go index a4819e6b..e2a5fbd5 100644 --- a/buildermgr/pkgwatcher.go +++ b/buildermgr/pkgwatcher.go @@ -20,9 +20,9 @@ import ( "log" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -48,7 +48,7 @@ func makePackageWatcher(fissionClient *tpr.FissionClient, return pkgw } -func (pkgw *packageWatcher) build(pkgMetadata api.ObjectMeta) { +func (pkgw *packageWatcher) build(pkgMetadata metav1.ObjectMeta) { buildReq := BuildRequest{ Package: pkgMetadata, } @@ -62,7 +62,7 @@ func (pkgw *packageWatcher) build(pkgMetadata api.ObjectMeta) { func (pkgw *packageWatcher) watchPackages() { rv := "" for { - wi, err := pkgw.fissionClient.Packages(api.NamespaceDefault).Watch(api.ListOptions{ + wi, err := pkgw.fissionClient.Packages(metav1.NamespaceDefault).Watch(metav1.ListOptions{ ResourceVersion: rv, }) if err != nil { diff --git a/controller/api.go b/controller/api.go index cb4fb8c3..cf2e05c7 100644 --- a/controller/api.go +++ b/controller/api.go @@ -26,7 +26,7 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" log "github.com/sirupsen/logrus" - kerrors "k8s.io/client-go/1.5/pkg/api/errors" + kerrors "k8s.io/apimachinery/pkg/api/errors" "github.com/fission/fission" "github.com/fission/fission/fission/logdb" diff --git a/controller/api_test.go b/controller/api_test.go index 4d07cf1e..2658c229 100644 --- a/controller/api_test.go +++ b/controller/api_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/controller/client" @@ -76,9 +76,9 @@ func TestFunctionApi(t *testing.T) { name2 := "bar" testFunc := &tpr.Function{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: name1, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.FunctionSpec{ Environment: fission.EnvironmentReference{ @@ -89,9 +89,9 @@ func TestFunctionApi(t *testing.T) { }, }, } - _, err := g.client.FunctionGet(&api.ObjectMeta{ + _, err := g.client.FunctionGet(&metav1.ObjectMeta{ Name: testFunc.Metadata.Name, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) assertNotFoundFailure(err, "function") @@ -128,17 +128,17 @@ func TestFunctionApi(t *testing.T) { } assert(found, "incorrect response content type") - err = g.client.FunctionDelete(&api.ObjectMeta{Name: name1, Namespace: api.NamespaceDefault}) + err = g.client.FunctionDelete(&metav1.ObjectMeta{Name: name1, Namespace: metav1.NamespaceDefault}) panicIf(err) - err = g.client.FunctionDelete(&api.ObjectMeta{Name: name2, Namespace: api.NamespaceDefault}) + err = g.client.FunctionDelete(&metav1.ObjectMeta{Name: name2, Namespace: metav1.NamespaceDefault}) panicIf(err) } func TestHTTPTriggerApi(t *testing.T) { testTrigger := &tpr.Httptrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "foo", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.HTTPTriggerSpec{ RelativeURL: "/hello", @@ -148,9 +148,9 @@ func TestHTTPTriggerApi(t *testing.T) { }, }, } - _, err := g.client.HTTPTriggerGet(&api.ObjectMeta{ + _, err := g.client.HTTPTriggerGet(&metav1.ObjectMeta{ Name: testTrigger.Metadata.Name, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) assertNotFoundFailure(err, "httptrigger") @@ -185,9 +185,9 @@ func TestHTTPTriggerApi(t *testing.T) { func TestEnvironmentApi(t *testing.T) { testEnv := &tpr.Environment{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "foo", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.EnvironmentSpec{ Runtime: fission.Runtime{ @@ -195,9 +195,9 @@ func TestEnvironmentApi(t *testing.T) { }, }, } - _, err := g.client.EnvironmentGet(&api.ObjectMeta{ + _, err := g.client.EnvironmentGet(&metav1.ObjectMeta{ Name: testEnv.Metadata.Name, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) assertNotFoundFailure(err, "environment") @@ -228,9 +228,9 @@ func TestEnvironmentApi(t *testing.T) { func TestWatchApi(t *testing.T) { testWatch := &tpr.Kuberneteswatchtrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "xxx", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.KubernetesWatchTriggerSpec{ Namespace: "default", @@ -241,9 +241,9 @@ func TestWatchApi(t *testing.T) { }, }, } - _, err := g.client.WatchGet(&api.ObjectMeta{ + _, err := g.client.WatchGet(&metav1.ObjectMeta{ Name: testWatch.Metadata.Name, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) assertNotFoundFailure(err, "watch") @@ -272,9 +272,9 @@ func TestWatchApi(t *testing.T) { func TestTimeTriggerApi(t *testing.T) { testTrigger := &tpr.Timetrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "xxx", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.TimeTriggerSpec{ Cron: "0 30 * * * *", @@ -284,7 +284,7 @@ func TestTimeTriggerApi(t *testing.T) { }, }, } - _, err := g.client.TimeTriggerGet(&api.ObjectMeta{Name: testTrigger.Metadata.Name}) + _, err := g.client.TimeTriggerGet(&metav1.ObjectMeta{Name: testTrigger.Metadata.Name}) assertNotFoundFailure(err, "trigger") m, err := g.client.TimeTriggerCreate(testTrigger) diff --git a/controller/client/environment.go b/controller/client/environment.go index d0d7ec6a..03faa838 100644 --- a/controller/client/environment.go +++ b/controller/client/environment.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) -func (c *Client) EnvironmentCreate(env *tpr.Environment) (*api.ObjectMeta, error) { +func (c *Client) EnvironmentCreate(env *tpr.Environment) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(env) if err != nil { return nil, err @@ -44,7 +44,7 @@ func (c *Client) EnvironmentCreate(env *tpr.Environment) (*api.ObjectMeta, error return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -53,7 +53,7 @@ func (c *Client) EnvironmentCreate(env *tpr.Environment) (*api.ObjectMeta, error return &m, nil } -func (c *Client) EnvironmentGet(m *api.ObjectMeta) (*tpr.Environment, error) { +func (c *Client) EnvironmentGet(m *metav1.ObjectMeta) (*tpr.Environment, error) { relativeUrl := fmt.Sprintf("environments/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -77,7 +77,7 @@ func (c *Client) EnvironmentGet(m *api.ObjectMeta) (*tpr.Environment, error) { return &env, nil } -func (c *Client) EnvironmentUpdate(env *tpr.Environment) (*api.ObjectMeta, error) { +func (c *Client) EnvironmentUpdate(env *tpr.Environment) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(env) if err != nil { return nil, err @@ -95,7 +95,7 @@ func (c *Client) EnvironmentUpdate(env *tpr.Environment) (*api.ObjectMeta, error return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -103,7 +103,7 @@ func (c *Client) EnvironmentUpdate(env *tpr.Environment) (*api.ObjectMeta, error return &m, nil } -func (c *Client) EnvironmentDelete(m *api.ObjectMeta) error { +func (c *Client) EnvironmentDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("environments/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) diff --git a/controller/client/function.go b/controller/client/function.go index 73c14bec..bebf8fd3 100644 --- a/controller/client/function.go +++ b/controller/client/function.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) -func (c *Client) FunctionCreate(f *tpr.Function) (*api.ObjectMeta, error) { +func (c *Client) FunctionCreate(f *tpr.Function) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(f) if err != nil { @@ -45,7 +45,7 @@ func (c *Client) FunctionCreate(f *tpr.Function) (*api.ObjectMeta, error) { return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -54,7 +54,7 @@ func (c *Client) FunctionCreate(f *tpr.Function) (*api.ObjectMeta, error) { return &m, nil } -func (c *Client) FunctionGet(m *api.ObjectMeta) (*tpr.Function, error) { +func (c *Client) FunctionGet(m *metav1.ObjectMeta) (*tpr.Function, error) { relativeUrl := fmt.Sprintf("functions/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -78,7 +78,7 @@ func (c *Client) FunctionGet(m *api.ObjectMeta) (*tpr.Function, error) { return &f, nil } -func (c *Client) FunctionGetRawDeployment(m *api.ObjectMeta) ([]byte, error) { +func (c *Client) FunctionGetRawDeployment(m *metav1.ObjectMeta) ([]byte, error) { relativeUrl := fmt.Sprintf("functions/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) relativeUrl += fmt.Sprintf("&deploymentraw=1") @@ -92,7 +92,7 @@ func (c *Client) FunctionGetRawDeployment(m *api.ObjectMeta) ([]byte, error) { return c.handleResponse(resp) } -func (c *Client) FunctionUpdate(f *tpr.Function) (*api.ObjectMeta, error) { +func (c *Client) FunctionUpdate(f *tpr.Function) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(f) if err != nil { return nil, err @@ -110,7 +110,7 @@ func (c *Client) FunctionUpdate(f *tpr.Function) (*api.ObjectMeta, error) { return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -118,7 +118,7 @@ func (c *Client) FunctionUpdate(f *tpr.Function) (*api.ObjectMeta, error) { return &m, nil } -func (c *Client) FunctionDelete(m *api.ObjectMeta) error { +func (c *Client) FunctionDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("functions/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) return c.delete(relativeUrl) diff --git a/controller/client/httptrigger.go b/controller/client/httptrigger.go index a12e802a..789fa9e2 100644 --- a/controller/client/httptrigger.go +++ b/controller/client/httptrigger.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) -func (c *Client) HTTPTriggerCreate(t *tpr.Httptrigger) (*api.ObjectMeta, error) { +func (c *Client) HTTPTriggerCreate(t *tpr.Httptrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(t) if err != nil { return nil, err @@ -44,7 +44,7 @@ func (c *Client) HTTPTriggerCreate(t *tpr.Httptrigger) (*api.ObjectMeta, error) return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -53,7 +53,7 @@ func (c *Client) HTTPTriggerCreate(t *tpr.Httptrigger) (*api.ObjectMeta, error) return &m, nil } -func (c *Client) HTTPTriggerGet(m *api.ObjectMeta) (*tpr.Httptrigger, error) { +func (c *Client) HTTPTriggerGet(m *metav1.ObjectMeta) (*tpr.Httptrigger, error) { relativeUrl := fmt.Sprintf("triggers/http/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -77,7 +77,7 @@ func (c *Client) HTTPTriggerGet(m *api.ObjectMeta) (*tpr.Httptrigger, error) { return &t, nil } -func (c *Client) HTTPTriggerUpdate(t *tpr.Httptrigger) (*api.ObjectMeta, error) { +func (c *Client) HTTPTriggerUpdate(t *tpr.Httptrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(t) if err != nil { return nil, err @@ -95,7 +95,7 @@ func (c *Client) HTTPTriggerUpdate(t *tpr.Httptrigger) (*api.ObjectMeta, error) return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -103,7 +103,7 @@ func (c *Client) HTTPTriggerUpdate(t *tpr.Httptrigger) (*api.ObjectMeta, error) return &m, nil } -func (c *Client) HTTPTriggerDelete(m *api.ObjectMeta) error { +func (c *Client) HTTPTriggerDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("triggers/http/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) return c.delete(relativeUrl) diff --git a/controller/client/kuberneteswatchtrigger.go b/controller/client/kuberneteswatchtrigger.go index 7daf1aa6..fb5594a1 100644 --- a/controller/client/kuberneteswatchtrigger.go +++ b/controller/client/kuberneteswatchtrigger.go @@ -22,13 +22,13 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) -func (c *Client) WatchCreate(w *tpr.Kuberneteswatchtrigger) (*api.ObjectMeta, error) { +func (c *Client) WatchCreate(w *tpr.Kuberneteswatchtrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(w) if err != nil { return nil, err @@ -45,7 +45,7 @@ func (c *Client) WatchCreate(w *tpr.Kuberneteswatchtrigger) (*api.ObjectMeta, er return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -54,7 +54,7 @@ func (c *Client) WatchCreate(w *tpr.Kuberneteswatchtrigger) (*api.ObjectMeta, er return &m, nil } -func (c *Client) WatchGet(m *api.ObjectMeta) (*tpr.Kuberneteswatchtrigger, error) { +func (c *Client) WatchGet(m *metav1.ObjectMeta) (*tpr.Kuberneteswatchtrigger, error) { relativeUrl := fmt.Sprintf("watches/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -78,12 +78,12 @@ func (c *Client) WatchGet(m *api.ObjectMeta) (*tpr.Kuberneteswatchtrigger, error return &w, nil } -func (c *Client) WatchUpdate(w *tpr.Kuberneteswatchtrigger) (*api.ObjectMeta, error) { +func (c *Client) WatchUpdate(w *tpr.Kuberneteswatchtrigger) (*metav1.ObjectMeta, error) { return nil, fission.MakeError(fission.ErrorNotImplmented, "watch update not implemented") } -func (c *Client) WatchDelete(m *api.ObjectMeta) error { +func (c *Client) WatchDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("watches/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) return c.delete(relativeUrl) diff --git a/controller/client/mqtrigger.go b/controller/client/mqtrigger.go index 59c16ead..cba162b2 100644 --- a/controller/client/mqtrigger.go +++ b/controller/client/mqtrigger.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) -func (c *Client) MessageQueueTriggerCreate(t *tpr.Messagequeuetrigger) (*api.ObjectMeta, error) { +func (c *Client) MessageQueueTriggerCreate(t *tpr.Messagequeuetrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(t) if err != nil { return nil, err @@ -44,7 +44,7 @@ func (c *Client) MessageQueueTriggerCreate(t *tpr.Messagequeuetrigger) (*api.Obj return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -53,7 +53,7 @@ func (c *Client) MessageQueueTriggerCreate(t *tpr.Messagequeuetrigger) (*api.Obj return &m, nil } -func (c *Client) MessageQueueTriggerGet(m *api.ObjectMeta) (*tpr.Messagequeuetrigger, error) { +func (c *Client) MessageQueueTriggerGet(m *metav1.ObjectMeta) (*tpr.Messagequeuetrigger, error) { relativeUrl := fmt.Sprintf("triggers/messagequeue/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -77,7 +77,7 @@ func (c *Client) MessageQueueTriggerGet(m *api.ObjectMeta) (*tpr.Messagequeuetri return &t, nil } -func (c *Client) MessageQueueTriggerUpdate(mqTrigger *tpr.Messagequeuetrigger) (*api.ObjectMeta, error) { +func (c *Client) MessageQueueTriggerUpdate(mqTrigger *tpr.Messagequeuetrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(mqTrigger) if err != nil { return nil, err @@ -95,7 +95,7 @@ func (c *Client) MessageQueueTriggerUpdate(mqTrigger *tpr.Messagequeuetrigger) ( return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -103,7 +103,7 @@ func (c *Client) MessageQueueTriggerUpdate(mqTrigger *tpr.Messagequeuetrigger) ( return &m, nil } -func (c *Client) MessageQueueTriggerDelete(m *api.ObjectMeta) error { +func (c *Client) MessageQueueTriggerDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("triggers/messagequeue/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) return c.delete(relativeUrl) diff --git a/controller/client/package.go b/controller/client/package.go index 1c25ef18..ab43fbcd 100644 --- a/controller/client/package.go +++ b/controller/client/package.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) -func (c *Client) PackageCreate(f *tpr.Package) (*api.ObjectMeta, error) { +func (c *Client) PackageCreate(f *tpr.Package) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(f) if err != nil { @@ -45,7 +45,7 @@ func (c *Client) PackageCreate(f *tpr.Package) (*api.ObjectMeta, error) { return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -54,7 +54,7 @@ func (c *Client) PackageCreate(f *tpr.Package) (*api.ObjectMeta, error) { return &m, nil } -func (c *Client) PackageGet(m *api.ObjectMeta) (*tpr.Package, error) { +func (c *Client) PackageGet(m *metav1.ObjectMeta) (*tpr.Package, error) { relativeUrl := fmt.Sprintf("packages/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -78,7 +78,7 @@ func (c *Client) PackageGet(m *api.ObjectMeta) (*tpr.Package, error) { return &f, nil } -func (c *Client) PackageUpdate(f *tpr.Package) (*api.ObjectMeta, error) { +func (c *Client) PackageUpdate(f *tpr.Package) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(f) if err != nil { return nil, err @@ -96,7 +96,7 @@ func (c *Client) PackageUpdate(f *tpr.Package) (*api.ObjectMeta, error) { return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -104,7 +104,7 @@ func (c *Client) PackageUpdate(f *tpr.Package) (*api.ObjectMeta, error) { return &m, nil } -func (c *Client) PackageDelete(m *api.ObjectMeta) error { +func (c *Client) PackageDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("packages/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) return c.delete(relativeUrl) diff --git a/controller/client/timetrigger.go b/controller/client/timetrigger.go index cd3a1493..37a721a0 100644 --- a/controller/client/timetrigger.go +++ b/controller/client/timetrigger.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) -func (c *Client) TimeTriggerCreate(t *tpr.Timetrigger) (*api.ObjectMeta, error) { +func (c *Client) TimeTriggerCreate(t *tpr.Timetrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(t) if err != nil { return nil, err @@ -44,7 +44,7 @@ func (c *Client) TimeTriggerCreate(t *tpr.Timetrigger) (*api.ObjectMeta, error) return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -53,7 +53,7 @@ func (c *Client) TimeTriggerCreate(t *tpr.Timetrigger) (*api.ObjectMeta, error) return &m, nil } -func (c *Client) TimeTriggerGet(m *api.ObjectMeta) (*tpr.Timetrigger, error) { +func (c *Client) TimeTriggerGet(m *metav1.ObjectMeta) (*tpr.Timetrigger, error) { relativeUrl := fmt.Sprintf("triggers/time/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) @@ -77,7 +77,7 @@ func (c *Client) TimeTriggerGet(m *api.ObjectMeta) (*tpr.Timetrigger, error) { return &t, nil } -func (c *Client) TimeTriggerUpdate(t *tpr.Timetrigger) (*api.ObjectMeta, error) { +func (c *Client) TimeTriggerUpdate(t *tpr.Timetrigger) (*metav1.ObjectMeta, error) { reqbody, err := json.Marshal(t) if err != nil { return nil, err @@ -95,7 +95,7 @@ func (c *Client) TimeTriggerUpdate(t *tpr.Timetrigger) (*api.ObjectMeta, error) return nil, err } - var m api.ObjectMeta + var m metav1.ObjectMeta err = json.Unmarshal(body, &m) if err != nil { return nil, err @@ -103,7 +103,7 @@ func (c *Client) TimeTriggerUpdate(t *tpr.Timetrigger) (*api.ObjectMeta, error) return &m, nil } -func (c *Client) TimeTriggerDelete(m *api.ObjectMeta) error { +func (c *Client) TimeTriggerDelete(m *metav1.ObjectMeta) error { relativeUrl := fmt.Sprintf("triggers/time/%v", m.Name) relativeUrl += fmt.Sprintf("?namespace=%v", m.Namespace) return c.delete(relativeUrl) diff --git a/controller/environmentApi.go b/controller/environmentApi.go index e397a970..7af0a129 100644 --- a/controller/environmentApi.go +++ b/controller/environmentApi.go @@ -23,14 +23,14 @@ import ( "github.com/gorilla/mux" log "github.com/sirupsen/logrus" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) func (a *API) EnvironmentApiList(w http.ResponseWriter, r *http.Request) { - envs, err := a.fissionClient.Environments(api.NamespaceAll).List(api.ListOptions{}) + envs, err := a.fissionClient.Environments(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -87,7 +87,7 @@ func (a *API) EnvironmentApiGet(w http.ResponseWriter, r *http.Request) { name := vars["environment"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } env, err := a.fissionClient.Environments(ns).Get(name) @@ -148,10 +148,10 @@ func (a *API) EnvironmentApiDelete(w http.ResponseWriter, r *http.Request) { name := vars["environment"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Environments(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Environments(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/controller/functionApi.go b/controller/functionApi.go index eaf86428..b75c959a 100644 --- a/controller/functionApi.go +++ b/controller/functionApi.go @@ -25,14 +25,14 @@ import ( "github.com/gorilla/mux" log "github.com/sirupsen/logrus" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) func (a *API) FunctionApiList(w http.ResponseWriter, r *http.Request) { - funcs, err := a.fissionClient.Functions(api.NamespaceAll).List(api.ListOptions{}) + funcs, err := a.fissionClient.Functions(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -88,7 +88,7 @@ func (a *API) FunctionApiGet(w http.ResponseWriter, r *http.Request) { name := vars["function"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } f, err := a.fissionClient.Functions(ns).Get(name) @@ -147,10 +147,10 @@ func (a *API) FunctionApiDelete(w http.ResponseWriter, r *http.Request) { name := vars["function"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Functions(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Functions(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/controller/httpTriggerApi.go b/controller/httpTriggerApi.go index 827e4b99..58fc5972 100644 --- a/controller/httpTriggerApi.go +++ b/controller/httpTriggerApi.go @@ -23,14 +23,14 @@ import ( "net/http" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) func (a *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) { - triggers, err := a.fissionClient.Httptriggers(api.NamespaceAll).List(api.ListOptions{}) + triggers, err := a.fissionClient.Httptriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -46,7 +46,7 @@ func (a *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) { } func (a *API) checkHttpTriggerDuplicates(t *tpr.Httptrigger) error { - triggers, err := a.fissionClient.Httptriggers(api.NamespaceAll).List(api.ListOptions{}) + triggers, err := a.fissionClient.Httptriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { return err } @@ -108,7 +108,7 @@ func (a *API) HTTPTriggerApiGet(w http.ResponseWriter, r *http.Request) { name := vars["httpTrigger"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } t, err := a.fissionClient.Httptriggers(ns).Get(name) @@ -174,10 +174,10 @@ func (a *API) HTTPTriggerApiDelete(w http.ResponseWriter, r *http.Request) { name := vars["httpTrigger"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Httptriggers(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Httptriggers(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/controller/mqTriggerApi.go b/controller/mqTriggerApi.go index 2d9735b6..eaedd764 100644 --- a/controller/mqTriggerApi.go +++ b/controller/mqTriggerApi.go @@ -22,7 +22,7 @@ import ( "net/http" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -30,7 +30,7 @@ import ( func (a *API) MessageQueueTriggerApiList(w http.ResponseWriter, r *http.Request) { //mqType := r.FormValue("mqtype") // ignored for now - triggers, err := a.fissionClient.Messagequeuetriggers(api.NamespaceAll).List(api.ListOptions{}) + triggers, err := a.fissionClient.Messagequeuetriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -83,7 +83,7 @@ func (a *API) MessageQueueTriggerApiGet(w http.ResponseWriter, r *http.Request) name := vars["mqTrigger"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } mqTrigger, err := a.fissionClient.Messagequeuetriggers(ns).Get(name) @@ -141,10 +141,10 @@ func (a *API) MessageQueueTriggerApiDelete(w http.ResponseWriter, r *http.Reques name := vars["mqTrigger"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Messagequeuetriggers(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Messagequeuetriggers(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/controller/packageApi.go b/controller/packageApi.go index dcb993df..cbd7b3e9 100644 --- a/controller/packageApi.go +++ b/controller/packageApi.go @@ -22,14 +22,14 @@ import ( "net/http" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) func (a *API) PackageApiList(w http.ResponseWriter, r *http.Request) { - funcs, err := a.fissionClient.Packages(api.NamespaceAll).List(api.ListOptions{}) + funcs, err := a.fissionClient.Packages(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -97,7 +97,7 @@ func (a *API) PackageApiGet(w http.ResponseWriter, r *http.Request) { name := vars["package"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } raw := r.FormValue("raw") // just the deployment pkg @@ -162,10 +162,10 @@ func (a *API) PackageApiDelete(w http.ResponseWriter, r *http.Request) { name := vars["package"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Packages(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Packages(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/controller/timeTriggerApi.go b/controller/timeTriggerApi.go index 86ffa595..fd70dd4e 100644 --- a/controller/timeTriggerApi.go +++ b/controller/timeTriggerApi.go @@ -23,14 +23,14 @@ import ( "github.com/gorilla/mux" "github.com/robfig/cron" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) func (a *API) TimeTriggerApiList(w http.ResponseWriter, r *http.Request) { - triggers, err := a.fissionClient.Timetriggers(api.NamespaceAll).List(api.ListOptions{}) + triggers, err := a.fissionClient.Timetriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -94,7 +94,7 @@ func (a *API) TimeTriggerApiGet(w http.ResponseWriter, r *http.Request) { name := vars["timeTrigger"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } t, err := a.fissionClient.Timetriggers(ns).Get(name) @@ -161,10 +161,10 @@ func (a *API) TimeTriggerApiDelete(w http.ResponseWriter, r *http.Request) { name := vars["timeTrigger"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Timetriggers(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Timetriggers(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/controller/watchApi.go b/controller/watchApi.go index 8ef781bf..8db50068 100644 --- a/controller/watchApi.go +++ b/controller/watchApi.go @@ -22,14 +22,14 @@ import ( "net/http" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" ) func (a *API) WatchApiList(w http.ResponseWriter, r *http.Request) { - watches, err := a.fissionClient.Kuberneteswatchtriggers(api.NamespaceAll).List(api.ListOptions{}) + watches, err := a.fissionClient.Kuberneteswatchtriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -87,7 +87,7 @@ func (a *API) WatchApiGet(w http.ResponseWriter, r *http.Request) { name := vars["watch"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } watch, err := a.fissionClient.Kuberneteswatchtriggers(ns).Get(name) @@ -115,10 +115,10 @@ func (a *API) WatchApiDelete(w http.ResponseWriter, r *http.Request) { name := vars["watch"] ns := vars["namespace"] if len(ns) == 0 { - ns = api.NamespaceDefault + ns = metav1.NamespaceDefault } - err := a.fissionClient.Kuberneteswatchtriggers(ns).Delete(name, &api.DeleteOptions{}) + err := a.fissionClient.Kuberneteswatchtriggers(ns).Delete(name, &metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/environments/fetcher/fetcher.go b/environments/fetcher/fetcher.go index 8a9558a5..a3a56a60 100644 --- a/environments/fetcher/fetcher.go +++ b/environments/fetcher/fetcher.go @@ -16,8 +16,8 @@ import ( "github.com/mholt/archiver" "github.com/satori/go.uuid" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" "github.com/fission/fission" storageSvcClient "github.com/fission/fission/storagesvc/client" @@ -28,11 +28,11 @@ type ( FetchRequestType int FetchRequest struct { - FetchType FetchRequestType `json:"fetchType"` - Package api.ObjectMeta `json:"package"` - Url string `json:"url"` - StorageSvcUrl string `json:"storagesvcurl"` - Filename string `json:"filename"` + FetchType FetchRequestType `json:"fetchType"` + Package metav1.ObjectMeta `json:"package"` + Url string `json:"url"` + StorageSvcUrl string `json:"storagesvcurl"` + Filename string `json:"filename"` } // UploadRequest send from builder manager describes which diff --git a/fission/environment.go b/fission/environment.go index 14ee3424..aa02315f 100644 --- a/fission/environment.go +++ b/fission/environment.go @@ -22,7 +22,7 @@ import ( "text/tabwriter" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -60,9 +60,9 @@ func envCreate(c *cli.Context) error { } env := &tpr.Environment{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: envName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.EnvironmentSpec{ Version: envVersion, @@ -91,9 +91,9 @@ func envGet(c *cli.Context) error { fatal("Need a name, use --name.") } - m := &api.ObjectMeta{ + m := &metav1.ObjectMeta{ Name: envName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } env, err := client.EnvironmentGet(m) checkErr(err, "get environment") @@ -121,9 +121,9 @@ func envUpdate(c *cli.Context) error { fatal("Need --image to specify env image, or use --builder to specify env builder, or use --buildcmd to specify new build command.") } - env, err := client.EnvironmentGet(&api.ObjectMeta{ + env, err := client.EnvironmentGet(&metav1.ObjectMeta{ Name: envName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "find environment") @@ -157,9 +157,9 @@ func envDelete(c *cli.Context) error { fatal("Need a name , use --name.") } - m := &api.ObjectMeta{ + m := &metav1.ObjectMeta{ Name: envName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } err := client.EnvironmentDelete(m) checkErr(err, "delete environment") diff --git a/fission/function.go b/fission/function.go index 893e0708..7fff60b5 100644 --- a/fission/function.go +++ b/fission/function.go @@ -30,7 +30,7 @@ import ( "github.com/satori/go.uuid" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/controller/client" @@ -84,10 +84,10 @@ func createArchive(client *client.Client, fileName string) *fission.Archive { return &archive } -func createPackage(client *client.Client, envName, srcArchiveName, deployArchiveName, buildcmd string) *api.ObjectMeta { +func createPackage(client *client.Client, envName, srcArchiveName, deployArchiveName, buildcmd string) *metav1.ObjectMeta { pkgSpec := fission.PackageSpec{ Environment: fission.EnvironmentReference{ - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, Name: envName, }, } @@ -111,9 +111,9 @@ func createPackage(client *client.Client, envName, srcArchiveName, deployArchive pkgName := strings.ToLower(uuid.NewV4().String()) pkg := &tpr.Package{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: pkgName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: pkgSpec, Status: fission.PackageStatus{ @@ -170,14 +170,14 @@ func fnCreate(c *cli.Context) error { pkgMetadata := createPackage(client, envName, srcArchiveName, deployArchiveName, buildcmd) function := &tpr.Function{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: fnName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.FunctionSpec{ Environment: fission.EnvironmentReference{ Name: envName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Package: fission.FunctionPackageRef{ FunctionName: entrypoint, @@ -206,9 +206,9 @@ func fnCreate(c *cli.Context) error { } triggerName := uuid.NewV4().String() ht := &tpr.Httptrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: triggerName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.HTTPTriggerSpec{ RelativeURL: triggerUrl, @@ -233,14 +233,14 @@ func fnGet(c *cli.Context) error { if len(fnName) == 0 { fatal("Need name of function, use --name") } - m := &api.ObjectMeta{ + m := &metav1.ObjectMeta{ Name: fnName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } fn, err := client.FunctionGet(m) checkErr(err, "get function") - pkg, err := client.PackageGet(&api.ObjectMeta{ + pkg, err := client.PackageGet(&metav1.ObjectMeta{ Name: fn.Spec.Package.PackageRef.Name, Namespace: fn.Spec.Package.PackageRef.Namespace, }) @@ -258,9 +258,9 @@ func fnGetMeta(c *cli.Context) error { fatal("Need name of function, use --name") } - m := &api.ObjectMeta{ + m := &metav1.ObjectMeta{ Name: fnName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } f, err := client.FunctionGet(m) @@ -286,9 +286,9 @@ func fnUpdate(c *cli.Context) error { fatal("--package is deprecated, please use --deploy instead.") } - function, err := client.FunctionGet(&api.ObjectMeta{ + function, err := client.FunctionGet(&metav1.ObjectMeta{ Name: fnName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, fmt.Sprintf("read function '%v'", fnName)) @@ -312,7 +312,7 @@ func fnUpdate(c *cli.Context) error { function.Spec.Package.FunctionName = entrypoint } - pkg, err := client.PackageGet(&api.ObjectMeta{ + pkg, err := client.PackageGet(&metav1.ObjectMeta{ Name: function.Spec.Package.PackageRef.Name, Namespace: function.Spec.Package.PackageRef.Namespace, }) @@ -352,9 +352,9 @@ func fnDelete(c *cli.Context) error { fatal("Need name of function, use --name") } - m := &api.ObjectMeta{ + m := &metav1.ObjectMeta{ Name: fnName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } err := client.FunctionDelete(m) @@ -396,9 +396,9 @@ func fnLogs(c *cli.Context) error { } fnPod := c.String("pod") - m := &api.ObjectMeta{ + m := &metav1.ObjectMeta{ Name: fnName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } f, err := client.FunctionGet(m) @@ -469,7 +469,7 @@ func fnPods(c *cli.Context) error { dbType = logdb.INFLUXDB } - m := &api.ObjectMeta{Name: fnName} + m := &metav1.ObjectMeta{Name: fnName} f, err := client.FunctionGet(m) checkErr(err, "get function") diff --git a/fission/httptrigger.go b/fission/httptrigger.go index db0289f8..708654cc 100644 --- a/fission/httptrigger.go +++ b/fission/httptrigger.go @@ -25,7 +25,7 @@ import ( "github.com/satori/go.uuid" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -77,9 +77,9 @@ func htCreate(c *cli.Context) error { triggerName := uuid.NewV4().String() ht := &tpr.Httptrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: triggerName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.HTTPTriggerSpec{ RelativeURL: triggerUrl, @@ -115,9 +115,9 @@ func htUpdate(c *cli.Context) error { fatal("Nothing to update. Use --function to specify a new function.") } - ht, err := client.HTTPTriggerGet(&api.ObjectMeta{ + ht, err := client.HTTPTriggerGet(&metav1.ObjectMeta{ Name: htName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "get HTTP trigger") @@ -139,9 +139,9 @@ func htDelete(c *cli.Context) error { fatal("Need name of trigger to delete, use --name") } - err := client.HTTPTriggerDelete(&api.ObjectMeta{ + err := client.HTTPTriggerDelete(&metav1.ObjectMeta{ Name: htName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "delete trigger") diff --git a/fission/mqtrigger.go b/fission/mqtrigger.go index 88ab38b3..be792805 100644 --- a/fission/mqtrigger.go +++ b/fission/mqtrigger.go @@ -23,7 +23,7 @@ import ( "github.com/satori/go.uuid" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/mqtrigger/messageQueue" @@ -73,9 +73,9 @@ func mqtCreate(c *cli.Context) error { checkMQTopicAvailability(mqType, topic, respTopic) mqt := tpr.Messagequeuetrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: mqtName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.MessageQueueTriggerSpec{ FunctionReference: fission.FunctionReference{ @@ -111,9 +111,9 @@ func mqtUpdate(c *cli.Context) error { fnName := c.String("function") contentType := c.String("contenttype") - mqt, err := client.MessageQueueTriggerGet(&api.ObjectMeta{ + mqt, err := client.MessageQueueTriggerGet(&metav1.ObjectMeta{ Name: mqtName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "get Time trigger") @@ -155,9 +155,9 @@ func mqtDelete(c *cli.Context) error { fatal("Need name of trigger to delete, use --name") } - err := client.MessageQueueTriggerDelete(&api.ObjectMeta{ + err := client.MessageQueueTriggerDelete(&metav1.ObjectMeta{ Name: mqtName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "delete trigger") diff --git a/fission/timetrigger.go b/fission/timetrigger.go index d359d4a9..333c45a1 100644 --- a/fission/timetrigger.go +++ b/fission/timetrigger.go @@ -23,7 +23,7 @@ import ( "github.com/satori/go.uuid" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -46,9 +46,9 @@ func ttCreate(c *cli.Context) error { } tt := &tpr.Timetrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: name, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.TimeTriggerSpec{ Cron: cron, @@ -77,9 +77,9 @@ func ttUpdate(c *cli.Context) error { fatal("Need name of trigger, use --name") } - tt, err := client.TimeTriggerGet(&api.ObjectMeta{ + tt, err := client.TimeTriggerGet(&metav1.ObjectMeta{ Name: ttName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "get time trigger") @@ -113,9 +113,9 @@ func ttDelete(c *cli.Context) error { fatal("Need name of trigger to delete, use --name") } - err := client.TimeTriggerDelete(&api.ObjectMeta{ + err := client.TimeTriggerDelete(&metav1.ObjectMeta{ Name: ttName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "delete trigger") diff --git a/fission/upgrade.go b/fission/upgrade.go index 8e9d1dd1..23f8a7ae 100644 --- a/fission/upgrade.go +++ b/fission/upgrade.go @@ -12,7 +12,7 @@ import ( "github.com/dchest/uniuri" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -235,10 +235,10 @@ func functionRefFromV1Metadata(m *v1.Metadata, nameRemap map[string]string) *fis } } -func tprMetadataFromV1Metadata(m *v1.Metadata, nameRemap map[string]string) *api.ObjectMeta { - return &api.ObjectMeta{ +func tprMetadataFromV1Metadata(m *v1.Metadata, nameRemap map[string]string) *metav1.ObjectMeta { + return &metav1.ObjectMeta{ Name: nameRemap[m.Name], - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, } } @@ -298,14 +298,14 @@ func upgradeRestoreState(c *cli.Context) error { pkgSpec := fission.PackageSpec{ Environment: fission.EnvironmentReference{ Name: v1state.NameChanges[f.Environment.Name], - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Deployment: *archive, } pkg, err := client.PackageCreate(&tpr.Package{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: pkgName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: pkgSpec, }) diff --git a/fission/watch.go b/fission/watch.go index bbe68d29..e1457e00 100644 --- a/fission/watch.go +++ b/fission/watch.go @@ -23,7 +23,7 @@ import ( "github.com/satori/go.uuid" "github.com/urfave/cli" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -62,9 +62,9 @@ func wCreate(c *cli.Context) error { watchName := uuid.NewV4().String() w := &tpr.Kuberneteswatchtrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: watchName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.KubernetesWatchTriggerSpec{ Namespace: namespace, @@ -104,9 +104,9 @@ func wDelete(c *cli.Context) error { fatal("Need name of watch to delete, use --name") } - err := client.WatchDelete(&api.ObjectMeta{ + err := client.WatchDelete(&metav1.ObjectMeta{ Name: wName, - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }) checkErr(err, "delete watch") diff --git a/glide.lock b/glide.lock index 142df1e1..6a7e2b0a 100644 --- a/glide.lock +++ b/glide.lock @@ -1,37 +1,32 @@ -hash: 2703407b4ae6e28cd146b14ff6b77175a17f0f944f7d75131ac0fa0406793d5b -updated: 2017-08-27T22:38:51.57334855+08:00 +hash: b73c8c15207c8906bdc2c2713da03353d7c7ab78649f222b067e805b6f4c03dd +updated: 2017-09-29T00:30:00.245121189+08:00 imports: -- name: github.com/blang/semver - version: 60ec3488bfea7cca02b021d106d9911120d25fe9 +- name: cloud.google.com/go + version: 3b1ae45394a234c385be014e9a488f2bb6eef821 + subpackages: + - compute/metadata + - internal +- name: github.com/Azure/go-autorest + version: 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d + subpackages: + - autorest + - autorest/adal + - autorest/azure + - autorest/date - name: github.com/coreos/etcd version: 952eb4fadeef3f840bd7557544338c985d4ed0ef subpackages: - client - - pkg/pathutil - - pkg/types -- name: github.com/coreos/go-oidc - version: 16c5ecc505f1efa0fe4685826fd9962c4d137e87 - subpackages: - - http - - jose - - key - - oauth2 - - oidc -- name: github.com/coreos/pkg - version: fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8 - subpackages: - - capnslog - - health - - httputil - - timeutil - name: github.com/davecgh/go-spew - version: 346938d642f2ec3594ed81d874461961cd0faa76 + version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d subpackages: - spew - name: github.com/dchest/uniuri version: 8902c56451e9b58ff940bbe5fec35d5f9c04584a +- name: github.com/dgrijalva/jwt-go + version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20 - name: github.com/docker/distribution - version: 6e62b398420f8c0444e34e8a69a350c139f65956 + version: cd27f179f2c10c5d300e6d09025b538c475b0d51 subpackages: - digest - reference @@ -46,62 +41,66 @@ imports: - internal/errors - internal/prefix - name: github.com/emicklei/go-restful - version: 3d66f886316ac990eb502aaa89ea38546420b8b7 + version: ff4f55a206334ef123e4f79bbf348980da81ca46 subpackages: - log - - swagger +- name: github.com/emicklei/go-restful-swagger12 + version: dcef7f55730566d41eae5db10e7d6981829720f6 - name: github.com/ghodss/yaml version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee +- name: github.com/go-openapi/analysis + version: b44dc874b601d9e4e2f6e19140e794ba24bead3b - name: github.com/go-openapi/jsonpointer - version: 8d96a2dc61536b690bd36b2e9df0b3c0b62825b2 + version: 46af16f9f7b149af66e5d1bd010e3574dc06de98 - name: github.com/go-openapi/jsonreference - version: 36d33bfe519efae5632669801b180bf1a245da3b + version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272 +- name: github.com/go-openapi/loads + version: 18441dfa706d924a39a030ee2c3b1d8d81917b38 - name: github.com/go-openapi/spec - version: d1c18b339aece4b16ead6d253b85b6ad7180ea54 + version: 6aced65f8501fe1217321abf0749d354824ba2ff - name: github.com/go-openapi/swag - version: 3b6d86cd965820f968760d5d419cb4add096bdd7 + version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72 - name: github.com/gogo/protobuf - version: 8d70fb3182befc465c4a1eac8ad4d38ff49778e2 + version: c0656edd0d9eab7c66d1eb0c568f9039345796f7 subpackages: + - gogoproto - proto + - protoc-gen-gogo/descriptor - sortkeys - name: github.com/golang/glog - version: 23def4e6c14b4da8ac2ed8007337bc5eb5007998 + version: 44145f04b68cf362d9c4df2182967c2275eaefed - name: github.com/golang/protobuf version: 4bd1920723d7b7c925de087aa32e2187708897f7 subpackages: - - jsonpb - proto - name: github.com/golang/snappy version: 553a641470496b2327abcac10b36396bd98e45c9 - name: github.com/google/gofuzz - version: fd52762d25a41827db7ef64c43756fd4b9f7e382 + version: 44d81051d367757e1c7c6a5a86423ece9afcf63c - name: github.com/gorilla/context version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 - name: github.com/gorilla/handlers - version: 3a5767ca75ece5f7f1440b1d16975247f8d8b221 + version: a4043c62cc2329bacda331d33fc908ab11ef0ec3 - name: github.com/gorilla/mux - version: 392c28fe23e1c45ddba891b0320b3b5df220beea + version: 24fca303ac6da784b9e8269f724ddeb0b2eea5e7 +- name: github.com/graymeta/stow + version: da285caa6daa337ae04a9ac603dbaf9009ffe687 + subpackages: + - local - name: github.com/howeyc/gopass version: bf9dde6d0d2c004a008c27aaee91170c786f6db8 - name: github.com/imdario/mergo - version: e3000cb3d28c72b837601cac94debd91032d19fe + version: 6633656539c1639d9d78127b7d47c622b5d7b6dc - name: github.com/influxdata/influxdb version: b7bb7e8359642b6e071735b50ae41f5eb343fd42 subpackages: - client/v2 - models - pkg/escape -- name: github.com/graymeta/stow - version: da285caa6daa337ae04a9ac603dbaf9009ffe687 - subpackages: - - local -- name: github.com/jonboulle/clockwork - version: 2eee05ed794112d45db504eb05aa693efd2b8b09 - name: github.com/juju/ratelimit - version: 77ed1c8a01217656d2080ad51981f6e99adaa177 + version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 - name: github.com/mailru/easyjson - version: 159cdb893c982e3d1bc6450322fedd514f9c9de3 + version: d5b7844b561a7bc640052f1b935f7b800330d7e0 subpackages: - buffer - jlexer @@ -109,7 +108,7 @@ imports: - name: github.com/mholt/archiver version: fe92d3d85a514d2752ad3b61ec412b598a2754f9 - name: github.com/nats-io/go-nats - version: 6949c8e06a246e4177961aab22940b5c411e48f0 + version: 9147cfac69833916f9c73353ba43f939815c330a subpackages: - encoders/builtin - util @@ -118,15 +117,13 @@ imports: subpackages: - pb - name: github.com/nats-io/nats-streaming-server - version: 7a922646104d066c98527959455993231fadd168 + version: 9ebc07951af540e177f6a5bb0424f716fd867074 subpackages: - util - name: github.com/nats-io/nuid version: 289cccf02c178dc782430d534e3c1f5b72af807f - name: github.com/nwaples/rardecode version: f22b7ef81a0afac9ce1447d37e5ab8e99fbd2f73 -- name: github.com/pborman/uuid - version: 3d4f2ba23642d3cfd06bd4b54cf03d99d95c0f1b - name: github.com/pierrec/lz4 version: 5a3d2245f97fc249850e7802e3c01fad02a1c316 - name: github.com/pierrec/xxHash @@ -142,11 +139,11 @@ imports: - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/sirupsen/logrus - version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f + version: 68cec9f21fbf3ea8d8f98c044bc6ce05f17b267a - name: github.com/spf13/pflag - version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5 + version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 - name: github.com/ugorji/go - version: f1f1a805ed361a0e078bb537e4ea78cd37dcf065 + version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74 subpackages: - codec - name: github.com/ulikunitz/xz @@ -156,34 +153,35 @@ imports: - internal/xlog - lzma - name: github.com/urfave/cli - version: 0bdeddeeb0f650497d603c4ad7b20cfe685682f6 + version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 - name: golang.org/x/crypto - version: 9477e0b78b9ac3d0b03822fd95422e2fe07627cd + version: d172538b2cfce0c13cee31e647d0367aa8cd2486 subpackages: - ssh/terminal - name: golang.org/x/net - version: 6acef71eb69611914f7a30939ea9f6e194c78172 + version: f2499483f923065a842d38eb4c7f1927e6fc6e6d subpackages: - context + - context/ctxhttp - http2 - http2/hpack - idna + - lex/httplex - name: golang.org/x/oauth2 - version: 045497edb6234273d67dbc25da3f2ddbc4c4cacf + version: a6bd8cefa1811bd24b86f8902872e4e8225f74c4 subpackages: - google - internal - jws - jwt - name: golang.org/x/sys - version: b699b7032584f0953262cb2788a0ca19bb494703 + version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 subpackages: - unix - name: golang.org/x/text - version: a263ba8db058568bb9beba166777d9c9dbe75d68 + version: 2910a502d2bf9e43193af9d68ca516529614eed3 subpackages: - cases - - internal - internal/tag - language - runes @@ -205,120 +203,139 @@ imports: - internal/remote_api - internal/urlfetch - urlfetch -- name: google.golang.org/cloud - version: 975617b05ea8a58727e6c1a06b6161ff4185a9f2 - subpackages: - - compute/metadata - - internal - - internal/opts - - storage - name: gopkg.in/inf.v0 version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 -- name: k8s.io/client-go - version: 843f7c4f28b1f647f664f883697107d5c02c5acc +- name: k8s.io/apimachinery + version: 1fd2e63a9a370677308a42f24fd40c86438afddf subpackages: - - 1.5/discovery - - 1.5/kubernetes - - 1.5/kubernetes/typed/apps/v1alpha1 - - 1.5/kubernetes/typed/authentication/v1beta1 - - 1.5/kubernetes/typed/authorization/v1beta1 - - 1.5/kubernetes/typed/autoscaling/v1 - - 1.5/kubernetes/typed/batch/v1 - - 1.5/kubernetes/typed/certificates/v1alpha1 - - 1.5/kubernetes/typed/core/v1 - - 1.5/kubernetes/typed/extensions/v1beta1 - - 1.5/kubernetes/typed/policy/v1alpha1 - - 1.5/kubernetes/typed/rbac/v1alpha1 - - 1.5/kubernetes/typed/storage/v1beta1 - - 1.5/pkg/api - - 1.5/pkg/api/errors - - 1.5/pkg/api/install - - 1.5/pkg/api/meta - - 1.5/pkg/api/meta/metatypes - - 1.5/pkg/api/resource - - 1.5/pkg/api/unversioned - - 1.5/pkg/api/v1 - - 1.5/pkg/api/validation/path - - 1.5/pkg/apimachinery - - 1.5/pkg/apimachinery/announced - - 1.5/pkg/apimachinery/registered - - 1.5/pkg/apis/apps - - 1.5/pkg/apis/apps/install - - 1.5/pkg/apis/apps/v1alpha1 - - 1.5/pkg/apis/authentication - - 1.5/pkg/apis/authentication/install - - 1.5/pkg/apis/authentication/v1beta1 - - 1.5/pkg/apis/authorization - - 1.5/pkg/apis/authorization/install - - 1.5/pkg/apis/authorization/v1beta1 - - 1.5/pkg/apis/autoscaling - - 1.5/pkg/apis/autoscaling/install - - 1.5/pkg/apis/autoscaling/v1 - - 1.5/pkg/apis/batch - - 1.5/pkg/apis/batch/install - - 1.5/pkg/apis/batch/v1 - - 1.5/pkg/apis/batch/v2alpha1 - - 1.5/pkg/apis/certificates - - 1.5/pkg/apis/certificates/install - - 1.5/pkg/apis/certificates/v1alpha1 - - 1.5/pkg/apis/extensions - - 1.5/pkg/apis/extensions/install - - 1.5/pkg/apis/extensions/v1beta1 - - 1.5/pkg/apis/policy - - 1.5/pkg/apis/policy/install - - 1.5/pkg/apis/policy/v1alpha1 - - 1.5/pkg/apis/rbac - - 1.5/pkg/apis/rbac/install - - 1.5/pkg/apis/rbac/v1alpha1 - - 1.5/pkg/apis/storage - - 1.5/pkg/apis/storage/install - - 1.5/pkg/apis/storage/v1beta1 - - 1.5/pkg/auth/user - - 1.5/pkg/conversion - - 1.5/pkg/conversion/queryparams - - 1.5/pkg/fields - - 1.5/pkg/genericapiserver/openapi/common - - 1.5/pkg/labels - - 1.5/pkg/runtime - - 1.5/pkg/runtime/serializer - - 1.5/pkg/runtime/serializer/json - - 1.5/pkg/runtime/serializer/protobuf - - 1.5/pkg/runtime/serializer/recognizer - - 1.5/pkg/runtime/serializer/streaming - - 1.5/pkg/runtime/serializer/versioning - - 1.5/pkg/selection - - 1.5/pkg/third_party/forked/golang/reflect - - 1.5/pkg/types - - 1.5/pkg/util - - 1.5/pkg/util/cert - - 1.5/pkg/util/clock - - 1.5/pkg/util/errors - - 1.5/pkg/util/flowcontrol - - 1.5/pkg/util/framer - - 1.5/pkg/util/integer - - 1.5/pkg/util/intstr - - 1.5/pkg/util/json - - 1.5/pkg/util/labels - - 1.5/pkg/util/net - - 1.5/pkg/util/parsers - - 1.5/pkg/util/rand - - 1.5/pkg/util/runtime - - 1.5/pkg/util/sets - - 1.5/pkg/util/uuid - - 1.5/pkg/util/validation - - 1.5/pkg/util/validation/field - - 1.5/pkg/util/wait - - 1.5/pkg/util/yaml - - 1.5/pkg/version - - 1.5/pkg/watch - - 1.5/pkg/watch/versioned - - 1.5/plugin/pkg/client/auth - - 1.5/plugin/pkg/client/auth/gcp - - 1.5/plugin/pkg/client/auth/oidc - - 1.5/rest - - 1.5/tools/clientcmd/api - - 1.5/tools/metrics - - 1.5/transport + - pkg/api/equality + - pkg/api/errors + - pkg/api/meta + - pkg/api/resource + - pkg/apimachinery + - pkg/apimachinery/announced + - pkg/apimachinery/registered + - pkg/apis/meta/v1 + - pkg/apis/meta/v1/unstructured + - pkg/apis/meta/v1alpha1 + - pkg/conversion + - pkg/conversion/queryparams + - pkg/conversion/unstructured + - pkg/fields + - pkg/labels + - pkg/openapi + - pkg/runtime + - pkg/runtime/schema + - pkg/runtime/serializer + - pkg/runtime/serializer/json + - pkg/runtime/serializer/protobuf + - pkg/runtime/serializer/recognizer + - pkg/runtime/serializer/streaming + - pkg/runtime/serializer/versioning + - pkg/selection + - pkg/types + - pkg/util/clock + - pkg/util/diff + - pkg/util/errors + - pkg/util/framer + - pkg/util/intstr + - pkg/util/json + - pkg/util/net + - pkg/util/rand + - pkg/util/runtime + - pkg/util/sets + - pkg/util/validation + - pkg/util/validation/field + - pkg/util/wait + - pkg/util/yaml + - pkg/version + - pkg/watch + - third_party/forked/golang/reflect +- name: k8s.io/client-go + version: d92e8497f71b7b4e0494e5bd204b48d34bd6f254 + subpackages: + - discovery + - kubernetes + - kubernetes/scheme + - kubernetes/typed/admissionregistration/v1alpha1 + - kubernetes/typed/apps/v1beta1 + - kubernetes/typed/authentication/v1 + - kubernetes/typed/authentication/v1beta1 + - kubernetes/typed/authorization/v1 + - kubernetes/typed/authorization/v1beta1 + - kubernetes/typed/autoscaling/v1 + - kubernetes/typed/autoscaling/v2alpha1 + - kubernetes/typed/batch/v1 + - kubernetes/typed/batch/v2alpha1 + - kubernetes/typed/certificates/v1beta1 + - kubernetes/typed/core/v1 + - kubernetes/typed/extensions/v1beta1 + - kubernetes/typed/networking/v1 + - kubernetes/typed/policy/v1beta1 + - kubernetes/typed/rbac/v1alpha1 + - kubernetes/typed/rbac/v1beta1 + - kubernetes/typed/settings/v1alpha1 + - kubernetes/typed/storage/v1 + - kubernetes/typed/storage/v1beta1 + - pkg/api + - pkg/api/v1 + - pkg/api/v1/ref + - pkg/apis/admissionregistration + - pkg/apis/admissionregistration/v1alpha1 + - pkg/apis/apps + - pkg/apis/apps/v1beta1 + - pkg/apis/authentication + - pkg/apis/authentication/v1 + - pkg/apis/authentication/v1beta1 + - pkg/apis/authorization + - pkg/apis/authorization/v1 + - pkg/apis/authorization/v1beta1 + - pkg/apis/autoscaling + - pkg/apis/autoscaling/v1 + - pkg/apis/autoscaling/v2alpha1 + - pkg/apis/batch + - pkg/apis/batch/v1 + - pkg/apis/batch/v2alpha1 + - pkg/apis/certificates + - pkg/apis/certificates/v1beta1 + - pkg/apis/extensions + - pkg/apis/extensions/v1beta1 + - pkg/apis/networking + - pkg/apis/networking/v1 + - pkg/apis/policy + - pkg/apis/policy/v1beta1 + - pkg/apis/rbac + - pkg/apis/rbac/v1alpha1 + - pkg/apis/rbac/v1beta1 + - pkg/apis/settings + - pkg/apis/settings/v1alpha1 + - pkg/apis/storage + - pkg/apis/storage/v1 + - pkg/apis/storage/v1beta1 + - pkg/labels + - pkg/util + - pkg/util/intstr + - pkg/util/parsers + - pkg/version + - plugin/pkg/client/auth + - plugin/pkg/client/auth/azure + - plugin/pkg/client/auth/gcp + - plugin/pkg/client/auth/oidc + - rest + - rest/watch + - third_party/forked/golang/template + - tools/auth + - tools/clientcmd + - tools/clientcmd/api + - tools/clientcmd/api/latest + - tools/clientcmd/api/v1 + - tools/metrics + - transport + - util/cert + - util/flowcontrol + - util/homedir + - util/integer + - util/jsonpath testImports: [] diff --git a/glide.yaml b/glide.yaml index 9d065c62..3cfac534 100644 --- a/glide.yaml +++ b/glide.yaml @@ -20,15 +20,15 @@ import: subpackages: - context - package: k8s.io/client-go - version: v1.5.0 + version: v4.0.0 subpackages: - - 1.5/kubernetes - - 1.5/pkg/api - - 1.5/pkg/api/v1 - - 1.5/pkg/apis/extensions/v1beta1 - - 1.5/pkg/labels - - 1.5/pkg/util/intstr - - 1.5/rest + - kubernetes + - pkg/api + - pkg/api/v1 + - pkg/apis/extensions/v1beta1 + - pkg/labels + - pkg/util/intstr + - rest - package: github.com/influxdata/influxdb version: v1.2.0 subpackages: diff --git a/kubewatcher/kubewatcher.go b/kubewatcher/kubewatcher.go index fe4bd937..cdab6262 100644 --- a/kubewatcher/kubewatcher.go +++ b/kubewatcher/kubewatcher.go @@ -19,7 +19,6 @@ package kubewatcher import ( "bytes" "encoding/json" - "errors" "fmt" "io" "log" @@ -28,13 +27,13 @@ import ( "sync/atomic" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - apierrs "k8s.io/client-go/1.5/pkg/api/errors" - "k8s.io/client-go/1.5/pkg/api/meta" - "k8s.io/client-go/1.5/pkg/runtime" - "k8s.io/client-go/1.5/pkg/types" - "k8s.io/client-go/1.5/pkg/watch" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes" "github.com/fission/fission" "github.com/fission/fission/publisher" @@ -152,7 +151,7 @@ func createKubernetesWatch(kubeClient *kubernetes.Clientset, w *tpr.Kuberneteswa var watchTimeoutSec int64 = 120 // TODO populate labelselector and fieldselector - listOptions := api.ListOptions{ + listOptions := metav1.ListOptions{ ResourceVersion: resourceVersion, TimeoutSeconds: &watchTimeoutSec, } @@ -160,17 +159,17 @@ func createKubernetesWatch(kubeClient *kubernetes.Clientset, w *tpr.Kuberneteswa // TODO handle the full list of types switch strings.ToUpper(w.Spec.Type) { case "POD": - wi, err = kubeClient.Core().Pods(w.Spec.Namespace).Watch(listOptions) + wi, err = kubeClient.CoreV1().Pods(w.Spec.Namespace).Watch(listOptions) case "SERVICE": - wi, err = kubeClient.Core().Services(w.Spec.Namespace).Watch(listOptions) + wi, err = kubeClient.CoreV1().Services(w.Spec.Namespace).Watch(listOptions) case "REPLICATIONCONTROLLER": - wi, err = kubeClient.Core().ReplicationControllers(w.Spec.Namespace).Watch(listOptions) + wi, err = kubeClient.CoreV1().ReplicationControllers(w.Spec.Namespace).Watch(listOptions) case "JOB": - wi, err = kubeClient.Batch().Jobs(w.Spec.Namespace).Watch(listOptions) + wi, err = kubeClient.BatchV1().Jobs(w.Spec.Namespace).Watch(listOptions) default: msg := fmt.Sprintf("Error: unknown obj type '%v'", w.Spec.Type) log.Println(msg) - err = errors.New(msg) + err = errors.NewBadRequest(msg) } return wi, err } @@ -253,11 +252,11 @@ func (ws *watchSubscription) restartWatch() error { } func getResourceVersion(obj runtime.Object) (string, error) { - meta, err := meta.Accessor(obj) + m, err := meta.Accessor(obj) if err != nil { return "", err } - return meta.GetResourceVersion(), nil + return m.GetResourceVersion(), nil } func (ws *watchSubscription) eventDispatchLoop() { @@ -288,7 +287,7 @@ func (ws *watchSubscription) eventDispatchLoop() { } if ev.Type == watch.Error { - e := apierrs.FromObject(ev.Object) + e := errors.FromObject(ev.Object) log.Println("Watch error, retrying in a second: %v", e) // Start from the beginning to get around "too old resource version" ws.lastResourceVersion = "" diff --git a/kubewatcher/watchSync.go b/kubewatcher/watchSync.go index 5e8a15bf..166a2840 100644 --- a/kubewatcher/watchSync.go +++ b/kubewatcher/watchSync.go @@ -20,7 +20,7 @@ import ( "log" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) @@ -44,7 +44,7 @@ func MakeWatchSync(client *tpr.FissionClient, kubeWatcher *KubeWatcher) *WatchSy func (ws *WatchSync) syncSvc() { // TODO watch instead of polling for { - watches, err := ws.client.Kuberneteswatchtriggers(api.NamespaceAll).List(api.ListOptions{}) + watches, err := ws.client.Kuberneteswatchtriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Failed to get Kubernetes watch trigger list: %v", err) } diff --git a/logger/logger.go b/logger/logger.go index 87827390..21047786 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -29,8 +29,9 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" log "github.com/sirupsen/logrus" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/rest" + "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" ) func makelogRequestTracker() logRequestTracker { @@ -101,7 +102,7 @@ func parseContainerString(containerID string) (string, error) { } func getcontainerID(kubeClient *kubernetes.Clientset, namespace, pod, container string) (string, error) { - podInfo, err := kubeClient.Core().Pods(namespace).Get(pod) + podInfo, err := kubeClient.CoreV1().Pods(namespace).Get(pod, v1.GetOptions{}) if err != nil { log.Printf("Failed to get pod info: %v", err) return "", err diff --git a/mqtrigger/messageQueue/messageQueue.go b/mqtrigger/messageQueue/messageQueue.go index 02d4264b..d5d73ae2 100644 --- a/mqtrigger/messageQueue/messageQueue.go +++ b/mqtrigger/messageQueue/messageQueue.go @@ -21,9 +21,8 @@ import ( "time" log "github.com/sirupsen/logrus" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - //"github.com/fission/fission" "github.com/fission/fission/tpr" ) @@ -146,7 +145,7 @@ func (mqt *MessageQueueTriggerManager) getAllTriggers() *map[string]*triggerSubs return r.triggers } -func (mqt *MessageQueueTriggerManager) delTrigger(m *api.ObjectMeta) { +func (mqt *MessageQueueTriggerManager) delTrigger(m *metav1.ObjectMeta) { mqt.reqChan <- request{ requestType: DELETE_TRIGGER, triggerSub: &triggerSubscription{ @@ -160,7 +159,7 @@ func (mqt *MessageQueueTriggerManager) delTrigger(m *api.ObjectMeta) { func (mqt *MessageQueueTriggerManager) syncTriggers() { for { // get new set of triggers - newTriggers, err := mqt.fissionClient.Messagequeuetriggers(api.NamespaceAll).List(api.ListOptions{}) + newTriggers, err := mqt.fissionClient.Messagequeuetriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Failed to read message queue trigger list: %v", err) } diff --git a/mqtrigger/messageQueue/nats.go b/mqtrigger/messageQueue/nats.go index 82a2d0b5..33330135 100644 --- a/mqtrigger/messageQueue/nats.go +++ b/mqtrigger/messageQueue/nats.go @@ -88,7 +88,7 @@ func (nats Nats) unsubscribe(subscription messageQueueSubscription) error { func isTopicValidForNats(topic string) bool { // nats-streaming does not support wildcard channel. - return nsUtil.IsSubjectValid(topic) + return nsUtil.IsSubjectValid(topic, false) } func msgHandler(nats *Nats, trigger *tpr.Messagequeuetrigger) func(*ns.Msg) { diff --git a/poolmgr/api.go b/poolmgr/api.go index 35d9dd08..79bd9643 100644 --- a/poolmgr/api.go +++ b/poolmgr/api.go @@ -29,7 +29,7 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/cache" @@ -38,7 +38,7 @@ import ( type ( createFuncServiceRequest struct { - funcMeta *api.ObjectMeta + funcMeta *metav1.ObjectMeta respChan chan *createFuncServiceResponse } @@ -131,7 +131,7 @@ func (poolMgr *Poolmgr) getServiceForFunctionApi(w http.ResponseWriter, r *http. } // get function metadata - m := api.ObjectMeta{} + m := metav1.ObjectMeta{} err = json.Unmarshal(body, &m) if err != nil { http.Error(w, "Failed to parse request", 400) @@ -149,7 +149,7 @@ func (poolMgr *Poolmgr) getServiceForFunctionApi(w http.ResponseWriter, r *http. w.Write([]byte(serviceName)) } -func (poolMgr *Poolmgr) getFunctionEnv(m *api.ObjectMeta) (*tpr.Environment, error) { +func (poolMgr *Poolmgr) getFunctionEnv(m *metav1.ObjectMeta) (*tpr.Environment, error) { var env *tpr.Environment // Cached ? @@ -178,7 +178,7 @@ func (poolMgr *Poolmgr) getFunctionEnv(m *api.ObjectMeta) (*tpr.Environment, err return env, nil } -func (poolMgr *Poolmgr) getServiceForFunction(m *api.ObjectMeta) (string, error) { +func (poolMgr *Poolmgr) getServiceForFunction(m *metav1.ObjectMeta) (string, error) { // Check function -> svc cache log.Printf("[%v] Checking for cached function service", m.Name) fsvc, err := poolMgr.fsCache.GetByFunction(m) @@ -196,7 +196,7 @@ func (poolMgr *Poolmgr) getServiceForFunction(m *api.ObjectMeta) (string, error) return resp.address, resp.err } -func (poolMgr *Poolmgr) createServiceForFunction(m *api.ObjectMeta) (string, error) { +func (poolMgr *Poolmgr) createServiceForFunction(m *metav1.ObjectMeta) (string, error) { // None exists, so create a new funcSvc: log.Printf("[%v] No cached function service found, creating one", m.Name) diff --git a/poolmgr/cleanup.go b/poolmgr/cleanup.go index d715aac5..8c11003b 100644 --- a/poolmgr/cleanup.go +++ b/poolmgr/cleanup.go @@ -20,8 +20,8 @@ import ( "log" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" ) // cleanupOldPoolmgrResources looks for resources created by an old @@ -74,7 +74,7 @@ func cleanup(client *kubernetes.Clientset, namespace string, instanceId string) } func cleanupDeployments(client *kubernetes.Clientset, namespace string, instanceId string) error { - deploymentList, err := client.Extensions().Deployments(namespace).List(api.ListOptions{}) + deploymentList, err := client.ExtensionsV1beta1().Deployments(namespace).List(meta_v1.ListOptions{}) if err != nil { return err } @@ -82,7 +82,7 @@ func cleanupDeployments(client *kubernetes.Clientset, namespace string, instance id, ok := dep.ObjectMeta.Labels[POOLMGR_INSTANCEID_LABEL] if ok && id != instanceId { log.Printf("Cleaning up deployment %v", dep.ObjectMeta.Name) - err := client.Extensions().Deployments(namespace).Delete(dep.ObjectMeta.Name, nil) + err := client.ExtensionsV1beta1().Deployments(namespace).Delete(dep.ObjectMeta.Name, nil) logErr("cleaning up deployment", err) // ignore err } @@ -91,7 +91,7 @@ func cleanupDeployments(client *kubernetes.Clientset, namespace string, instance } func cleanupReplicaSets(client *kubernetes.Clientset, namespace string, instanceId string) error { - rsList, err := client.Extensions().ReplicaSets(namespace).List(api.ListOptions{}) + rsList, err := client.ExtensionsV1beta1().ReplicaSets(namespace).List(meta_v1.ListOptions{}) if err != nil { return err } @@ -99,7 +99,7 @@ func cleanupReplicaSets(client *kubernetes.Clientset, namespace string, instance id, ok := rs.ObjectMeta.Labels[POOLMGR_INSTANCEID_LABEL] if ok && id != instanceId { log.Printf("Cleaning up replicaset %v", rs.ObjectMeta.Name) - err := client.Extensions().ReplicaSets(namespace).Delete(rs.ObjectMeta.Name, nil) + err := client.ExtensionsV1beta1().ReplicaSets(namespace).Delete(rs.ObjectMeta.Name, nil) logErr("cleaning up replicaset", err) } } @@ -107,7 +107,7 @@ func cleanupReplicaSets(client *kubernetes.Clientset, namespace string, instance } func cleanupPods(client *kubernetes.Clientset, namespace string, instanceId string) error { - podList, err := client.Core().Pods(namespace).List(api.ListOptions{}) + podList, err := client.CoreV1().Pods(namespace).List(meta_v1.ListOptions{}) if err != nil { return err } @@ -115,7 +115,7 @@ func cleanupPods(client *kubernetes.Clientset, namespace string, instanceId stri id, ok := pod.ObjectMeta.Labels[POOLMGR_INSTANCEID_LABEL] if ok && id != instanceId { log.Printf("Cleaning up pod %v", pod.ObjectMeta.Name) - err := client.Core().Pods(namespace).Delete(pod.ObjectMeta.Name, nil) + err := client.CoreV1().Pods(namespace).Delete(pod.ObjectMeta.Name, nil) logErr("cleaning up pod", err) // ignore err } @@ -124,7 +124,7 @@ func cleanupPods(client *kubernetes.Clientset, namespace string, instanceId stri } func cleanupServices(client *kubernetes.Clientset, namespace string, instanceId string) error { - svcList, err := client.Core().Services(namespace).List(api.ListOptions{}) + svcList, err := client.CoreV1().Services(namespace).List(meta_v1.ListOptions{}) if err != nil { return err } @@ -132,7 +132,7 @@ func cleanupServices(client *kubernetes.Clientset, namespace string, instanceId id, ok := svc.ObjectMeta.Labels[POOLMGR_INSTANCEID_LABEL] if ok && id != instanceId { log.Printf("Cleaning up svc %v", svc.ObjectMeta.Name) - err := client.Core().Services(namespace).Delete(svc.ObjectMeta.Name, nil) + err := client.CoreV1().Services(namespace).Delete(svc.ObjectMeta.Name, nil) logErr("cleaning up svc", err) // ignore err } diff --git a/poolmgr/client/client.go b/poolmgr/client/client.go index d3ee2a17..253d851b 100644 --- a/poolmgr/client/client.go +++ b/poolmgr/client/client.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" ) @@ -47,7 +47,7 @@ func MakeClient(poolmgrUrl string) *Client { return c } -func (c *Client) GetServiceForFunction(metadata *api.ObjectMeta) (string, error) { +func (c *Client) GetServiceForFunction(metadata *metav1.ObjectMeta) (string, error) { poolmgrUrl := c.poolmgrUrl + "/v2/getServiceForFunction" body, err := json.Marshal(metadata) diff --git a/poolmgr/functionServiceCache.go b/poolmgr/functionServiceCache.go index c691e9dc..296a6c50 100644 --- a/poolmgr/functionServiceCache.go +++ b/poolmgr/functionServiceCache.go @@ -20,7 +20,7 @@ import ( "log" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/cache" @@ -38,10 +38,10 @@ const ( type ( funcSvc struct { - function *api.ObjectMeta // function this pod/service is for - environment *tpr.Environment // function's environment - address string // Host:Port or IP:Port that the function's service can be reached at. - podName string // pod name (within the function namespace) + function *metav1.ObjectMeta // function this pod/service is for + environment *tpr.Environment // function's environment + address string // Host:Port or IP:Port that the function's service can be reached at. + podName string // pod name (within the function namespace) ctime time.Time atime time.Time @@ -49,8 +49,8 @@ type ( functionServiceCache struct { byFunction *cache.Cache // function-key -> funcSvc : map[string]*funcSvc - byAddress *cache.Cache // address -> function : map[string]api.ObjectMeta - byPod *cache.Cache // podname -> function : map[string]api.ObjectMeta + byAddress *cache.Cache // address -> function : map[string]metav1.ObjectMeta + byPod *cache.Cache // podname -> function : map[string]metav1.ObjectMeta requestChannel chan *fscRequest } @@ -59,7 +59,7 @@ type ( address string podName string age time.Duration - env *api.ObjectMeta // used for ListOld + env *metav1.ObjectMeta // used for ListOld responseChannel chan *fscResponse } fscResponse struct { @@ -93,7 +93,7 @@ func (fsc *functionServiceCache) service() { byPodCopy := fsc.byPod.Copy() pods := make([]string, 0) for podNameI, mI := range byPodCopy { - m := mI.(api.ObjectMeta) + m := mI.(metav1.ObjectMeta) fsvcI, err := fsc.byFunction.Get(tpr.CacheKey(&m)) if err != nil { resp.error = err @@ -122,7 +122,7 @@ func (fsc *functionServiceCache) service() { } } -func (fsc *functionServiceCache) GetByFunction(m *api.ObjectMeta) (*funcSvc, error) { +func (fsc *functionServiceCache) GetByFunction(m *metav1.ObjectMeta) (*funcSvc, error) { key := tpr.CacheKey(m) fsvcI, err := fsc.byFunction.Get(key) @@ -198,7 +198,7 @@ func (fsc *functionServiceCache) _touchByAddress(address string) error { if err != nil { return err } - m := mI.(api.ObjectMeta) + m := mI.(metav1.ObjectMeta) fsvcI, err := fsc.byFunction.Get(tpr.CacheKey(&m)) if err != nil { return err @@ -227,7 +227,7 @@ func (fsc *functionServiceCache) _deleteByPod(podName string, minAge time.Durati if err != nil { return false, err } - m := mI.(api.ObjectMeta) + m := mI.(metav1.ObjectMeta) fsvcI, err := fsc.byFunction.Get(tpr.CacheKey(&m)) if err != nil { return false, err @@ -244,7 +244,7 @@ func (fsc *functionServiceCache) _deleteByPod(podName string, minAge time.Durati return true, nil } -func (fsc *functionServiceCache) ListOld(env *api.ObjectMeta, age time.Duration) ([]string, error) { +func (fsc *functionServiceCache) ListOld(env *metav1.ObjectMeta, age time.Duration) ([]string, error) { responseChannel := make(chan *fscResponse) fsc.requestChannel <- &fscRequest{ requestType: LISTOLD, diff --git a/poolmgr/functionServiceCache_test.go b/poolmgr/functionServiceCache_test.go index 5a4003a0..4386c3ac 100644 --- a/poolmgr/functionServiceCache_test.go +++ b/poolmgr/functionServiceCache_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -21,12 +21,12 @@ func TestFunctionServiceCache(t *testing.T) { now := time.Now() fsvc = &funcSvc{ - function: &api.ObjectMeta{ + function: &metav1.ObjectMeta{ Name: "foo", UID: "1212", }, environment: &tpr.Environment{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "foo-env", UID: "2323", }, diff --git a/poolmgr/gp.go b/poolmgr/gp.go index b645d5d8..f19de636 100644 --- a/poolmgr/gp.go +++ b/poolmgr/gp.go @@ -32,12 +32,12 @@ import ( "time" "github.com/dchest/uniuri" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/v1" - "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" - "k8s.io/client-go/1.5/pkg/labels" - "k8s.io/client-go/1.5/pkg/util/intstr" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/kubernetes" + apiv1 "k8s.io/client-go/pkg/api/v1" + "k8s.io/client-go/pkg/apis/extensions/v1beta1" "github.com/fission/fission" "github.com/fission/fission/environments/fetcher" @@ -61,8 +61,8 @@ type ( useSvc bool // create k8s service for specialized pods poolInstanceId string // small random string to uniquify pod names fetcherImage string - fetcherImagePullPolicy v1.PullPolicy - runtimeImagePullPolicy v1.PullPolicy // pull policy for generic pool to created env deployment + fetcherImagePullPolicy apiv1.PullPolicy + runtimeImagePullPolicy apiv1.PullPolicy // pull policy for generic pool to created env deployment kubernetesClient *kubernetes.Clientset fissionClient *tpr.FissionClient instanceId string // poolmgr instance id @@ -77,19 +77,19 @@ type ( responseChannel chan *choosePodResponse } choosePodResponse struct { - pod *v1.Pod + pod *apiv1.Pod error } ) -func getImagePullPolicy(policy string) v1.PullPolicy { +func getImagePullPolicy(policy string) apiv1.PullPolicy { switch policy { case "Always": - return v1.PullAlways + return apiv1.PullAlways case "Never": - return v1.PullNever + return apiv1.PullNever default: - return v1.PullIfNotPresent + return apiv1.PullIfNotPresent } } @@ -182,7 +182,7 @@ func (gp *GenericPool) choosePodService() { // choosePod picks a ready pod from the pool and relabels it, waiting if necessary. // returns the pod API object. -func (gp *GenericPool) choosePod(newLabels map[string]string) (*v1.Pod, error) { +func (gp *GenericPool) choosePod(newLabels map[string]string) (*apiv1.Pod, error) { req := &choosePodRequest{ newLabels: newLabels, responseChannel: make(chan *choosePodResponse), @@ -193,7 +193,7 @@ func (gp *GenericPool) choosePod(newLabels map[string]string) (*v1.Pod, error) { } // _choosePod is called serially by choosePodService -func (gp *GenericPool) _choosePod(newLabels map[string]string) (*v1.Pod, error) { +func (gp *GenericPool) _choosePod(newLabels map[string]string) (*apiv1.Pod, error) { startTime := time.Now() for { // Retries took too long, error out. @@ -203,14 +203,15 @@ func (gp *GenericPool) _choosePod(newLabels map[string]string) (*v1.Pod, error) } // Get pods; filter the ones that are ready - podList, err := gp.kubernetesClient.Core().Pods(gp.namespace).List( - api.ListOptions{ - LabelSelector: labels.Set(gp.deployment.Spec.Selector.MatchLabels).AsSelector(), + podList, err := gp.kubernetesClient.CoreV1().Pods(gp.namespace).List( + metav1.ListOptions{ + LabelSelector: labels.Set( + gp.deployment.Spec.Selector.MatchLabels).AsSelector().String(), }) if err != nil { return nil, err } - readyPods := make([]*v1.Pod, 0, len(podList.Items)) + readyPods := make([]*apiv1.Pod, 0, len(podList.Items)) for i := range podList.Items { pod := podList.Items[i] @@ -252,7 +253,7 @@ func (gp *GenericPool) _choosePod(newLabels map[string]string) (*v1.Pod, error) // retry. chosenPod.ObjectMeta.Labels = newLabels log.Printf("relabeling pod: [%v]", chosenPod.ObjectMeta.Name) - _, err = gp.kubernetesClient.Core().Pods(gp.namespace).Update(chosenPod) + _, err = gp.kubernetesClient.CoreV1().Pods(gp.namespace).Update(chosenPod) if err != nil { log.Printf("failed to relabel pod [%v]: %v", chosenPod.ObjectMeta.Name, err) continue @@ -263,7 +264,7 @@ func (gp *GenericPool) _choosePod(newLabels map[string]string) (*v1.Pod, error) } } -func (gp *GenericPool) labelsForFunction(metadata *api.ObjectMeta) map[string]string { +func (gp *GenericPool) labelsForFunction(metadata *metav1.ObjectMeta) map[string]string { return map[string]string{ "functionName": metadata.Name, "functionUid": string(metadata.UID), @@ -279,7 +280,7 @@ func (gp *GenericPool) scheduleDeletePod(name string) { // aggregation and storage will help.) log.Printf("Error in pod '%v', scheduling cleanup", name) time.Sleep(5 * time.Minute) - gp.kubernetesClient.Core().Pods(gp.namespace).Delete(name, nil) + gp.kubernetesClient.CoreV1().Pods(gp.namespace).Delete(name, nil) }() } @@ -309,7 +310,7 @@ func (gp *GenericPool) getSpecializeUrl(podIP string, version int) string { // specializePod chooses a pod, copies the required user-defined function to that pod // (via fetcher), and calls the function-run container to load it, resulting in a // specialized pod. -func (gp *GenericPool) specializePod(pod *v1.Pod, metadata *api.ObjectMeta) error { +func (gp *GenericPool) specializePod(pod *apiv1.Pod, metadata *metav1.ObjectMeta) error { // for fetcher we don't need to create a service, just talk to the pod directly podIP := pod.Status.PodIP if len(podIP) == 0 { @@ -331,7 +332,7 @@ func (gp *GenericPool) specializePod(pod *v1.Pod, metadata *api.ObjectMeta) erro err = fetcherClient.MakeClient(fetcherUrl).Fetch(&fetcher.FetchRequest{ FetchType: fetcher.FETCH_DEPLOYMENT, - Package: api.ObjectMeta{ + Package: metav1.ObjectMeta{ Namespace: fn.Spec.Package.PackageRef.Namespace, Name: fn.Spec.Package.PackageRef.Name, }, @@ -406,35 +407,35 @@ func (gp *GenericPool) createPool() error { gp.env.Metadata.Name, gp.env.Metadata.UID, strings.ToLower(gp.poolInstanceId)) deployment := &v1beta1.Deployment{ - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: poolDeploymentName, Labels: gp.labelsForPool, }, Spec: v1beta1.DeploymentSpec{ Replicas: &gp.replicas, - Selector: &v1beta1.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: gp.labelsForPool, }, - Template: v1.PodTemplateSpec{ - ObjectMeta: v1.ObjectMeta{ + Template: apiv1.PodTemplateSpec{ + ObjectMeta: metav1.ObjectMeta{ Labels: gp.labelsForPool, }, - Spec: v1.PodSpec{ - Volumes: []v1.Volume{ + Spec: apiv1.PodSpec{ + Volumes: []apiv1.Volume{ { Name: "userfunc", - VolumeSource: v1.VolumeSource{ - EmptyDir: &v1.EmptyDirVolumeSource{}, + VolumeSource: apiv1.VolumeSource{ + EmptyDir: &apiv1.EmptyDirVolumeSource{}, }, }, }, - Containers: []v1.Container{ + Containers: []apiv1.Container{ { Name: gp.env.Metadata.Name, Image: gp.env.Spec.Runtime.Image, - ImagePullPolicy: gp.runtimeImagePullPolicy, + ImagePullPolicy: apiv1.PullIfNotPresent, TerminationMessagePath: "/dev/termination-log", - VolumeMounts: []v1.VolumeMount{ + VolumeMounts: []apiv1.VolumeMount{ { Name: "userfunc", MountPath: gp.sharedMountPath, @@ -446,7 +447,7 @@ func (gp *GenericPool) createPool() error { Image: gp.fetcherImage, ImagePullPolicy: gp.fetcherImagePullPolicy, TerminationMessagePath: "/dev/termination-log", - VolumeMounts: []v1.VolumeMount{ + VolumeMounts: []apiv1.VolumeMount{ { Name: "userfunc", MountPath: gp.sharedMountPath, @@ -460,7 +461,7 @@ func (gp *GenericPool) createPool() error { }, }, } - depl, err := gp.kubernetesClient.Extensions().Deployments(gp.namespace).Create(deployment) + depl, err := gp.kubernetesClient.ExtensionsV1beta1().Deployments(gp.namespace).Create(deployment) if err != nil { return err } @@ -472,7 +473,8 @@ func (gp *GenericPool) waitForReadyPod() error { startTime := time.Now() for { // TODO: for now we just poll; use a watch instead - depl, err := gp.kubernetesClient.Extensions().Deployments(gp.namespace).Get(gp.deployment.ObjectMeta.Name) + depl, err := gp.kubernetesClient.ExtensionsV1beta1().Deployments(gp.namespace).Get( + gp.deployment.ObjectMeta.Name, metav1.GetOptions{}) if err != nil { log.Printf("err: %v", err) return err @@ -489,16 +491,16 @@ func (gp *GenericPool) waitForReadyPod() error { } } -func (gp *GenericPool) createSvc(name string, labels map[string]string) (*v1.Service, error) { - service := v1.Service{ - ObjectMeta: v1.ObjectMeta{ +func (gp *GenericPool) createSvc(name string, labels map[string]string) (*apiv1.Service, error) { + service := apiv1.Service{ + ObjectMeta: metav1.ObjectMeta{ Name: name, }, - Spec: v1.ServiceSpec{ - Type: v1.ServiceTypeClusterIP, - Ports: []v1.ServicePort{ + Spec: apiv1.ServiceSpec{ + Type: apiv1.ServiceTypeClusterIP, + Ports: []apiv1.ServicePort{ { - Protocol: v1.ProtocolTCP, + Protocol: apiv1.ProtocolTCP, Port: 80, TargetPort: intstr.FromInt(8888), }, @@ -506,11 +508,11 @@ func (gp *GenericPool) createSvc(name string, labels map[string]string) (*v1.Ser Selector: labels, }, } - svc, err := gp.kubernetesClient.Core().Services(gp.namespace).Create(&service) + svc, err := gp.kubernetesClient.CoreV1().Services(gp.namespace).Create(&service) return svc, err } -func (gp *GenericPool) GetFuncSvc(m *api.ObjectMeta) (*funcSvc, error) { +func (gp *GenericPool) GetFuncSvc(m *metav1.ObjectMeta) (*funcSvc, error) { log.Printf("[%v] Choosing pod from pool", m.Name) newLabels := gp.labelsForFunction(m) @@ -569,7 +571,7 @@ func (gp *GenericPool) GetFuncSvc(m *api.ObjectMeta) (*funcSvc, error) { // our own. log.Printf("func svc already exists: %v", existingFsvc.podName) go func() { - gp.kubernetesClient.Core().Pods(gp.namespace).Delete(fsvc.podName, nil) + gp.kubernetesClient.CoreV1().Pods(gp.namespace).Delete(fsvc.podName, nil) }() return existingFsvc, nil } @@ -591,7 +593,7 @@ func (gp *GenericPool) CleanupFunctionService(podName string) error { return nil } - pod, err := gp.kubernetesClient.Core().Pods(gp.namespace).Get(podName) + pod, err := gp.kubernetesClient.CoreV1().Pods(gp.namespace).Get(podName, metav1.GetOptions{}) if err != nil { return err } @@ -609,7 +611,7 @@ func (gp *GenericPool) CleanupFunctionService(podName string) error { } // delete pod - err = gp.kubernetesClient.Core().Pods(gp.namespace).Delete(podName, nil) + err = gp.kubernetesClient.CoreV1().Pods(gp.namespace).Delete(podName, nil) if err != nil { return err } @@ -638,7 +640,7 @@ func (gp *GenericPool) idlePodReaper() { // destroys the pool -- the deployment, replicaset and pods func (gp *GenericPool) destroy() error { // Destroy deployment - err := gp.kubernetesClient.Extensions().Deployments(gp.namespace).Delete(gp.deployment.ObjectMeta.Name, nil) + err := gp.kubernetesClient.ExtensionsV1beta1().Deployments(gp.namespace).Delete(gp.deployment.ObjectMeta.Name, nil) if err != nil { log.Printf("Error destroying deployment: %v", err) return err @@ -647,12 +649,12 @@ func (gp *GenericPool) destroy() error { // Destroy ReplicaSet. Pre-1.6 K8s versions don't do this // automatically but post-1.6 K8s will, and may beat us to it, // so don't error out if we fail. - rsList, err := gp.kubernetesClient.Extensions().ReplicaSets(gp.namespace).List(api.ListOptions{ - LabelSelector: labels.Set(gp.labelsForPool).AsSelector(), + rsList, err := gp.kubernetesClient.ExtensionsV1beta1().ReplicaSets(gp.namespace).List(metav1.ListOptions{ + LabelSelector: labels.Set(gp.labelsForPool).AsSelector().String(), }) if len(rsList.Items) >= 0 { for _, rs := range rsList.Items { - err = gp.kubernetesClient.Extensions().ReplicaSets(gp.namespace).Delete(rs.ObjectMeta.Name, nil) + err = gp.kubernetesClient.ExtensionsV1beta1().ReplicaSets(gp.namespace).Delete(rs.ObjectMeta.Name, nil) if err != nil { log.Printf("Error deleting replicaset, ignoring: %v", err) } @@ -660,12 +662,12 @@ func (gp *GenericPool) destroy() error { } // Destroy Pods. See note above. - podList, err := gp.kubernetesClient.Core().Pods(gp.namespace).List(api.ListOptions{ - LabelSelector: labels.Set(gp.labelsForPool).AsSelector(), + podList, err := gp.kubernetesClient.CoreV1().Pods(gp.namespace).List(metav1.ListOptions{ + LabelSelector: labels.Set(gp.labelsForPool).AsSelector().String(), }) if len(podList.Items) >= 0 { for _, pod := range podList.Items { - err = gp.kubernetesClient.Core().Pods(gp.namespace).Delete(pod.ObjectMeta.Name, nil) + err = gp.kubernetesClient.CoreV1().Pods(gp.namespace).Delete(pod.ObjectMeta.Name, nil) if err != nil { log.Printf("Error deleting pod, ignoring: %v", err) } @@ -677,7 +679,7 @@ func (gp *GenericPool) destroy() error { // Calls the logging daemonset pod on the node where the given pod is // running. -func (gp *GenericPool) setupLogging(pod *v1.Pod, metadata *api.ObjectMeta) { +func (gp *GenericPool) setupLogging(pod *apiv1.Pod, metadata *metav1.ObjectMeta) { logReq := logger.LogRequest{ Namespace: pod.Namespace, Pod: pod.Name, diff --git a/poolmgr/gpm.go b/poolmgr/gpm.go index f8471a70..9c8ead45 100644 --- a/poolmgr/gpm.go +++ b/poolmgr/gpm.go @@ -20,8 +20,8 @@ import ( "log" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -148,7 +148,7 @@ func (gpm *GenericPoolManager) eagerPoolCreator() { time.Sleep(pollSleep) // get list of envs from controller - envs, err := gpm.fissionClient.Environments(api.NamespaceAll).List(api.ListOptions{}) + envs, err := gpm.fissionClient.Environments(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Failed to get environment list: %v", err) } diff --git a/poolmgr/poolmgr_test.go b/poolmgr/poolmgr_test.go index 53137799..b074fa7a 100644 --- a/poolmgr/poolmgr_test.go +++ b/poolmgr/poolmgr_test.go @@ -24,6 +24,7 @@ package poolmgr import ( "fmt" + "io/ioutil" "log" "math/rand" "net/http" @@ -31,21 +32,20 @@ import ( "testing" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/v1" - "k8s.io/client-go/1.5/pkg/labels" - "k8s.io/client-go/1.5/pkg/util/intstr" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/kubernetes" + apiv1 "k8s.io/client-go/pkg/api/v1" "github.com/fission/fission" "github.com/fission/fission/poolmgr/client" "github.com/fission/fission/tpr" - "io/ioutil" ) // return the number of pods in the given namespace matching the given labels func countPods(kubeClient *kubernetes.Clientset, ns string, labelz map[string]string) int { - pods, err := kubeClient.Pods(ns).List(api.ListOptions{ + pods, err := kubeClient.Pods(ns).List(metav1.ListOptions{ LabelSelector: labels.Set(labelz).AsSelector(), }) if err != nil { @@ -55,8 +55,8 @@ func countPods(kubeClient *kubernetes.Clientset, ns string, labelz map[string]st } func createTestNamespace(kubeClient *kubernetes.Clientset, ns string) { - _, err := kubeClient.Namespaces().Create(&v1.Namespace{ - ObjectMeta: v1.ObjectMeta{ + _, err := kubeClient.Namespaces().Create(&apiv1.Namespace{ + ObjectMeta: metav1.ObjectMeta{ Name: ns, }, }) @@ -67,16 +67,16 @@ func createTestNamespace(kubeClient *kubernetes.Clientset, ns string) { } // create a nodeport service -func createSvc(kubeClient *kubernetes.Clientset, ns string, name string, targetPort int, nodePort int32, labels map[string]string) *v1.Service { - svc, err := kubeClient.Services(ns).Create(&v1.Service{ - ObjectMeta: v1.ObjectMeta{ +func createSvc(kubeClient *kubernetes.Clientset, ns string, name string, targetPort int, nodePort int32, labels map[string]string) *apiv1.Service { + svc, err := kubeClient.Services(ns).Create(&apiv1.Service{ + ObjectMeta: metav1.ObjectMeta{ Name: name, }, - Spec: v1.ServiceSpec{ - Type: v1.ServiceTypeNodePort, - Ports: []v1.ServicePort{ + Spec: apiv1.ServiceSpec{ + Type: apiv1.ServiceTypeNodePort, + Ports: []apiv1.ServicePort{ { - Protocol: v1.ProtocolTCP, + Protocol: apiv1.ProtocolTCP, Port: 80, TargetPort: intstr.FromInt(targetPort), NodePort: nodePort, @@ -142,7 +142,7 @@ func TestPoolmgr(t *testing.T) { // create an env on the cluster env, err := fissionClient.Environments(fissionNs).Create(&tpr.Environment{ - Metadata: api.ObjectMeta{ + Metadata: metametav1.ObjectMeta{ Name: "nodejs", Namespace: fissionNs, }, @@ -175,7 +175,7 @@ func TestPoolmgr(t *testing.T) { // create a package p := &tpr.Package{ - Metadata: api.ObjectMeta{ + Metadata: metametav1.ObjectMeta{ Name: "hello", Namespace: fissionNs, }, @@ -191,7 +191,7 @@ func TestPoolmgr(t *testing.T) { // create a function f := &tpr.Function{ - Metadata: api.ObjectMeta{ + Metadata: metametav1.ObjectMeta{ Name: "hello", Namespace: fissionNs, }, diff --git a/router/functionHandler.go b/router/functionHandler.go index f4a1e6f2..8a6c2c2c 100644 --- a/router/functionHandler.go +++ b/router/functionHandler.go @@ -26,7 +26,7 @@ import ( "time" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" poolmgrClient "github.com/fission/fission/poolmgr/client" ) @@ -34,7 +34,7 @@ import ( type functionHandler struct { fmap *functionServiceMap poolmgr *poolmgrClient.Client - function *api.ObjectMeta + function *metav1.ObjectMeta } func (fh *functionHandler) getServiceForFunction() (*url.URL, error) { diff --git a/router/functionHandler_test.go b/router/functionHandler_test.go index 76d11981..18a4d95b 100644 --- a/router/functionHandler_test.go +++ b/router/functionHandler_test.go @@ -23,7 +23,7 @@ import ( "net/url" "testing" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func createBackendService(testResponseString string) *url.URL { @@ -49,7 +49,7 @@ func TestFunctionProxying(t *testing.T) { backendURL := createBackendService(testResponseString) log.Printf("Created backend svc at %v", backendURL) - fn := &api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault} + fn := &metav1.ObjectMeta{Name: "foo", Namespace: metav1.NamespaceDefault} fmap := makeFunctionServiceMap(0) fmap.assign(fn, backendURL) diff --git a/router/functionReferenceResolver.go b/router/functionReferenceResolver.go index 06b57774..088cad54 100644 --- a/router/functionReferenceResolver.go +++ b/router/functionReferenceResolver.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/cache" @@ -44,7 +44,7 @@ type ( // a distribution of requests across two functions. resolveResult struct { resolveResultType - functionMetadata *api.ObjectMeta + functionMetadata *metav1.ObjectMeta } // namespacedFunctionReference is just a function reference plus a diff --git a/router/functionServiceMap.go b/router/functionServiceMap.go index c0548e53..9871d2a7 100644 --- a/router/functionServiceMap.go +++ b/router/functionServiceMap.go @@ -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 { diff --git a/router/functionServiceMap_test.go b/router/functionServiceMap_test.go index 61b3d930..db395ff5 100644 --- a/router/functionServiceMap_test.go +++ b/router/functionServiceMap_test.go @@ -20,12 +20,12 @@ import ( "net/url" "testing" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestFunctionServiceMap(t *testing.T) { m := makeFunctionServiceMap(0) - fn := &api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault} + fn := &metav1.ObjectMeta{Name: "foo", Namespace: metav1.NamespaceDefault} u, err := url.Parse("/foo012") if err != nil { t.Errorf("can't parse url") diff --git a/router/httpTriggers.go b/router/httpTriggers.go index 93301a97..202bfc46 100644 --- a/router/httpTriggers.go +++ b/router/httpTriggers.go @@ -22,8 +22,8 @@ import ( "time" "github.com/gorilla/mux" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" "github.com/fission/fission" poolmgrClient "github.com/fission/fission/poolmgr/client" @@ -138,7 +138,7 @@ func (ts *HTTPTriggerSet) watchTriggers() { // Watch controller for updates to triggers and update the router accordingly. rv := "" for { - wi, err := ts.fissionClient.Httptriggers(api.NamespaceAll).Watch(api.ListOptions{ + wi, err := ts.fissionClient.Httptriggers(metav1.NamespaceAll).Watch(metav1.ListOptions{ ResourceVersion: rv, }) if err != nil { @@ -167,7 +167,7 @@ func (ts *HTTPTriggerSet) watchTriggers() { func (ts *HTTPTriggerSet) watchFunctions() { rv := "" for { - wi, err := ts.fissionClient.Functions(api.NamespaceAll).Watch(api.ListOptions{ + wi, err := ts.fissionClient.Functions(metav1.NamespaceAll).Watch(metav1.ListOptions{ ResourceVersion: rv, }) if err != nil { @@ -210,14 +210,14 @@ func (ts *HTTPTriggerSet) syncTriggers() { log.Printf("Syncing http triggers") // get triggers - triggers, err := ts.fissionClient.Httptriggers(api.NamespaceAll).List(api.ListOptions{}) + triggers, err := ts.fissionClient.Httptriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Failed to get http trigger list: %v", err) } ts.triggers = triggers.Items // get functions - functions, err := ts.fissionClient.Functions(api.NamespaceAll).List(api.ListOptions{}) + functions, err := ts.fissionClient.Functions(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Failed to get function list: %v", err) } diff --git a/router/router_test.go b/router/router_test.go index 5a848e66..e524eeca 100644 --- a/router/router_test.go +++ b/router/router_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission" "github.com/fission/fission/tpr" @@ -29,7 +29,7 @@ import ( func TestRouter(t *testing.T) { // metadata for a fake function - fn := &api.ObjectMeta{Name: "foo", Namespace: api.NamespaceDefault} + fn := &metav1.ObjectMeta{Name: "foo", Namespace: metav1.NamespaceDefault} // and a reference to it fr := fission.FunctionReference{ @@ -48,7 +48,7 @@ func TestRouter(t *testing.T) { // set up the resolver's cache for this function frr := makeFunctionReferenceResolver(nil) nfr := namespacedFunctionReference{ - namespace: api.NamespaceDefault, + namespace: metav1.NamespaceDefault, functionReference: fr, } rr := resolveResult{ @@ -62,9 +62,9 @@ func TestRouter(t *testing.T) { triggerUrl := "/foo" triggers.triggers = append(triggers.triggers, tpr.Httptrigger{ - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "xxx", - Namespace: api.NamespaceDefault, + Namespace: metav1.NamespaceDefault, }, Spec: fission.HTTPTriggerSpec{ RelativeURL: triggerUrl, diff --git a/router/util.go b/router/util.go index 08caa374..9d8c1b7a 100644 --- a/router/util.go +++ b/router/util.go @@ -2,24 +2,25 @@ package router import ( "fmt" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/types" "net/http" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" ) const ( HEADERS_FISSION_FUNCTION_PREFIX = "Fission-Function" ) -func MetadataToHeaders(prefix string, meta *api.ObjectMeta, request *http.Request) { +func MetadataToHeaders(prefix string, meta *metav1.ObjectMeta, request *http.Request) { request.Header.Add(fmt.Sprintf("X-%s-Uid", prefix), string(meta.UID)) request.Header.Add(fmt.Sprintf("X-%s-Name", prefix), meta.Name) request.Header.Add(fmt.Sprintf("X-%s-Namespace", prefix), meta.Namespace) request.Header.Add(fmt.Sprintf("X-%s-ResourceVersion", prefix), meta.ResourceVersion) } -func HeadersToMetadata(prefix string, headers http.Header) *api.ObjectMeta { - return &api.ObjectMeta{ +func HeadersToMetadata(prefix string, headers http.Header) *metav1.ObjectMeta { + return &metav1.ObjectMeta{ Name: headers.Get(fmt.Sprintf("X-%s-Name", prefix)), UID: types.UID(headers.Get(fmt.Sprintf("X-%s-Uid", prefix))), Namespace: headers.Get(fmt.Sprintf("X-%s-Namespace", prefix)), diff --git a/timer/timer.go b/timer/timer.go index 3118cfc0..4ef09848 100644 --- a/timer/timer.go +++ b/timer/timer.go @@ -20,7 +20,6 @@ import ( "log" "github.com/robfig/cron" - // "k8s.io/client-go/1.5/pkg/api" "github.com/fission/fission" "github.com/fission/fission/publisher" diff --git a/timer/timerSync.go b/timer/timerSync.go index 0aa018b4..6567d80d 100644 --- a/timer/timerSync.go +++ b/timer/timerSync.go @@ -20,7 +20,7 @@ import ( "log" "time" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/fission/fission/tpr" ) @@ -43,7 +43,7 @@ func MakeTimerSync(fissionClient *tpr.FissionClient, timer *Timer) *TimerSync { func (ws *TimerSync) syncSvc() { for { - triggers, err := ws.fissionClient.Timetriggers(api.NamespaceAll).List(api.ListOptions{}) + triggers, err := ws.fissionClient.Timetriggers(metav1.NamespaceAll).List(metav1.ListOptions{}) if err != nil { log.Fatalf("Failed get time trigger list: %v", err) } diff --git a/tpr/client.go b/tpr/client.go index a2752b92..5ef917f1 100644 --- a/tpr/client.go +++ b/tpr/client.go @@ -21,13 +21,15 @@ import ( "os" "time" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/unversioned" - "k8s.io/client-go/1.5/pkg/runtime" - "k8s.io/client-go/1.5/pkg/runtime/serializer" - "k8s.io/client-go/1.5/rest" - "k8s.io/client-go/1.5/tools/clientcmd" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/runtime/serializer" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/scheme" + _ "k8s.io/client-go/plugin/pkg/client/auth" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" ) type ( @@ -85,14 +87,14 @@ func GetTprClient(config *rest.Config) (*rest.RESTClient, error) { // also puts the fission TPR types under a "group version" which we // create for our TPRs types. func configureClient(config *rest.Config) { - groupversion := unversioned.GroupVersion{ + groupversion := schema.GroupVersion{ Group: "fission.io", Version: "v1", } config.GroupVersion = &groupversion config.APIPath = "/apis" config.ContentType = runtime.ContentTypeJSON - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} schemeBuilder := runtime.NewSchemeBuilder( func(scheme *runtime.Scheme) error { @@ -100,61 +102,61 @@ func configureClient(config *rest.Config) { groupversion, &Function{}, &FunctionList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) scheme.AddKnownTypes( groupversion, &Environment{}, &EnvironmentList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) scheme.AddKnownTypes( groupversion, &Httptrigger{}, &HttptriggerList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) scheme.AddKnownTypes( groupversion, &Kuberneteswatchtrigger{}, &KuberneteswatchtriggerList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) scheme.AddKnownTypes( groupversion, &Timetrigger{}, &TimetriggerList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) scheme.AddKnownTypes( groupversion, &Messagequeuetrigger{}, &MessagequeuetriggerList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) scheme.AddKnownTypes( groupversion, &Package{}, &PackageList{}, - &api.ListOptions{}, - &api.DeleteOptions{}, + &metav1.ListOptions{}, + &metav1.DeleteOptions{}, ) return nil }) - schemeBuilder.AddToScheme(api.Scheme) + schemeBuilder.AddToScheme(scheme.Scheme) } func waitForTPRs(tprClient *rest.RESTClient) error { start := time.Now() for { - fi := MakeFunctionInterface(tprClient, api.NamespaceDefault) - _, err := fi.List(api.ListOptions{}) + fi := MakeFunctionInterface(tprClient, metav1.NamespaceDefault) + _, err := fi.List(metav1.ListOptions{}) if err != nil { time.Sleep(100 * time.Millisecond) } else { diff --git a/tpr/environment.go b/tpr/environment.go index 4367693d..eb599368 100644 --- a/tpr/environment.go +++ b/tpr/environment.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Environment) (*Environment, error) Get(name string) (*Environment, error) Update(*Environment) (*Environment, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*EnvironmentList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*EnvironmentList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } environmentClient struct { @@ -85,7 +86,7 @@ func (ec *environmentClient) Update(e *Environment) (*Environment, error) { return &result, nil } -func (ec *environmentClient) Delete(name string, opts *api.DeleteOptions) error { +func (ec *environmentClient) Delete(name string, opts *metav1.DeleteOptions) error { return ec.client.Delete(). Namespace(ec.namespace). Resource("environments"). @@ -95,12 +96,12 @@ func (ec *environmentClient) Delete(name string, opts *api.DeleteOptions) error Error() } -func (ec *environmentClient) List(opts api.ListOptions) (*EnvironmentList, error) { +func (ec *environmentClient) List(opts metav1.ListOptions) (*EnvironmentList, error) { var result EnvironmentList err := ec.client.Get(). Namespace(ec.namespace). Resource("environments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (ec *environmentClient) List(opts api.ListOptions) (*EnvironmentList, error return &result, nil } -func (ec *environmentClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (ec *environmentClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return ec.client.Get(). Prefix("watch"). Namespace(ec.namespace). Resource("environments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/function.go b/tpr/function.go index 186301ac..8ebeb82f 100644 --- a/tpr/function.go +++ b/tpr/function.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Function) (*Function, error) Get(name string) (*Function, error) Update(*Function) (*Function, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*FunctionList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*FunctionList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } functionClient struct { @@ -85,7 +86,7 @@ func (fc *functionClient) Update(f *Function) (*Function, error) { return &result, nil } -func (fc *functionClient) Delete(name string, opts *api.DeleteOptions) error { +func (fc *functionClient) Delete(name string, opts *metav1.DeleteOptions) error { return fc.client.Delete(). Namespace(fc.namespace). Resource("functions"). @@ -95,12 +96,12 @@ func (fc *functionClient) Delete(name string, opts *api.DeleteOptions) error { Error() } -func (fc *functionClient) List(opts api.ListOptions) (*FunctionList, error) { +func (fc *functionClient) List(opts metav1.ListOptions) (*FunctionList, error) { var result FunctionList err := fc.client.Get(). Namespace(fc.namespace). Resource("functions"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (fc *functionClient) List(opts api.ListOptions) (*FunctionList, error) { return &result, nil } -func (fc *functionClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (fc *functionClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return fc.client.Get(). Prefix("watch"). Namespace(fc.namespace). Resource("functions"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/httptrigger.go b/tpr/httptrigger.go index c70cf36e..fc5f1779 100644 --- a/tpr/httptrigger.go +++ b/tpr/httptrigger.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Httptrigger) (*Httptrigger, error) Get(name string) (*Httptrigger, error) Update(*Httptrigger) (*Httptrigger, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*HttptriggerList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*HttptriggerList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } httpTriggerClient struct { @@ -85,7 +86,7 @@ func (c *httpTriggerClient) Update(obj *Httptrigger) (*Httptrigger, error) { return &result, nil } -func (c *httpTriggerClient) Delete(name string, opts *api.DeleteOptions) error { +func (c *httpTriggerClient) Delete(name string, opts *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.namespace). Resource("httptriggers"). @@ -95,12 +96,12 @@ func (c *httpTriggerClient) Delete(name string, opts *api.DeleteOptions) error { Error() } -func (c *httpTriggerClient) List(opts api.ListOptions) (*HttptriggerList, error) { +func (c *httpTriggerClient) List(opts metav1.ListOptions) (*HttptriggerList, error) { var result HttptriggerList err := c.client.Get(). Namespace(c.namespace). Resource("httptriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (c *httpTriggerClient) List(opts api.ListOptions) (*HttptriggerList, error) return &result, nil } -func (c *httpTriggerClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (c *httpTriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.namespace). Resource("httptriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/key.go b/tpr/key.go index 0cb64407..2eacfa99 100644 --- a/tpr/key.go +++ b/tpr/key.go @@ -19,7 +19,7 @@ package tpr import ( "fmt" - "k8s.io/client-go/1.5/pkg/api" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // Given metadata, create a key that uniquely identifies the contents @@ -28,6 +28,6 @@ import ( // content. (ResourceVersion may also update on status updates, so // this will result in some unnecessary cache misses. That should be // ok.) -func CacheKey(metadata *api.ObjectMeta) string { +func CacheKey(metadata *metav1.ObjectMeta) string { return fmt.Sprintf("%v_%v", metadata.UID, metadata.ResourceVersion) } diff --git a/tpr/kubernetesWatchTrigger.go b/tpr/kubernetesWatchTrigger.go index 3255fd21..e679ba9c 100644 --- a/tpr/kubernetesWatchTrigger.go +++ b/tpr/kubernetesWatchTrigger.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Kuberneteswatchtrigger) (*Kuberneteswatchtrigger, error) Get(name string) (*Kuberneteswatchtrigger, error) Update(*Kuberneteswatchtrigger) (*Kuberneteswatchtrigger, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*KuberneteswatchtriggerList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*KuberneteswatchtriggerList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } kubernetesWatchTriggerClient struct { @@ -85,7 +86,7 @@ func (c *kubernetesWatchTriggerClient) Update(obj *Kuberneteswatchtrigger) (*Kub return &result, nil } -func (c *kubernetesWatchTriggerClient) Delete(name string, opts *api.DeleteOptions) error { +func (c *kubernetesWatchTriggerClient) Delete(name string, opts *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.namespace). Resource("kuberneteswatchtriggers"). @@ -95,12 +96,12 @@ func (c *kubernetesWatchTriggerClient) Delete(name string, opts *api.DeleteOptio Error() } -func (c *kubernetesWatchTriggerClient) List(opts api.ListOptions) (*KuberneteswatchtriggerList, error) { +func (c *kubernetesWatchTriggerClient) List(opts metav1.ListOptions) (*KuberneteswatchtriggerList, error) { var result KuberneteswatchtriggerList err := c.client.Get(). Namespace(c.namespace). Resource("kuberneteswatchtriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (c *kubernetesWatchTriggerClient) List(opts api.ListOptions) (*Kuberneteswa return &result, nil } -func (c *kubernetesWatchTriggerClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (c *kubernetesWatchTriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.namespace). Resource("kuberneteswatchtriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/messagequeuetrigger.go b/tpr/messagequeuetrigger.go index 61f08e8e..e20335ff 100644 --- a/tpr/messagequeuetrigger.go +++ b/tpr/messagequeuetrigger.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Messagequeuetrigger) (*Messagequeuetrigger, error) Get(name string) (*Messagequeuetrigger, error) Update(*Messagequeuetrigger) (*Messagequeuetrigger, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*MessagequeuetriggerList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*MessagequeuetriggerList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } messagequeuetriggerClient struct { @@ -85,7 +86,7 @@ func (fc *messagequeuetriggerClient) Update(f *Messagequeuetrigger) (*Messageque return &result, nil } -func (fc *messagequeuetriggerClient) Delete(name string, opts *api.DeleteOptions) error { +func (fc *messagequeuetriggerClient) Delete(name string, opts *metav1.DeleteOptions) error { return fc.client.Delete(). Namespace(fc.namespace). Resource("messagequeuetriggers"). @@ -95,12 +96,12 @@ func (fc *messagequeuetriggerClient) Delete(name string, opts *api.DeleteOptions Error() } -func (fc *messagequeuetriggerClient) List(opts api.ListOptions) (*MessagequeuetriggerList, error) { +func (fc *messagequeuetriggerClient) List(opts metav1.ListOptions) (*MessagequeuetriggerList, error) { var result MessagequeuetriggerList err := fc.client.Get(). Namespace(fc.namespace). Resource("messagequeuetriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (fc *messagequeuetriggerClient) List(opts api.ListOptions) (*Messagequeuetr return &result, nil } -func (fc *messagequeuetriggerClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (fc *messagequeuetriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return fc.client.Get(). Prefix("watch"). Namespace(fc.namespace). Resource("messagequeuetriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/package.go b/tpr/package.go index 47540937..8457ae85 100644 --- a/tpr/package.go +++ b/tpr/package.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Package) (*Package, error) Get(name string) (*Package, error) Update(*Package) (*Package, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*PackageList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*PackageList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } packageClient struct { @@ -85,7 +86,7 @@ func (c *packageClient) Update(f *Package) (*Package, error) { return &result, nil } -func (c *packageClient) Delete(name string, opts *api.DeleteOptions) error { +func (c *packageClient) Delete(name string, opts *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.namespace). Resource("packages"). @@ -95,12 +96,12 @@ func (c *packageClient) Delete(name string, opts *api.DeleteOptions) error { Error() } -func (c *packageClient) List(opts api.ListOptions) (*PackageList, error) { +func (c *packageClient) List(opts metav1.ListOptions) (*PackageList, error) { var result PackageList err := c.client.Get(). Namespace(c.namespace). Resource("packages"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (c *packageClient) List(opts api.ListOptions) (*PackageList, error) { return &result, nil } -func (c *packageClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (c *packageClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.namespace). Resource("packages"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/timetrigger.go b/tpr/timetrigger.go index 600bfe56..3294dbc8 100644 --- a/tpr/timetrigger.go +++ b/tpr/timetrigger.go @@ -17,9 +17,10 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/watch" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" ) type ( @@ -27,9 +28,9 @@ type ( Create(*Timetrigger) (*Timetrigger, error) Get(name string) (*Timetrigger, error) Update(*Timetrigger) (*Timetrigger, error) - Delete(name string, options *api.DeleteOptions) error - List(opts api.ListOptions) (*TimetriggerList, error) - Watch(opts api.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + List(opts metav1.ListOptions) (*TimetriggerList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) } timetriggerClient struct { @@ -85,7 +86,7 @@ func (fc *timetriggerClient) Update(f *Timetrigger) (*Timetrigger, error) { return &result, nil } -func (fc *timetriggerClient) Delete(name string, opts *api.DeleteOptions) error { +func (fc *timetriggerClient) Delete(name string, opts *metav1.DeleteOptions) error { return fc.client.Delete(). Namespace(fc.namespace). Resource("timetriggers"). @@ -95,12 +96,12 @@ func (fc *timetriggerClient) Delete(name string, opts *api.DeleteOptions) error Error() } -func (fc *timetriggerClient) List(opts api.ListOptions) (*TimetriggerList, error) { +func (fc *timetriggerClient) List(opts metav1.ListOptions) (*TimetriggerList, error) { var result TimetriggerList err := fc.client.Get(). Namespace(fc.namespace). Resource("timetriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(&result) if err != nil { @@ -109,11 +110,11 @@ func (fc *timetriggerClient) List(opts api.ListOptions) (*TimetriggerList, error return &result, nil } -func (fc *timetriggerClient) Watch(opts api.ListOptions) (watch.Interface, error) { +func (fc *timetriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { return fc.client.Get(). Prefix("watch"). Namespace(fc.namespace). Resource("timetriggers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/tpr/tpr.go b/tpr/tpr.go index 108bedb8..4f542108 100644 --- a/tpr/tpr.go +++ b/tpr/tpr.go @@ -17,17 +17,17 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api/errors" - "k8s.io/client-go/1.5/pkg/api/v1" - "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/pkg/apis/extensions/v1beta1" ) // ensureTPR checks if the given TPR type exists, and creates it if // needed. (Note that this creates the TPR type; it doesn't create any // _instances_ of that type.) func ensureTPR(clientset *kubernetes.Clientset, tpr *v1beta1.ThirdPartyResource) error { - _, err := clientset.Extensions().ThirdPartyResources().Get(tpr.ObjectMeta.Name) + _, err := clientset.Extensions().ThirdPartyResources().Get(tpr.ObjectMeta.Name, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { _, err := clientset.Extensions().ThirdPartyResources().Create(tpr) @@ -42,7 +42,7 @@ func ensureTPR(clientset *kubernetes.Clientset, tpr *v1beta1.ThirdPartyResource) func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { tprs := []v1beta1.ThirdPartyResource{ { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "function.fission.io", }, Versions: []v1beta1.APIVersion{ @@ -51,7 +51,7 @@ func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { Description: "Functions", }, { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "environment.fission.io", }, Versions: []v1beta1.APIVersion{ @@ -60,7 +60,7 @@ func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { Description: "Environments (function containers)", }, { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "httptrigger.fission.io", }, Versions: []v1beta1.APIVersion{ @@ -69,7 +69,7 @@ func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { Description: "HTTP triggers for functions", }, { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "kuberneteswatchtrigger.fission.io", }, Versions: []v1beta1.APIVersion{ @@ -78,7 +78,7 @@ func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { Description: "Kubernetes watch triggers for functions", }, { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "timetrigger.fission.io", }, Versions: []v1beta1.APIVersion{ @@ -87,7 +87,7 @@ func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { Description: "Time-based triggers for functions", }, { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "messagequeuetrigger.fission.io", }, Versions: []v1beta1.APIVersion{ @@ -96,7 +96,7 @@ func EnsureFissionTPRs(clientset *kubernetes.Clientset) error { Description: "Message queue triggers for functions", }, { - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "package.fission.io", }, Versions: []v1beta1.APIVersion{ diff --git a/tpr/tpr_test.go b/tpr/tpr_test.go index 9c6ab3cc..7e18c8a0 100644 --- a/tpr/tpr_test.go +++ b/tpr/tpr_test.go @@ -22,9 +22,8 @@ import ( "testing" "time" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/unversioned" - "k8s.io/client-go/1.5/rest" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/rest" "github.com/fission/fission" ) @@ -38,11 +37,11 @@ func panicIf(err error) { func functionTests(tprClient *rest.RESTClient) { // sample function object function := &Function{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Function", APIVersion: "fission.io/v1", }, - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "hello", }, Spec: fission.FunctionSpec{ @@ -60,7 +59,7 @@ func functionTests(tprClient *rest.RESTClient) { } // Test function CRUD - fi := MakeFunctionInterface(tprClient, api.NamespaceDefault) + fi := MakeFunctionInterface(tprClient, metav1.NamespaceDefault) // cleanup from old crashed tests, ignore errors fi.Delete(function.Metadata.Name, nil) @@ -89,7 +88,7 @@ func functionTests(tprClient *rest.RESTClient) { log.Printf("f.Metadata = %#v", f.Metadata) // list - fl, err := fi.List(api.ListOptions{}) + fl, err := fi.List(metav1.ListOptions{}) panicIf(err) if len(fl.Items) != 1 { log.Panicf("wrong count from list: %v", fl) @@ -103,7 +102,7 @@ func functionTests(tprClient *rest.RESTClient) { panicIf(err) // start a watch - wi, err := fi.Watch(api.ListOptions{}) + wi, err := fi.Watch(metav1.ListOptions{}) panicIf(err) start := time.Now() @@ -135,11 +134,11 @@ func functionTests(tprClient *rest.RESTClient) { func environmentTests(tprClient *rest.RESTClient) { // sample environment object environment := &Environment{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Environment", APIVersion: "fission.io/v1", }, - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "hello", }, Spec: fission.EnvironmentSpec{ @@ -154,7 +153,7 @@ func environmentTests(tprClient *rest.RESTClient) { } // Test environment CRUD - ei := MakeEnvironmentInterface(tprClient, api.NamespaceDefault) + ei := MakeEnvironmentInterface(tprClient, metav1.NamespaceDefault) // cleanup from old crashed tests, ignore errors ei.Delete(environment.Metadata.Name, nil) @@ -179,7 +178,7 @@ func environmentTests(tprClient *rest.RESTClient) { panicIf(err) // list - el, err := ei.List(api.ListOptions{}) + el, err := ei.List(metav1.ListOptions{}) panicIf(err) if len(el.Items) != 1 { log.Panicf("wrong count from list: %v", len(el.Items)) @@ -193,7 +192,7 @@ func environmentTests(tprClient *rest.RESTClient) { panicIf(err) // start a watch - wi, err := ei.Watch(api.ListOptions{}) + wi, err := ei.Watch(metav1.ListOptions{}) panicIf(err) start := time.Now() @@ -225,11 +224,11 @@ func environmentTests(tprClient *rest.RESTClient) { func httpTriggerTests(tprClient *rest.RESTClient) { // sample httpTrigger object httpTrigger := &Httptrigger{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Httptrigger", APIVersion: "fission.io/v1", }, - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "hello", }, Spec: fission.HTTPTriggerSpec{ @@ -243,7 +242,7 @@ func httpTriggerTests(tprClient *rest.RESTClient) { } // Test httpTrigger CRUD - ei := MakeHttptriggerInterface(tprClient, api.NamespaceDefault) + ei := MakeHttptriggerInterface(tprClient, metav1.NamespaceDefault) // cleanup from old crashed tests, ignore errors ei.Delete(httpTrigger.Metadata.Name, nil) @@ -268,7 +267,7 @@ func httpTriggerTests(tprClient *rest.RESTClient) { panicIf(err) // list - el, err := ei.List(api.ListOptions{}) + el, err := ei.List(metav1.ListOptions{}) panicIf(err) if len(el.Items) != 1 { log.Panicf("wrong count from list: %v", el) @@ -282,7 +281,7 @@ func httpTriggerTests(tprClient *rest.RESTClient) { panicIf(err) // start a watch - wi, err := ei.Watch(api.ListOptions{}) + wi, err := ei.Watch(metav1.ListOptions{}) panicIf(err) start := time.Now() @@ -314,11 +313,11 @@ func httpTriggerTests(tprClient *rest.RESTClient) { func kubernetesWatchTriggerTests(tprClient *rest.RESTClient) { // sample kubernetesWatchTrigger object kubernetesWatchTrigger := &Kuberneteswatchtrigger{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Kuberneteswatchtrigger", APIVersion: "fission.io/v1", }, - Metadata: api.ObjectMeta{ + Metadata: metav1.ObjectMeta{ Name: "hello", }, Spec: fission.KubernetesWatchTriggerSpec{ @@ -335,7 +334,7 @@ func kubernetesWatchTriggerTests(tprClient *rest.RESTClient) { } // Test kubernetesWatchTrigger CRUD - ei := MakeKuberneteswatchtriggerInterface(tprClient, api.NamespaceDefault) + ei := MakeKuberneteswatchtriggerInterface(tprClient, metav1.NamespaceDefault) // cleanup from old crashed tests, ignore errors ei.Delete(kubernetesWatchTrigger.Metadata.Name, nil) @@ -360,7 +359,7 @@ func kubernetesWatchTriggerTests(tprClient *rest.RESTClient) { panicIf(err) // list - el, err := ei.List(api.ListOptions{}) + el, err := ei.List(metav1.ListOptions{}) panicIf(err) if len(el.Items) != 1 { log.Panicf("wrong count from list: %v", el) @@ -374,7 +373,7 @@ func kubernetesWatchTriggerTests(tprClient *rest.RESTClient) { panicIf(err) // start a watch - wi, err := ei.Watch(api.ListOptions{}) + wi, err := ei.Watch(metav1.ListOptions{}) panicIf(err) start := time.Now() diff --git a/tpr/types.go b/tpr/types.go index 77c073cf..38e97659 100644 --- a/tpr/types.go +++ b/tpr/types.go @@ -17,9 +17,8 @@ limitations under the License. package tpr import ( - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/meta" - "k8s.io/client-go/1.5/pkg/api/unversioned" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" "github.com/fission/fission" ) @@ -40,41 +39,41 @@ import ( type ( // Packages. Think of these as function-level images. Package struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.PackageSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.PackageSpec `json:"spec"` Status fission.PackageStatus `json:"status"` } PackageList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Package `json:"items"` } // Functions. Function struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.FunctionSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.FunctionSpec `json:"spec"` } FunctionList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Function `json:"items"` } // Environments. Environment struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.EnvironmentSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.EnvironmentSpec `json:"spec"` } EnvironmentList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Environment `json:"items"` } @@ -83,52 +82,52 @@ type ( // it to be spelled "Httptrigger" not "HTTPTrigger" or even // "HttpTrigger". Bleh.) Httptrigger struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.HTTPTriggerSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.HTTPTriggerSpec `json:"spec"` } HttptriggerList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Httptrigger `json:"items"` } // Kubernetes Watches as triggers Kuberneteswatchtrigger struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.KubernetesWatchTriggerSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.KubernetesWatchTriggerSpec `json:"spec"` } KuberneteswatchtriggerList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Kuberneteswatchtrigger `json:"items"` } // Time triggers Timetrigger struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.TimeTriggerSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.TimeTriggerSpec `json:"spec"` } TimetriggerList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Timetrigger `json:"items"` } // Message Queue triggers Messagequeuetrigger struct { - unversioned.TypeMeta `json:",inline"` - Metadata api.ObjectMeta `json:"metadata"` - Spec fission.MessageQueueTriggerSpec `json:"spec"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ObjectMeta `json:"metadata"` + Spec fission.MessageQueueTriggerSpec `json:"spec"` } MessagequeuetriggerList struct { - unversioned.TypeMeta `json:",inline"` - Metadata unversioned.ListMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + Metadata metav1.ListMeta `json:"metadata"` Items []Messagequeuetrigger `json:"items"` } @@ -143,90 +142,90 @@ type ( // And each list TPR type needs: // GetListMeta (to satisfy the ListMetaAccessor interface) -func (f *Function) GetObjectKind() unversioned.ObjectKind { +func (f *Function) GetObjectKind() schema.ObjectKind { return &f.TypeMeta } -func (e *Environment) GetObjectKind() unversioned.ObjectKind { +func (e *Environment) GetObjectKind() schema.ObjectKind { return &e.TypeMeta } -func (ht *Httptrigger) GetObjectKind() unversioned.ObjectKind { +func (ht *Httptrigger) GetObjectKind() schema.ObjectKind { return &ht.TypeMeta } -func (w *Kuberneteswatchtrigger) GetObjectKind() unversioned.ObjectKind { +func (w *Kuberneteswatchtrigger) GetObjectKind() schema.ObjectKind { return &w.TypeMeta } -func (w *Timetrigger) GetObjectKind() unversioned.ObjectKind { +func (w *Timetrigger) GetObjectKind() schema.ObjectKind { return &w.TypeMeta } -func (w *Messagequeuetrigger) GetObjectKind() unversioned.ObjectKind { +func (w *Messagequeuetrigger) GetObjectKind() schema.ObjectKind { return &w.TypeMeta } -func (w *Package) GetObjectKind() unversioned.ObjectKind { +func (w *Package) GetObjectKind() schema.ObjectKind { return &w.TypeMeta } -func (f *Function) GetObjectMeta() meta.Object { +func (f *Function) GetObjectMeta() metav1.Object { return &f.Metadata } -func (e *Environment) GetObjectMeta() meta.Object { +func (e *Environment) GetObjectMeta() metav1.Object { return &e.Metadata } -func (ht *Httptrigger) GetObjectMeta() meta.Object { +func (ht *Httptrigger) GetObjectMeta() metav1.Object { return &ht.Metadata } -func (w *Kuberneteswatchtrigger) GetObjectMeta() meta.Object { +func (w *Kuberneteswatchtrigger) GetObjectMeta() metav1.Object { return &w.Metadata } -func (w *Timetrigger) GetObjectMeta() meta.Object { +func (w *Timetrigger) GetObjectMeta() metav1.Object { return &w.Metadata } -func (w *Messagequeuetrigger) GetObjectMeta() meta.Object { +func (w *Messagequeuetrigger) GetObjectMeta() metav1.Object { return &w.Metadata } -func (w *Package) GetObjectMeta() meta.Object { +func (w *Package) GetObjectMeta() metav1.Object { return &w.Metadata } -func (fl *FunctionList) GetObjectKind() unversioned.ObjectKind { +func (fl *FunctionList) GetObjectKind() schema.ObjectKind { return &fl.TypeMeta } -func (el *EnvironmentList) GetObjectKind() unversioned.ObjectKind { +func (el *EnvironmentList) GetObjectKind() schema.ObjectKind { return &el.TypeMeta } -func (hl *HttptriggerList) GetObjectKind() unversioned.ObjectKind { +func (hl *HttptriggerList) GetObjectKind() schema.ObjectKind { return &hl.TypeMeta } -func (wl *KuberneteswatchtriggerList) GetObjectKind() unversioned.ObjectKind { +func (wl *KuberneteswatchtriggerList) GetObjectKind() schema.ObjectKind { return &wl.TypeMeta } -func (wl *TimetriggerList) GetObjectKind() unversioned.ObjectKind { +func (wl *TimetriggerList) GetObjectKind() schema.ObjectKind { return &wl.TypeMeta } -func (wl *MessagequeuetriggerList) GetObjectKind() unversioned.ObjectKind { +func (wl *MessagequeuetriggerList) GetObjectKind() schema.ObjectKind { return &wl.TypeMeta } -func (wl *PackageList) GetObjectKind() unversioned.ObjectKind { +func (wl *PackageList) GetObjectKind() schema.ObjectKind { return &wl.TypeMeta } -func (fl *FunctionList) GetListMeta() unversioned.List { +func (fl *FunctionList) GetListMeta() metav1.List { return &fl.Metadata } -func (el *EnvironmentList) GetListMeta() unversioned.List { +func (el *EnvironmentList) GetListMeta() metav1.List { return &el.Metadata } -func (hl *HttptriggerList) GetListMeta() unversioned.List { +func (hl *HttptriggerList) GetListMeta() metav1.List { return &hl.Metadata } -func (wl *KuberneteswatchtriggerList) GetListMeta() unversioned.List { +func (wl *KuberneteswatchtriggerList) GetListMeta() metav1.List { return &wl.Metadata } -func (wl *TimetriggerList) GetListMeta() unversioned.List { +func (wl *TimetriggerList) GetListMeta() metav1.List { return &wl.Metadata } -func (wl *MessagequeuetriggerList) GetListMeta() unversioned.List { +func (wl *MessagequeuetriggerList) GetListMeta() metav1.List { return &wl.Metadata } -func (wl *PackageList) GetListMeta() unversioned.List { +func (wl *PackageList) GetListMeta() metav1.List { return &wl.Metadata } diff --git a/types.go b/types.go index 37960efc..af957529 100644 --- a/types.go +++ b/types.go @@ -16,7 +16,9 @@ limitations under the License. package fission -import "k8s.io/client-go/1.5/pkg/api" +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) type ( // @@ -240,7 +242,7 @@ type ( URL string `json:"url"` // Metatdata - FunctionMetadata *api.ObjectMeta + FunctionMetadata *metav1.ObjectMeta } )