From e6d849e44bc6fc7a7ea71cb51fd84ee7ee95caff Mon Sep 17 00:00:00 2001 From: Petr McAllister Date: Tue, 23 Apr 2024 17:07:02 -0700 Subject: [PATCH] Resolve conflicts Signed-off-by: Petr McAllister --- .../Addons/Partner/Solo.io/solo-istiod.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml index dac110cb..3a14cc1e 100644 --- a/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml +++ b/eks-anywhere-common/Addons/Partner/Solo.io/solo-istiod.yaml @@ -1,16 +1,8 @@ -<<<<<<< HEAD ---- -======= ->>>>>>> 9937293 (Solo.io adding revision support) apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: solo-istiod -<<<<<<< HEAD - namespace: istio-system -======= namespace: solo-istio-system ->>>>>>> 9937293 (Solo.io adding revision support) spec: chart: spec: @@ -21,13 +13,9 @@ spec: name: solo-istiod-charts namespace: flux-system version: 1.18.3-eks-a -<<<<<<< HEAD - interval: 1m0s -======= values: revision: 1-18-3-solo global: istioNamespace: solo-istio-system interval: 1m0s ->>>>>>> 9937293 (Solo.io adding revision support)