diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 947d3e5e..379085f8 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.1.6 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.26.6 +version: 3.26.7 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Changed]: Make argocd-server /home/argocd/.aws writeable when using readOnlyRootFilesystem=false security context" + - "[Fixed]: Added Openshift Route values that were previously included in Route.yaml directives." diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 0dbb7ba3..153f12a6 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -449,8 +449,11 @@ NAME: my-release | server.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | | server.replicas | int | `1` | The number of server pods to run | | server.resources | object | `{}` | Resource limits and requests for the Argo CD server | -| server.route.enabled | bool | `false` | Enable a OpenShift route for the Argo CD server | -| server.route.hostname | string | `""` | Hostname of OpenShift route | +| server.route.enabled | bool | `false` | Enable an OpenShift Route for the Argo CD server | +| server.route.annotations | object | `{}` | Openshift Route annotations | +| server.route.hostname | string | `""` | Hostname of OpenShift Route | +| server.route.termination_type | string | `"passthrough"` | Openshift Route termination type | +| server.route.termination_policy| string | `"None"` | Openshift Route termination policy | | server.service.annotations | object | `{}` | Server service annotations | | server.service.externalIPs | list | `[]` | Server service external IPs | | server.service.externalTrafficPolicy | string | `""` | Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints | diff --git a/charts/argo-cd/templates/argocd-server/route.yaml b/charts/argo-cd/templates/argocd-server/route.yaml index f6b1ce1c..25cd2d8c 100644 --- a/charts/argo-cd/templates/argocd-server/route.yaml +++ b/charts/argo-cd/templates/argocd-server/route.yaml @@ -18,7 +18,7 @@ spec: port: targetPort: https tls: - termination: {{ .Values.server.route.termination_type | default "passthrough" }} - insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }} + termination: {{ .Values.server.route.termination_type | quote }} + insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | quote }} wildcardPolicy: None {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index e980ab49..b7d64e10 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -999,10 +999,16 @@ server: # Find your domain with: kubectl describe --namespace=openshift-ingress-operator ingresscontroller/default | grep Domain: # If 'hostname' is an empty string "" OpenShift will create a hostname for you. route: - # -- Enable a OpenShift route for the Argo CD server + # -- Enable an OpenShift Route for the Argo CD server enabled: false - # -- Hostname of OpenShift route + # -- Openshift Route annotations + annotations: {} + # -- Hostname of OpenShift Route hostname: "" + # -- Termination type of Openshift Route + termination_type: passthrough + # -- Termination policy of Openshift Route + termination_policy: None # -- Manage ArgoCD configmap (Declarative Setup) ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml