chore(argo-cd): Remove controller duplicate service (#1549)

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.15
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.6.4
+version: 5.6.5
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -22,4 +22,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Documentation for AWS ALB should relate to Server component"
+    - "[Removed]: Controller service as duplicate for metrics service"

charts/argo-cd/README.md

@@ -463,10 +463,6 @@ NAME: my-release
 | controller.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
 | controller.replicas | int | `1` | The number of application controller pods to run. Additional replicas will cause sharding of managed clusters across number of replicas. |
 | controller.resources | object | `{}` | Resource limits and requests for the application controller pods |
-| controller.service.annotations | object | `{}` | Application controller service annotations |
-| controller.service.labels | object | `{}` | Application controller service labels |
-| controller.service.port | int | `8082` | Application controller service port |
-| controller.service.portName | string | `"https-controller"` | Application controller service port name |
 | controller.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
 | controller.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
 | controller.serviceAccount.create | bool | `true` | Create a service account for the application controller |

charts/argo-cd/templates/NOTES.txt

@@ -34,6 +34,9 @@ DEPRECATED option repoServer.logFormat - Use configs.params.repoServer.log.forma
 {{- if .Values.repoServer.logLevel }}
 DEPRECATED option repoServer.logLevel - Use configs.params.repoServer.log.level
 {{- end }}
+{{- if .Values.controller.service }}
+REMOVED option controller.service - Use controller.metrics
+{{- end }}
 {{- if .Values.repoServer.copyutil }}
 REMOVED option repoSever.copyutil.resources - Use repoServer.resources
 {{- end }}

charts/argo-cd/templates/argocd-application-controller/metrics.yaml

@@ -1,25 +1,25 @@
-{{- if .Values.controller.metrics.enabled}}
+{{- if .Values.controller.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-{{- if .Values.controller.metrics.service.annotations }}
+  name: {{ include "argo-cd.controller.fullname" . }}-metrics
-  annotations:
-  {{- range $key, $value := .Values.controller.metrics.service.annotations }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
-{{- end }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" "metrics") | nindent 4 }}
-{{- if .Values.controller.metrics.service.labels }}
+    {{- with .Values.controller.metrics.service.labels }}
-{{- toYaml .Values.controller.metrics.service.labels | nindent 4 }}
+      {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- end }}
-  name: {{ template "argo-cd.controller.fullname" . }}-metrics
+  {{- with .Values.controller.metrics.service.annotations }}
+  annotations:
+    {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   ports:
   - name: {{ .Values.controller.metrics.service.portName }}
     protocol: TCP
     port: {{ .Values.controller.metrics.service.servicePort }}
-    targetPort: controller
+    targetPort: metrics
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 4 }}
-{{- end }}
+{{- end }}

charts/argo-cd/templates/argocd-application-controller/service.yaml

@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-{{- if .Values.controller.service.annotations }}
-  annotations:
-  {{- range $key, $value := .Values.controller.service.annotations }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
-{{- end }}
-  name: {{ template "argo-cd.controller.fullname" . }}
-  labels:
-    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
-{{- with .Values.controller.service.labels }}
-{{- toYaml . | nindent 4 }}
-{{- end }}
-spec:
-  ports:
-  - name: {{ .Values.controller.service.portName }}
-    port: {{ .Values.controller.service.port }}
-    targetPort: {{ .Values.controller.containerPort }}
-  selector:
-    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 4 }}

charts/argo-cd/templates/argocd-application-controller/statefulset.yaml

@@ -210,7 +210,7 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         ports:
-        - name: controller
+        - name: metrics
           containerPort: {{ .Values.controller.containerPort }}
           protocol: TCP
         livenessProbe:

charts/argo-cd/values.yaml

@@ -493,21 +493,12 @@ controller:
   # -- Additional volumes to the application controller pod
   volumes: []
 
-  ## Controller service configuration
-  service:
-    # -- Application controller service annotations
-    annotations: {}
-    # -- Application controller service labels
-    labels: {}
-    # -- Application controller service port
-    port: 8082
-    # -- Application controller service port name
-    portName: https-controller
-
   # -- [Node selector]
   nodeSelector: {}
+
   # -- [Tolerations] for use with node taints
   tolerations: []
+
   # -- Assign custom [affinity] rules to the deployment
   affinity: {}