@@ -23,7 +23,6 @@ import (
2323 "reflect"
2424 "strconv"
2525
26- "github.com/appscode/go/encoding/json/types"
2726 "github.com/davecgh/go-spew/spew"
2827 "github.com/fatih/structs"
2928 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -106,7 +105,7 @@ func MustAlreadyReconciled(o interface{}) bool {
106105}
107106
108107func AlreadyReconciled (o interface {}) (bool , error ) {
109- var generation , observedGeneration * types. IntHash
108+ var generation , observedGeneration int64
110109 var err error
111110
112111 switch obj := o .(type ) {
@@ -120,36 +119,36 @@ func AlreadyReconciled(o interface{}) (bool, error) {
120119 if err != nil {
121120 return false , err
122121 }
123- return observedGeneration . MatchGeneration ( generation ) , nil
122+ return observedGeneration == generation , nil
124123}
125124
126- func extractGenerationFromUnstructured (obj * unstructured.Unstructured ) (* types.IntHash , * types.IntHash , error ) {
127- generation := types .IntHashForGeneration (obj .GetGeneration ())
128-
125+ func extractGenerationFromUnstructured (obj * unstructured.Unstructured ) (int64 , int64 , error ) {
129126 val , found , err := unstructured .NestedFieldNoCopy (obj .Object , "status" , "observedGeneration" )
130127 if err != nil {
131- return nil , nil , err
128+ return - 1 , - 1 , err
132129 } else if ! found {
133- return nil , nil , fmt . Errorf ( "status.observedGeneration is missing" )
130+ return obj . GetGeneration (), - 1 , nil
134131 }
135- observedGeneration , err := types .ParseIntHash (val )
136-
137- return generation , observedGeneration , err
132+ observedGeneration , ok := val .(int64 )
133+ if ! ok {
134+ return - 1 , - 1 , fmt .Errorf ("%s %s/%s status.observedGeneration %+v is not int64" , obj .GroupVersionKind (), obj .GetNamespace (), obj .GetName (), val )
135+ }
136+ return obj .GetGeneration (), observedGeneration , nil
138137}
139138
140- func extractGenerationFromObject (obj metav1.Object ) (* types.IntHash , * types.IntHash , error ) {
141- generation := types .IntHashForGeneration (obj .GetGeneration ())
142-
139+ func extractGenerationFromObject (obj metav1.Object ) (int64 , int64 , error ) {
143140 st := structs .New (obj )
144141 fieldStatus , found := st .FieldOk ("Status" )
145142 if ! found {
146- return nil , nil , fmt . Errorf ( "status is missing" )
143+ return obj . GetGeneration (), - 1 , nil
147144 }
148145 fieldObsGen , found := fieldStatus .FieldOk ("ObservedGeneration" )
149146 if ! found {
150- return nil , nil , fmt . Errorf ( "status.observedGeneration is missing" )
147+ return obj . GetGeneration (), - 1 , nil
151148 }
152- observedGeneration , err := types .ParseIntHash (fieldObsGen .Value ())
153-
154- return generation , observedGeneration , err
149+ observedGeneration , ok := fieldObsGen .Value ().(int64 )
150+ if ! ok {
151+ return - 1 , - 1 , fmt .Errorf ("%s %s/%s status.observedGeneration %+v is not int64" , reflect .TypeOf (obj ).String (), obj .GetNamespace (), obj .GetName (), fieldObsGen .Value ())
152+ }
153+ return obj .GetGeneration (), observedGeneration , nil
155154}
0 commit comments