Canary CRD refactoring

- set canaries.flagger.app version to v1alpha1
- replace old Canary spec with CanaryDeployment

pkg/controller/deployment.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"
-	flaggerv1 "github.com/stefanprodan/flagger/pkg/apis/flagger/v1beta1"
+	flaggerv1 "github.com/stefanprodan/flagger/pkg/apis/flagger/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -13,7 +13,7 @@ import (
 func (c *Controller) doRollouts() {
 	c.rollouts.Range(func(key interface{}, value interface{}) bool {
 		r := value.(*flaggerv1.Canary)
-		if r.Spec.TargetKind == "Deployment" {
+		if r.Spec.TargetRef.Kind == "Deployment" {
 			go c.advanceDeploymentRollout(r.Name, r.Namespace)
 		}
 		return true
@@ -27,6 +27,12 @@ func (c *Controller) advanceDeploymentRollout(name string, namespace string) {
 		return
 	}
 
+	err := c.bootstrapDeployment(r)
+	if err != nil {
+		c.recordEventWarningf(r, "%v", err)
+		return
+	}
+
 	// set max weight default value to 100%
 	maxWeight := 100
 	if r.Spec.CanaryAnalysis.MaxWeight > 0 {
@@ -34,13 +40,13 @@ func (c *Controller) advanceDeploymentRollout(name string, namespace string) {
 	}
 
 	// gate stage: check if canary deployment exists and is healthy
-	canary, ok := c.getCanaryDeployment(r, r.Spec.Canary.Name, r.Namespace)
+	canary, ok := c.getCanaryDeployment(r, r.Spec.TargetRef.Name, r.Namespace)
 	if !ok {
 		return
 	}
 
 	// gate stage: check if primary deployment exists and is healthy
-	primary, ok := c.getDeployment(r, r.Spec.Primary.Name, r.Namespace)
+	primary, ok := c.getDeployment(r, fmt.Sprintf("%s-primary", r.Spec.TargetRef.Name), r.Namespace)
 	if !ok {
 		return
 	}
@@ -60,7 +66,7 @@ func (c *Controller) advanceDeploymentRollout(name string, namespace string) {
 	// gate stage: check if the number of failed checks reached the threshold
 	if r.Status.State == "running" && r.Status.FailedChecks >= r.Spec.CanaryAnalysis.Threshold {
 		c.recordEventWarningf(r, "Rolling back %s.%s failed checks threshold reached %v",
-			r.Spec.Canary.Name, r.Namespace, r.Status.FailedChecks)
+			r.Name, r.Namespace, r.Status.FailedChecks)
 
 		// route all traffic back to primary
 		primaryRoute.Weight = 100
@@ -136,7 +142,7 @@ func (c *Controller) advanceDeploymentRollout(name string, namespace string) {
 }
 
 func (c *Controller) getRollout(name string, namespace string) (*flaggerv1.Canary, bool) {
-	r, err := c.rolloutClient.FlaggerV1beta1().Canaries(namespace).Get(name, v1.GetOptions{})
+	r, err := c.rolloutClient.FlaggerV1alpha1().Canaries(namespace).Get(name, v1.GetOptions{})
 	if err != nil {
 		c.logger.Errorf("Canary %s.%s not found", name, namespace)
 		return nil, false
@@ -146,19 +152,26 @@ func (c *Controller) getRollout(name string, namespace string) (*flaggerv1.Canar
 }
 
 func (c *Controller) checkRolloutStatus(r *flaggerv1.Canary, canary *appsv1.Deployment) bool {
-	var err error
+	canaryRevision, err := c.getDeploymentSpecEnc(canary)
+	if err != nil {
+		c.logger.Errorf("Canary %s.%s not found: %v", r.Name, r.Namespace, err)
+		return false
+	}
+
 	if r.Status.State == "" {
 		r.Status = flaggerv1.CanaryStatus{
-			State:          "running",
-			CanaryRevision: canary.ResourceVersion,
+			State:          "initialized",
+			CanaryRevision: canaryRevision,
 			FailedChecks:   0,
 		}
-		r, err = c.rolloutClient.FlaggerV1beta1().Canaries(r.Namespace).Update(r)
+		r, err = c.rolloutClient.FlaggerV1alpha1().Canaries(r.Namespace).Update(r)
 		if err != nil {
 			c.logger.Errorf("Canary %s.%s status update failed: %v", r.Name, r.Namespace, err)
 			return false
 		}
-		return true
+
+		c.recordEventInfof(r, "Initialization done! %s.%s", canary.GetName(), canary.Namespace)
+		return false
 	}
 
 	if r.Status.State == "running" {
@@ -166,38 +179,31 @@ func (c *Controller) checkRolloutStatus(r *flaggerv1.Canary, canary *appsv1.Depl
 	}
 
 	if r.Status.State == "promotion-finished" {
-		c.setCanaryRevision(r, "finished")
-		c.logger.Infof("Promotion completed! %s.%s revision %s", r.Spec.Canary.Name, r.Namespace,
-			c.getDeploymentRevision(r.Spec.Canary.Name, r.Namespace))
+		c.setCanaryRevision(r, canary, "finished")
+		c.logger.Infof("Promotion completed! %s.%s", r.Name, r.Namespace)
 		return false
 	}
 
 	if r.Status.State == "promotion-failed" {
-		c.setCanaryRevision(r, "failed")
-		c.logger.Infof("Promotion failed! %s.%s revision %s", r.Spec.Canary.Name, r.Namespace,
-			c.getDeploymentRevision(r.Spec.Canary.Name, r.Namespace))
+		c.setCanaryRevision(r, canary, "failed")
+		c.logger.Infof("Promotion failed! %s.%s", r.Name, r.Namespace)
 		return false
 	}
 
-	if r.Status.CanaryRevision != canary.ResourceVersion {
-		c.recordEventInfof(r, "New revision detected %s.%s old %s new %s",
-			canary.GetName(), canary.Namespace, r.Status.CanaryRevision, canary.ResourceVersion)
+	if diff, err := c.diffDeploymentSpec(r, canary); diff {
+		c.recordEventInfof(r, "New revision detected %s.%s",
+			canary.GetName(), canary.Namespace)
 		canary.Spec.Replicas = int32p(1)
 		canary, err = c.kubeClient.AppsV1().Deployments(canary.Namespace).Update(canary)
 		if err != nil {
 			c.recordEventErrorf(r, "Scaling up %s.%s failed: %v", canary.GetName(), canary.Namespace, err)
 			return false
 		}
+
 		r.Status = flaggerv1.CanaryStatus{
-			State:          "running",
-			CanaryRevision: canary.ResourceVersion,
-			FailedChecks:   0,
-		}
-		r, err = c.rolloutClient.FlaggerV1beta1().Canaries(r.Namespace).Update(r)
-		if err != nil {
-			c.logger.Errorf("Canary %s.%s status update failed: %v", r.Name, r.Namespace, err)
-			return false
+			FailedChecks: 0,
 		}
+		c.setCanaryRevision(r, canary, "running")
 		c.recordEventInfof(r, "Scaling up %s.%s", canary.GetName(), canary.Namespace)
 
 		return false
@@ -209,7 +215,7 @@ func (c *Controller) checkRolloutStatus(r *flaggerv1.Canary, canary *appsv1.Depl
 func (c *Controller) updateRolloutStatus(r *flaggerv1.Canary, status string) bool {
 	var err error
 	r.Status.State = status
-	r, err = c.rolloutClient.FlaggerV1beta1().Canaries(r.Namespace).Update(r)
+	r, err = c.rolloutClient.FlaggerV1alpha1().Canaries(r.Namespace).Update(r)
 	if err != nil {
 		c.logger.Errorf("Canary %s.%s status update failed: %v", r.Name, r.Namespace, err)
 		return false
@@ -220,7 +226,7 @@ func (c *Controller) updateRolloutStatus(r *flaggerv1.Canary, status string) boo
 func (c *Controller) updateRolloutFailedChecks(r *flaggerv1.Canary, val int) bool {
 	var err error
 	r.Status.FailedChecks = val
-	r, err = c.rolloutClient.FlaggerV1beta1().Canaries(r.Namespace).Update(r)
+	r, err = c.rolloutClient.FlaggerV1alpha1().Canaries(r.Namespace).Update(r)
 	if err != nil {
 		c.logger.Errorf("Canary %s.%s status update failed: %v", r.Name, r.Namespace, err)
 		return false
@@ -262,20 +268,10 @@ func (c *Controller) getCanaryDeployment(r *flaggerv1.Canary, name string, names
 	return dep, true
 }
 
-func (c *Controller) getDeploymentRevision(name string, namespace string) string {
-	dep, err := c.kubeClient.AppsV1().Deployments(namespace).Get(name, v1.GetOptions{})
-	if err != nil {
-		c.logger.Errorf("Deployment %s.%s not found", name, namespace)
-		return ""
-	}
-
-	return dep.ResourceVersion
-}
-
 func (c *Controller) checkDeploymentMetrics(r *flaggerv1.Canary) bool {
 	for _, metric := range r.Spec.CanaryAnalysis.Metrics {
 		if metric.Name == "istio_requests_total" {
-			val, err := c.getDeploymentCounter(r.Spec.Canary.Name, r.Namespace, metric.Name, metric.Interval)
+			val, err := c.getDeploymentCounter(r.Spec.TargetRef.Name, r.Namespace, metric.Name, metric.Interval)
 			if err != nil {
 				c.recordEventErrorf(r, "Metrics server %s query failed: %v", c.metricsServer, err)
 				return false
@@ -288,7 +284,7 @@ func (c *Controller) checkDeploymentMetrics(r *flaggerv1.Canary) bool {
 		}
 
 		if metric.Name == "istio_request_duration_seconds_bucket" {
-			val, err := c.GetDeploymentHistogram(r.Spec.Canary.Name, r.Namespace, metric.Name, metric.Interval)
+			val, err := c.GetDeploymentHistogram(r.Spec.TargetRef.Name, r.Namespace, metric.Name, metric.Interval)
 			if err != nil {
 				c.recordEventErrorf(r, "Metrics server %s query failed: %v", c.metricsServer, err)
 				return false
@@ -306,9 +302,9 @@ func (c *Controller) checkDeploymentMetrics(r *flaggerv1.Canary) bool {
 }
 
 func (c *Controller) scaleToZeroCanary(r *flaggerv1.Canary) {
-	canary, err := c.kubeClient.AppsV1().Deployments(r.Namespace).Get(r.Spec.Canary.Name, v1.GetOptions{})
+	canary, err := c.kubeClient.AppsV1().Deployments(r.Namespace).Get(r.Spec.TargetRef.Name, v1.GetOptions{})
 	if err != nil {
-		c.recordEventErrorf(r, "Deployment %s.%s not found", r.Spec.Canary.Name, r.Namespace)
+		c.recordEventErrorf(r, "Deployment %s.%s not found", r.Spec.TargetRef.Name, r.Namespace)
 		return
 	}
 	//HPA https://github.com/kubernetes/kubernetes/pull/29212
@@ -320,22 +316,15 @@ func (c *Controller) scaleToZeroCanary(r *flaggerv1.Canary) {
 	}
 }
 
-func (c *Controller) setCanaryRevision(r *flaggerv1.Canary, status string) {
-	canaryRevision := c.getDeploymentRevision(r.Spec.Canary.Name, r.Namespace)
-	r, ok := c.getRollout(r.Name, r.Namespace)
-	if !ok {
-		return
-	}
+func (c *Controller) setCanaryRevision(r *flaggerv1.Canary, canary *appsv1.Deployment, status string) {
 	r.Status = flaggerv1.CanaryStatus{
-		State:          status,
-		CanaryRevision: canaryRevision,
-		FailedChecks:   r.Status.FailedChecks,
+		State:        status,
+		FailedChecks: r.Status.FailedChecks,
 	}
-	r, err := c.rolloutClient.FlaggerV1beta1().Canaries(r.Namespace).Update(r)
+	err := c.saveDeploymentSpec(r, canary)
 	if err != nil {
 		c.logger.Errorf("Canary %s.%s status update failed: %v", r.Name, r.Namespace, err)
 	}
-	//c.logger.Infof("Canary %s.%s status %+v", r.Spec.Canary.Name, r.Namespace, r.Status)
 }
 
 func (c *Controller) getVirtualService(r *flaggerv1.Canary) (
@@ -345,18 +334,18 @@ func (c *Controller) getVirtualService(r *flaggerv1.Canary) (
 	ok bool,
 ) {
 	var err error
-	vs, err = c.istioClient.NetworkingV1alpha3().VirtualServices(r.Namespace).Get(r.Spec.VirtualService.Name, v1.GetOptions{})
+	vs, err = c.istioClient.NetworkingV1alpha3().VirtualServices(r.Namespace).Get(r.Name, v1.GetOptions{})
 	if err != nil {
-		c.recordEventErrorf(r, "VirtualService %s.%s not found", r.Spec.VirtualService.Name, r.Namespace)
+		c.recordEventErrorf(r, "VirtualService %s.%s not found", r.Name, r.Namespace)
 		return
 	}
 
 	for _, http := range vs.Spec.Http {
 		for _, route := range http.Route {
-			if route.Destination.Host == r.Spec.Primary.Host {
+			if route.Destination.Host == fmt.Sprintf("%s-primary", r.Spec.TargetRef.Name) {
 				primary = route
 			}
-			if route.Destination.Host == r.Spec.Canary.Host {
+			if route.Destination.Host == r.Spec.TargetRef.Name {
 				canary = route
 			}
 		}
@@ -364,7 +353,7 @@ func (c *Controller) getVirtualService(r *flaggerv1.Canary) (
 
 	if primary.Weight == 0 && canary.Weight == 0 {
 		c.recordEventErrorf(r, "VirtualService %s.%s does not contain routes for %s and %s",
-			r.Spec.VirtualService.Name, r.Namespace, r.Spec.Primary.Host, r.Spec.Canary.Host)
+			r.Name, r.Namespace, fmt.Sprintf("%s-primary", r.Spec.TargetRef.Name), r.Spec.TargetRef.Name)
 		return
 	}
 
@@ -387,7 +376,7 @@ func (c *Controller) updateVirtualServiceRoutes(
 	var err error
 	vs, err = c.istioClient.NetworkingV1alpha3().VirtualServices(r.Namespace).Update(vs)
 	if err != nil {
-		c.recordEventErrorf(r, "VirtualService %s.%s update failed: %v", r.Spec.VirtualService.Name, r.Namespace, err)
+		c.recordEventErrorf(r, "VirtualService %s.%s update failed: %v", r.Name, r.Namespace, err)
 		return false
 	}
 	return true