fix: Handle minor version with '+' when determining ingress mode (#1529…

…) (#1612) Signed-off-by: Kiran Meduri <[email protected]> Signed-off-by: Rohit Agrawal <[email protected]>
argoproj · Oct 28, 2021 · 6852b1f · 6852b1f
1 parent fe2c68b
commit 6852b1f
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/rollout/trafficrouting/istio/istio.go b/rollout/trafficrouting/istio/istio.go
@@ -242,19 +242,36 @@ func (r *Reconciler) reconcileVirtualService(obj *unstructured.Unstructured, vsv
 		}
 	}
 
+<<<<<<< HEAD
 	patches := r.generateVirtualServicePatches(vsvcRouteNames, httpRoutes, vsvcTLSRoutes, tlsRoutes, int64(desiredWeight), additionalDestinations...)
+=======
+	// Generate Patches
+	patches := r.generateVirtualServicePatches(httpRoutes, tlsRoutes, int64(desiredWeight))
+>>>>>>> 7a15c88a (chore: Fix istio vs reconcile errors)
 	err = patches.patchVirtualService(httpRoutesI, tlsRoutesI)
 	if err != nil {
 		return nil, false, err
 	}
 
-	err = unstructured.SetNestedSlice(newObj.Object, httpRoutesI, "spec", Http)
-	if err != nil {
-		return newObj, len(patches) > 0, err
+	// Set HTTP Route Slice
+	if len(httpRoutes) > 0 {
+		err = unstructured.SetNestedSlice(newObj.Object, httpRoutesI, "spec", Http)
+		if err != nil {
+			return newObj, len(patches) > 0, err
+		}
 	}
+<<<<<<< HEAD
 	if tlsRoutesI != nil {
 		err = unstructured.SetNestedSlice(newObj.Object, tlsRoutesI, "spec", Tls)
 	}
+=======
+
+	// Set TLS Route Slice
+	if len(tlsRoutes) > 0 {
+		err = unstructured.SetNestedSlice(newObj.Object, tlsRoutesI, "spec", Tls)
+	}
+
+>>>>>>> 7a15c88a (chore: Fix istio vs reconcile errors)
 	return newObj, len(patches) > 0, err
 }