Add CanaryDeployment kind

- bootstrap the deployments. services and Istio virtual service
- use google/go-cmp to detect changes in the deployment pod spec

pkg/apis/flagger/v1beta1/register.go

@@ -47,6 +47,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Canary{},
 		&CanaryList{},
+		&CanaryDeployment{},
+		&CanaryDeploymentList{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil

pkg/apis/flagger/v1beta1/types.go

@@ -17,9 +17,12 @@ limitations under the License.
 package v1beta1
 
 import (
+	hpav1 "k8s.io/api/autoscaling/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const CanaryDeploymentKind  = "CanaryDeployment"
+
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
@@ -41,6 +44,23 @@ type CanarySpec struct {
 	VirtualService VirtualService `json:"virtualService"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// CanaryList is a list of Canary resources
+type CanaryList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+
+	Items []Canary `json:"items"`
+}
+
+// CanaryStatus is used for state persistence (read-only)
+type CanaryStatus struct {
+	State          string `json:"state"`
+	CanaryRevision string `json:"canaryRevision"`
+	FailedChecks   int    `json:"failedChecks"`
+}
+
 type Target struct {
 	Name string `json:"name"`
 	Host string `json:"host"`
@@ -63,19 +83,49 @@ type Metric struct {
 	Threshold int    `json:"threshold"`
 }
 
-// CanaryStatus is the status for a Canary resource
-type CanaryStatus struct {
-	State          string `json:"state"`
-	CanaryRevision string `json:"canaryRevision"`
-	FailedChecks   int    `json:"failedChecks"`
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Canary is a specification for a Canary resource
+type CanaryDeployment struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   CanaryDeploymentSpec   `json:"spec"`
+	Status CanaryDeploymentStatus `json:"status"`
+}
+
+// CanarySpec is the spec for a Canary resource
+type CanaryDeploymentSpec struct {
+	// reference to target resource
+	TargetRef hpav1.CrossVersionObjectReference `json:"targetRef"`
+
+	// virtual service spec
+	Service CanaryDeploymentService `json:"service"`
+
+	// metrics and thresholds
+	CanaryAnalysis CanaryAnalysis `json:"canaryAnalysis"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // CanaryList is a list of Canary resources
-type CanaryList struct {
+type CanaryDeploymentList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata"`
 
-	Items []Canary `json:"items"`
+	Items []CanaryDeployment `json:"items"`
+}
+
+// CanaryStatus is used for state persistence (read-only)
+type CanaryDeploymentStatus struct {
+	State          string `json:"state"`
+	CanaryRevision string `json:"canaryRevision"`
+	FailedChecks   int    `json:"failedChecks"`
+}
+
+type CanaryDeploymentService struct {
+	Port     int32      `json:"port"`
+	Gateways []string `json:"gateways"`
+	Hosts    []string `json:"hosts"`
 }

pkg/apis/flagger/v1beta1/zz_generated.deepcopy.go

@@ -73,6 +73,128 @@ func (in *CanaryAnalysis) DeepCopy() *CanaryAnalysis {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CanaryDeployment) DeepCopyInto(out *CanaryDeployment) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	out.Status = in.Status
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryDeployment.
+func (in *CanaryDeployment) DeepCopy() *CanaryDeployment {
+	if in == nil {
+		return nil
+	}
+	out := new(CanaryDeployment)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *CanaryDeployment) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CanaryDeploymentList) DeepCopyInto(out *CanaryDeploymentList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	out.ListMeta = in.ListMeta
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]CanaryDeployment, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryDeploymentList.
+func (in *CanaryDeploymentList) DeepCopy() *CanaryDeploymentList {
+	if in == nil {
+		return nil
+	}
+	out := new(CanaryDeploymentList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *CanaryDeploymentList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CanaryDeploymentService) DeepCopyInto(out *CanaryDeploymentService) {
+	*out = *in
+	if in.Gateways != nil {
+		in, out := &in.Gateways, &out.Gateways
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.Hosts != nil {
+		in, out := &in.Hosts, &out.Hosts
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryDeploymentService.
+func (in *CanaryDeploymentService) DeepCopy() *CanaryDeploymentService {
+	if in == nil {
+		return nil
+	}
+	out := new(CanaryDeploymentService)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CanaryDeploymentSpec) DeepCopyInto(out *CanaryDeploymentSpec) {
+	*out = *in
+	out.TargetRef = in.TargetRef
+	in.Service.DeepCopyInto(&out.Service)
+	in.CanaryAnalysis.DeepCopyInto(&out.CanaryAnalysis)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryDeploymentSpec.
+func (in *CanaryDeploymentSpec) DeepCopy() *CanaryDeploymentSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(CanaryDeploymentSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CanaryDeploymentStatus) DeepCopyInto(out *CanaryDeploymentStatus) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryDeploymentStatus.
+func (in *CanaryDeploymentStatus) DeepCopy() *CanaryDeploymentStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(CanaryDeploymentStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CanaryList) DeepCopyInto(out *CanaryList) {
 	*out = *in