fix conflict

Signed-off-by: Workshop User <[email protected]>

Author: Workshop User

gitops/addons/clusters/fleet-hub-cluster/addons/argocd/values.yaml

@@ -1,3 +1,10 @@
 configs:
   cm:
     ui.bannerurl: "https://us-west-2.console.aws.amazon.com/eks/home?region=us-west-2#/clusters/fleet-hub-cluster"
+
+# server:
+#   service:
+#    type: LoadBalancer
+#    annotations:
+#      service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip
+#      service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing

gitops/addons/clusters/fleet-hub-cluster/addons/gitops-bridge/values.yaml

@@ -38,6 +38,10 @@ addons:
     enabled: true
   ack_s3:
     enabled: true
-  ack_secretsmanager:
+  ack_iam:
+    enabled: true
+  ack_ec2:
     enabled: true
+  ack_secretsmanager:
+    enabled: true