Enables status subresource in order to fix generation bumping

* This requires k8s 1.10 with CustomResourceSubresources feature gate
enabled

* Patching is used instead of update when adding labels
  - prevents bumping the generation since nested specs have a k8s
    Time struct which, during serialization, are not omitted
    when empty

#642

Signed-off-by: Brenda Chan <brchan@pivotal.io>

Author: dprotaso

configuration.yaml

@@ -23,3 +23,5 @@ spec:
     kind: Configuration
     plural: configurations
   scope: Namespaced
+  subresources:
+    status: {}

pkg/apis/ela/v1alpha1/configuration_types.go

@@ -47,12 +47,6 @@ type Configuration struct {
 
 // ConfigurationSpec holds the desired state of the Configuration (from the client).
 type ConfigurationSpec struct {
-	// TODO: Generation does not work correctly with CRD. They are scrubbed
-	// by the APIserver (https://github.com/kubernetes/kubernetes/issues/58778)
-	// So, we add Generation here. Once that gets fixed, remove this and use
-	// ObjectMeta.Generation instead.
-	Generation int64 `json:"generation,omitempty"`
-
 	// Build optionally holds the specification for the build to
 	// perform to produce the Revision's container image.
 	Build *build.BuildSpec `json:"build,omitempty"`
@@ -122,14 +116,6 @@ type ConfigurationList struct {
 	Items []Configuration `json:"items"`
 }
 
-func (r *Configuration) GetGeneration() int64 {
-	return r.Spec.Generation
-}
-
-func (r *Configuration) SetGeneration(generation int64) {
-	r.Spec.Generation = generation
-}
-
 func (r *Configuration) GetSpecJSON() ([]byte, error) {
 	return json.Marshal(r.Spec)
 }

pkg/apis/ela/v1alpha1/configuration_types_test.go

@@ -18,18 +18,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func TestConfigurationGeneration(t *testing.T) {
-	config := Configuration{}
-	if e, a := int64(0), config.GetGeneration(); e != a {
-		t.Errorf("empty revision generation should be 0 was: %d", a)
-	}
-
-	config.SetGeneration(5)
-	if e, a := int64(5), config.GetGeneration(); e != a {
-		t.Errorf("getgeneration mismatch expected: %d got: %d", e, a)
-	}
-}
-
 func TestConfigurationIsReady(t *testing.T) {
 	cases := []struct {
 		name    string

pkg/apis/ela/v1alpha1/revision_types.go

@@ -70,12 +70,6 @@ const (
 
 // RevisionSpec holds the desired state of the Revision (from the client).
 type RevisionSpec struct {
-	// TODO: Generation does not work correctly with CRD. They are scrubbed
-	// by the APIserver (https://github.com/kubernetes/kubernetes/issues/58778)
-	// So, we add Generation here. Once that gets fixed, remove this and use
-	// ObjectMeta.Generation instead.
-	Generation int64 `json:"generation,omitempty"`
-
 	// ServingState holds a value describing the desired state the Kubernetes
 	// resources should be in for this Revision.
 	// Users must not specify this when creating a revision. It is expected
@@ -167,14 +161,6 @@ type RevisionList struct {
 	Items []Revision `json:"items"`
 }
 
-func (r *Revision) GetGeneration() int64 {
-	return r.Spec.Generation
-}
-
-func (r *Revision) SetGeneration(generation int64) {
-	r.Spec.Generation = generation
-}
-
 func (r *Revision) GetSpecJSON() ([]byte, error) {
 	return json.Marshal(r.Spec)
 }

pkg/apis/ela/v1alpha1/revision_types_test.go

@@ -19,19 +19,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func TestGeneration(t *testing.T) {
-	r := Revision{}
-	if a := r.GetGeneration(); a != 0 {
-		t.Errorf("empty revision generation should be 0 was: %d", a)
-	}
-
-	r.SetGeneration(5)
-	if e, a := int64(5), r.GetGeneration(); e != a {
-		t.Errorf("getgeneration mismatch expected: %d got: %d", e, a)
-	}
-
-}
-
 func TestIsReady(t *testing.T) {
 	cases := []struct {
 		name    string

pkg/apis/ela/v1alpha1/route_types.go

@@ -71,12 +71,6 @@ type TrafficTarget struct {
 
 // RouteSpec holds the desired state of the Route (from the client).
 type RouteSpec struct {
-	// TODO: Generation does not work correctly with CRD. They are scrubbed
-	// by the APIserver (https://github.com/kubernetes/kubernetes/issues/58778)
-	// So, we add Generation here. Once that gets fixed, remove this and use
-	// ObjectMeta.Generation instead.
-	Generation int64 `json:"generation,omitempty"`
-
 	// Traffic specifies how to distribute traffic over a collection of Elafros Revisions and Configurations.
 	Traffic []TrafficTarget `json:"traffic,omitempty"`
 }
@@ -141,14 +135,6 @@ type RouteList struct {
 	Items []Route `json:"items"`
 }
 
-func (r *Route) GetGeneration() int64 {
-	return r.Spec.Generation
-}
-
-func (r *Route) SetGeneration(generation int64) {
-	r.Spec.Generation = generation
-}
-
 func (r *Route) GetSpecJSON() ([]byte, error) {
 	return json.Marshal(r.Spec)
 }

pkg/apis/ela/v1alpha1/service_types.go

@@ -36,14 +36,8 @@ type Service struct {
 }
 
 // ServiceSpec represents the configuration for the Service object.
-// Exactly one of its members (other than Generation) must be specified.
+// Exactly one of its members must be specified.
 type ServiceSpec struct {
-	// TODO: Generation does not work correctly with CRD. They are scrubbed
-	// by the APIserver (https://github.com/kubernetes/kubernetes/issues/58778)
-	// So, we add Generation here. Once that gets fixed, remove this and use
-	// ObjectMeta.Generation instead.
-	Generation int64 `json:"generation,omitempty"`
-
 	// RunLatest defines a simple Service. It will automatically
 	// configure a route that keeps the latest ready revision
 	// from the supplied configuration running.
@@ -108,14 +102,6 @@ type ServiceList struct {
 	Items []Service `json:"items"`
 }
 
-func (s *Service) GetGeneration() int64 {
-	return s.Spec.Generation
-}
-
-func (s *Service) SetGeneration(generation int64) {
-	s.Spec.Generation = generation
-}
-
 func (s *Service) GetSpecJSON() ([]byte, error) {
 	return json.Marshal(s.Spec)
 }