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/environment.go
+9 -9
View File
@@ -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")
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")
fission/httptrigger.go
+7 -7
View File
@@ -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")
fission/mqtrigger.go
+7 -7
View File
@@ -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")
fission/timetrigger.go
+7 -7
View File
@@ -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")
fission/upgrade.go
+7 -7
View File
@@ -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,
})
fission/watch.go
+5 -5
View File
@@ -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")