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

Update k8s client version to 4.0.0 (#351)

Browse Source 
Move to client-go v4.0.0 from 1.5.
This commit is contained in:
Ta-Ching Chen
2017-09-29 07:37:36 -07:00
committed by Soam Vasani
parent e4d42797e6
commit a25c167d23
66 changed files with 825 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fission/function.go
+23 -23
View File
@@ -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")