1
0
mirror of https://github.com/rancher/types.git synced 2025-09-09 00:48:56 +00:00

Update norman

This commit is contained in:
Darren Shepherd
2017-12-05 14:19:35 -07:00
parent e7e7b69880
commit 8873bb7c6b
3 changed files with 12 additions and 12 deletions

View File

@@ -3,5 +3,5 @@ github.com/rancher/types
k8s.io/kubernetes v1.8.3 transitive=true,staging=true
bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git
github.com/rancher/norman 18d3f69aa84ed39326e731ebfa509cf104bf9ad1 transitive=true
github.com/rancher/norman eef2c6ee6e9445c5c45613ab0001f99ab79476ff
golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5

View File

@@ -9,7 +9,7 @@ import (
)
type {{.schema.CodeName}}Lifecycle interface {
Initialize(obj *{{.prefix}}{{.schema.CodeName}}) error
Create(obj *{{.prefix}}{{.schema.CodeName}}) error
Remove(obj *{{.prefix}}{{.schema.CodeName}}) error
Updated(obj *{{.prefix}}{{.schema.CodeName}}) error
}
@@ -18,8 +18,8 @@ type {{.schema.ID}}LifecycleAdapter struct {
lifecycle {{.schema.CodeName}}Lifecycle
}
func (w *{{.schema.ID}}LifecycleAdapter) Initialize(obj runtime.Object) error {
return w.lifecycle.Initialize(obj.(*{{.prefix}}{{.schema.CodeName}}))
func (w *{{.schema.ID}}LifecycleAdapter) Create(obj runtime.Object) error {
return w.lifecycle.Create(obj.(*{{.prefix}}{{.schema.CodeName}}))
}
func (w *{{.schema.ID}}LifecycleAdapter) Finalize(obj runtime.Object) error {

View File

@@ -9,11 +9,11 @@ import (
)
var (
initialized = "io.cattle.lifecycle.initialized"
created = "io.cattle.lifecycle.create"
)
type ObjectLifecycle interface {
Initialize(obj runtime.Object) error
Create(obj runtime.Object) error
Finalize(obj runtime.Object) error
Updated(obj runtime.Object) error
}
@@ -47,7 +47,7 @@ func (o *objectLifecycleAdapter) sync(key string, obj runtime.Object) error {
return err
}
if cont, err := o.initialize(metadata, obj); err != nil || !cont {
if cont, err := o.create(metadata, obj); err != nil || !cont {
return err
}
@@ -87,12 +87,12 @@ func (o *objectLifecycleAdapter) finalize(metadata metav1.Object, obj runtime.Ob
return false, err
}
func (o *objectLifecycleAdapter) initializeKey() string {
return initialized + "." + o.name
func (o *objectLifecycleAdapter) createKey() string {
return created + "." + o.name
}
func (o *objectLifecycleAdapter) initialize(metadata metav1.Object, obj runtime.Object) (bool, error) {
initialized := o.initializeKey()
func (o *objectLifecycleAdapter) create(metadata metav1.Object, obj runtime.Object) (bool, error) {
initialized := o.createKey()
if metadata.GetLabels()[initialized] == "true" {
return true, nil
@@ -110,7 +110,7 @@ func (o *objectLifecycleAdapter) initialize(metadata metav1.Object, obj runtime.
metadata.SetFinalizers(append(metadata.GetFinalizers(), o.name))
metadata.GetLabels()[initialized] = "true"
if err := o.lifecycle.Initialize(obj); err != nil {
if err := o.lifecycle.Create(obj); err != nil {
return false, err
}