Use pointers for metadata because it is optional

and metadata parameter is nil on finalize. in response to PR feedback
fluxcd · Mar 31, 2020 · 3c23966 · 3c23966
1 parent 4e466b5
commit 3c23966
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/pkg/apis/flagger/v1beta1/canary.go b/pkg/apis/flagger/v1beta1/canary.go
@@ -171,15 +171,15 @@ type CanaryService struct {
 
  // Apex is metadata to add to the apex service
  // +optional
- Apex CustomMetadata `json:"apex,omitempty"`
+ Apex *CustomMetadata `json:"apex,omitempty"`
 
  // Primary is the metadata to add to the primary service
  // +optional
- Primary CustomMetadata `json:"primary,omitempty"`
+ Primary *CustomMetadata `json:"primary,omitempty"`
 
  // Canary is the metadata to add to the canary service
  // +optional
- Canary CustomMetadata `json:"canary,omitempty"`
+ Canary *CustomMetadata `json:"canary,omitempty"`
 }
 
 // CanaryAnalysis is used to describe how the analysis should be done

diff --git a/pkg/apis/flagger/v1beta1/zz_generated.deepcopy.go b/pkg/apis/flagger/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/router/kubernetes_default.go b/pkg/router/kubernetes_default.go
@@ -68,7 +68,7 @@ func (c *KubernetesDefaultRouter) GetRoutes(_ *flaggerv1.Canary) (primaryRoute i
  return 0, 0, nil
 }
 
-func (c *KubernetesDefaultRouter) reconcileService(canary *flaggerv1.Canary, name string, podSelector string, metadata flaggerv1.CustomMetadata) error {
+func (c *KubernetesDefaultRouter) reconcileService(canary *flaggerv1.Canary, name string, podSelector string, metadata *flaggerv1.CustomMetadata) error {
  portName := canary.Spec.Service.PortName
  if portName == "" {
  portName = "http"
@@ -218,7 +218,7 @@ func (c *KubernetesDefaultRouter) Finalize(canary *flaggerv1.Canary) error {
  return fmt.Errorf("service %s update error: %w", clone.Name, err)
  }
  } else {
- err = c.reconcileService(canary, apexName, canary.Spec.TargetRef.Name, canary.Spec.Service.Apex)
+ err = c.reconcileService(canary, apexName, canary.Spec.TargetRef.Name, nil)
  if err != nil {
  return fmt.Errorf("reconcileService failed: %w", err)
  }