Add webhooks to Canary CRD v1alpha2

cmd/flagger/main.go

@@ -77,7 +77,7 @@ func main() {
 	}
 
 	flaggerInformerFactory := informers.NewSharedInformerFactory(flaggerClient, time.Second*30)
-	canaryInformer := flaggerInformerFactory.Flagger().V1alpha1().Canaries()
+	canaryInformer := flaggerInformerFactory.Flagger().V1alpha2().Canaries()
 
 	logger.Infof("Starting flagger version %s revision %s", version.VERSION, version.REVISION)
 

pkg/apis/flagger/v1alpha1/doc.go → pkg/apis/flagger/v1alpha2/doc.go

@@ -16,6 +16,6 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-// Package v1alpha1 is the v1alpha1 version of the API.
+// Package v1alpha2 is the v1alpha2 version of the API.
 // +groupName=flagger.app
-package v1alpha1
+package v1alpha2

pkg/apis/flagger/v1alpha1/register.go → pkg/apis/flagger/v1alpha2/register.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha2
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,7 +25,7 @@ import (
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: rollout.GroupName, Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: rollout.GroupName, Version: "v1alpha2"}
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind
 func Kind(kind string) schema.GroupKind {

pkg/apis/flagger/v1alpha1/types.go → pkg/apis/flagger/v1alpha2/types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha2
 
 import (
 	hpav1 "k8s.io/api/autoscaling/v1"
@@ -96,19 +96,30 @@ type CanaryService struct {
 
 // CanaryAnalysis is used to describe how the analysis should be done
 type CanaryAnalysis struct {
-	Threshold  int            `json:"threshold"`
-	MaxWeight  int            `json:"maxWeight"`
-	StepWeight int            `json:"stepWeight"`
-	Metrics    []CanaryMetric `json:"metrics"`
+	Threshold  int             `json:"threshold"`
+	MaxWeight  int             `json:"maxWeight"`
+	StepWeight int             `json:"stepWeight"`
+	Metrics    []CanaryMetric  `json:"metrics"`
+	Webhooks   []CanaryWebhook `json:"webhooks,omitempty"`
 }
 
-// CanaryMetric hold the reference to Istio metrics used for canary analysis
+// CanaryMetric holds the reference to Istio metrics used for canary analysis
 type CanaryMetric struct {
 	Name      string `json:"name"`
 	Interval  string `json:"interval"`
 	Threshold int    `json:"threshold"`
 }
 
+// CanaryWebhook holds the reference to external checks used for canary analysis
+type CanaryWebhook struct {
+	Name    string `json:"name"`
+	URL     string `json:"url"`
+	Timeout string `json:"timeout"`
+	// +optional
+	Metadata *map[string]string `json:"metadata,omitempty"`
+}
+
+// GetProgressDeadlineSeconds returns the progress deadline (default 600s)
 func (c *Canary) GetProgressDeadlineSeconds() int {
 	if c.Spec.ProgressDeadlineSeconds != nil {
 		return int(*c.Spec.ProgressDeadlineSeconds)