Fix conflicts with upstream

Signed-off-by: Matt Carr <mcarr@kinaxis.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.5
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.11.4
+version: 3.11.5
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:

charts/argo-cd/README.md

@@ -312,6 +312,7 @@ NAME: my-release
 | server.ingressGrpc.ingressClassName | Defines which ingress controller will implement the resource [gRPC-ingress] | `""` |
 | server.ingressGrpc.tls | Ingress TLS configuration for dedicated [gRPC-ingress] | `[]` |
 | server.ingressGrpc.isAWSALB | Setup up GRPC ingress to work with an AWS ALB | `false` |
+| server.ingressGrpc.awsALB.serviceType | Service type for the AWS ALB GRPC service | `NodePort` |
 | server.route.enabled | Enable a OpenShift route for the server | `false` |
 | server.route.hostname | Hostname of OpenShift route | `""` |
 | server.lifecycle | PostStart and PreStop hooks configuration | `{}` |
@@ -454,5 +455,7 @@ server:
   ingressGrpc:
     enabled: true
     isAWSALB: true
+    awsALB:
+      serviceType: ClusterIP
       
 ```

charts/argo-cd/templates/argocd-server/alb-grpc-service.yaml

@@ -20,5 +20,5 @@ spec:
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
   sessionAffinity: None
-  type: NodePort
+  type: {{ .Values.server.ingressGrpc.awsALB.serviceType }}
 {{- end -}}

charts/argo-cd/values.yaml

@@ -611,6 +611,15 @@ server:
     labels: {}
     ingressClassName: ""
 
+    ## Service Type if isAWSALB is set to true
+    ## Can be of type NodePort or ClusterIP depending on which mode you are
+    ## are running. Instance mode needs type NodePort, IP mode needs type
+    ## ClusterIP
+    ## Ref: https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/how-it-works/#ingress-traffic
+    ##
+    awsALB:
+      serviceType: NodePort
+
     ## Argo Ingress.
     ## Hostnames must be provided if Ingress is enabled.
     ## Secrets must be manually created in the namespace

charts/argo-workflows/Chart.yaml

@@ -3,7 +3,7 @@ name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
 version: 0.3.1
-appVersion: "v3.1.1"
+appVersion: "v3.1.5"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 sources: