Implement Targetable. (knative#2068)

* Implement Targetable.

This makes us stop populating LegacyTargetable and start populating Targetable.

* Preserve .status.domainInternal for now.

Author: mattmoor

Gopkg.lock

@@ -34,7 +34,7 @@ required = [
 [[constraint]]
   name = "github.com/knative/pkg"
   # HEAD as of 2018-09-20
-  revision = "a133825579436877df315e7cb6d8aeba49b9f575"
+  revision = "51f6214feeea1485dc8691a661d953fea1409402"
 
 [[constraint]]
   name = "github.com/knative/caching"

Gopkg.toml

@@ -78,9 +78,13 @@ status:
   #   along with a cluster-specific prefix (here, mydomain.com).
   domain: my-service.default.mydomain.com
 
-  # domainInternal: A DNS name for the default (traffic-split) route which can
-  # be accessed without leaving the cluster environment.
-  domainInternal: my-service.default.svc.cluster.local
+  targetable: # knative/pkg/apis/duck/v1alpha1.Targetable
+    # domainInternal: A DNS name for the default (traffic-split) route which can
+    # be accessed without leaving the cluster environment.
+    domainInternal: my-service.default.svc.cluster.local
+
+  # DEPRECATED: see targetable.domainInternal (above)
+  domainInternal: ...
 
   traffic:
   # current rollout status list. configurationName references
@@ -390,9 +394,13 @@ status:
   #   along with a cluster-specific prefix (here, mydomain.com).
   domain: myservice.default.mydomain.com
 
-  # domainInternal: A DNS name for the default (traffic-split) route which can
-  # be accessed without leaving the cluster environment.
-  domainInternal: myservice.default.svc.cluster.local
+  targetable: # knative/pkg/apis/duck/v1alpha1.Targetable
+    # domainInternal: A DNS name for the default (traffic-split) route which can
+    # be accessed without leaving the cluster environment.
+    domainInternal: myservice.default.svc.cluster.local
+
+  # DEPRECATED: see targetable.domainInternal (above)
+  domainInternal: ...
 
   # current rollout status list. configurationName references
   #   are dereferenced to latest revision

docs/spec/spec.md

@@ -59,6 +59,10 @@ var _ kmeta.OwnerRefable = (*Route)(nil)
 // Check that Route implements the Conditions duck type.
 var _ = duck.VerifyType(&Route{}, &duckv1alpha1.Conditions{})
 
+// Check that Route implements the [Legacy]Targetable duck type.
+var _ = duck.VerifyType(&Route{}, &duckv1alpha1.LegacyTargetable{})
+var _ = duck.VerifyType(&Route{}, &duckv1alpha1.Targetable{})
+
 // Check that Route implements the Generation duck type.
 var emptyGenRoute duckv1alpha1.Generation
 var _ = duck.VerifyType(&Route{}, &emptyGenRoute)
@@ -129,9 +133,14 @@ type RouteStatus struct {
 	// DomainInternal holds the top-level domain that will distribute traffic over the provided
 	// targets from inside the cluster. It generally has the form
 	// {route-name}.{route-namespace}.svc.cluster.local
+	// DEPRECATED: Use Targetable instead.
 	// +optional
 	DomainInternal string `json:"domainInternal,omitempty"`
 
+	// Targetable holds the information needed for a Route to be the target of an event.
+	// +optional
+	Targetable *duckv1alpha1.Targetable `json:"targetable,omitempty"`
+
 	// Traffic holds the configured traffic distribution.
 	// These entries will always contain RevisionName references.
 	// When ConfigurationName appears in the spec, this will hold the

pkg/apis/serving/v1alpha1/route_types.go

@@ -65,6 +65,10 @@ var _ duckv1alpha1.ConditionsAccessor = (*ServiceStatus)(nil)
 // Check that Service implements the Conditions duck type.
 var _ = duck.VerifyType(&Service{}, &duckv1alpha1.Conditions{})
 
+// Check that Route implements the [Legacy]Targetable duck type.
+var _ = duck.VerifyType(&Service{}, &duckv1alpha1.LegacyTargetable{})
+var _ = duck.VerifyType(&Service{}, &duckv1alpha1.Targetable{})
+
 // Check that Service implements the Generation duck type.
 var emptyGenService duckv1alpha1.Generation
 var _ = duck.VerifyType(&Service{}, &emptyGenService)
@@ -139,9 +143,14 @@ type ServiceStatus struct {
 	// DomainInternal holds the top-level domain that will distribute traffic over the provided
 	// targets from inside the cluster. It generally has the form
 	// {route-name}.{route-namespace}.svc.cluster.local
+	// DEPRECATED: Use Targetable instead.
 	// +optional
 	DomainInternal string `json:"domainInternal,omitempty"`
 
+	// Targetable holds the information needed for a Route to be the target of an event.
+	// +optional
+	Targetable *duckv1alpha1.Targetable `json:"targetable,omitempty"`
+
 	// From RouteStatus.
 	// Traffic holds the configured traffic distribution.
 	// These entries will always contain RevisionName references.
@@ -215,6 +224,7 @@ func (ss *ServiceStatus) PropagateConfigurationStatus(cs ConfigurationStatus) {
 func (ss *ServiceStatus) PropagateRouteStatus(rs RouteStatus) {
 	ss.Domain = rs.Domain
 	ss.DomainInternal = rs.DomainInternal
+	ss.Targetable = rs.Targetable
 	ss.Traffic = rs.Traffic
 
 	rc := rs.GetCondition(RouteConditionReady)

pkg/apis/serving/v1alpha1/service_types.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/equality"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 
+	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	"github.com/knative/serving/pkg/apis/serving/v1alpha1"
 	"github.com/knative/serving/pkg/reconciler/v1alpha1/route/resources"
 	resourcenames "github.com/knative/serving/pkg/reconciler/v1alpha1/route/resources/names"
@@ -98,8 +99,11 @@ func (c *Reconciler) reconcilePlaceholderService(ctx context.Context, route *v1a
 			}
 		}
 	}
-	// Update the route's domain internal field
+	// Update the information that makes us Targetable.
 	route.Status.DomainInternal = resourcenames.K8sServiceFullname(route)
+	route.Status.Targetable = &duckv1alpha1.Targetable{
+		DomainInternal: resourcenames.K8sServiceFullname(route),
+	}
 
 	// TODO(mattmoor): This is where we'd look at the state of the Service and
 	// reflect any necessary state into the Route.