Make autoscalerRef optional

- use anyOf as a workaround for the openAPI object validation not accepting empty values - fix #23
fluxcd · Jan 11, 2019 · aa2c28c · aa2c28c
1 parent 1018540
commit aa2c28c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/artifacts/flagger/crd.yaml b/artifacts/flagger/crd.yaml
@@ -42,7 +42,9 @@ spec:
                 name:
                   type: string
             autoscalerRef:
-              type: object
+              anyOf:
+                - type: string
+                - type: object
               required: ['apiVersion', 'kind', 'name']
               properties:
                 apiVersion:

diff --git a/charts/flagger/templates/crd.yaml b/charts/flagger/templates/crd.yaml
@@ -43,7 +43,9 @@ spec:
                 name:
                   type: string
             autoscalerRef:
-              type: object
+              anyOf:
+                - type: string
+                - type: object
               required: ['apiVersion', 'kind', 'name']
               properties:
                 apiVersion:
@@ -98,5 +100,4 @@ spec:
                         timeout:
                           type: string
                           pattern: "^[0-9]+(m|s)"
-
 {{- end }}
diff --git a/pkg/apis/flagger/v1alpha3/types.go b/pkg/apis/flagger/v1alpha3/types.go
@@ -46,7 +46,8 @@ type CanarySpec struct {
 	TargetRef hpav1.CrossVersionObjectReference `json:"targetRef"`
 
 	// reference to autoscaling resource
-	AutoscalerRef hpav1.CrossVersionObjectReference `json:"autoscalerRef"`
+	// +optional
+	AutoscalerRef *hpav1.CrossVersionObjectReference `json:"autoscalerRef,omitempty"`
 
 	// virtual service spec
 	Service CanaryService `json:"service"`

diff --git a/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/controller/deployer.go b/pkg/controller/deployer.go
@@ -231,7 +231,7 @@ func (c *CanaryDeployer) Sync(cd *flaggerv1.Canary) error {
 		}
 	}
 
-	if cd.Spec.AutoscalerRef.Kind == "HorizontalPodAutoscaler" {
+	if cd.Spec.AutoscalerRef != nil && cd.Spec.AutoscalerRef.Kind == "HorizontalPodAutoscaler" {
 		if err := c.createPrimaryHpa(cd); err != nil {
 			return fmt.Errorf("creating hpa %s.%s failed: %v", primaryName, cd.Namespace, err)
 		}