Merge pull request #745 from Nerja/delegate

Fix for VirtualService delegation when analysis is enabled
fluxcd · Dec 9, 2020 · bfb3331 · bfb3331
2 parents 0cfeceb + 7fc6f8a
commit bfb3331
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/router/istio.go b/pkg/router/istio.go
@@ -215,6 +215,12 @@ func (ir *IstioRouter) reconcileVirtualService(canary *flaggerv1.Canary) error {
 		return fmt.Errorf("VirtualService %s.%s get query error %v", apexName, canary.Namespace, err)
 	}
 
+	if canary.Spec.Service.Delegation {
+		// delegate VirtualService requires the hosts and gateway empty.
+		virtualService.Spec.Gateways = []string{}
+		virtualService.Spec.Hosts = []string{}
+	}
+
 	// update service but keep the original destination weights and mirror
 	if virtualService != nil {
 		if diff := cmp.Diff(

diff --git a/test/e2e-istio-tests-delegate.sh b/test/e2e-istio-tests-delegate.sh
@@ -70,7 +70,6 @@ spec:
     targetPort: 9898
     portDiscovery: true
     delegation: true
-  skipAnalysis: true
   analysis:
     interval: 15s
     threshold: 15