fix(helm/principal): address review feedback on PR #947

Signed-off-by: Enbiya Goral <100806254+enbiyagoral@users.noreply.github.com>

Author: enbiyagoral

install/helm-repo/argocd-agent-principal/README.md

@@ -36,7 +36,7 @@ Kubernetes: `>=1.24.0-0`
 | healthzService.type | string | `"ClusterIP"` | Healthz service type. |
 | hostAliases | list | `[]` | Host aliases injected into /etc/hosts of the principal Pod. |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the principal container. |
-| image.repository | string | `"ghcr.io/argoproj-labs/argocd-agent/argocd-agent"` | Container image repository for the principal. |
+| image.repository | string | `"quay.io/argoprojlabs/argocd-agent"` | Container image repository for the principal. |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Image pull secrets for private registries. |
 | metricsService | object | `{"annotations":{},"enabled":true,"port":8000,"type":"ClusterIP"}` | Metrics service configuration. |

install/helm-repo/argocd-agent-principal/templates/principal-deployment.yaml

@@ -360,9 +360,11 @@ spec:
             - containerPort: {{ .Values.principal.listen.port }}
               name: principal
               protocol: TCP
+            {{- if .Values.principal.redisProxy.enabled }}
             - containerPort: 6379
               name: redis-proxy
               protocol: TCP
+            {{- end }}
             - containerPort: {{ .Values.principal.metrics.port }}
               name: metrics
               protocol: TCP
@@ -402,9 +404,11 @@ spec:
             - name: userpass-passwd
               mountPath: /app/config/userpass
               readOnly: true
+            {{- if .Values.principal.redisProxy.enabled }}
             - name: redis-proxy-server-tls
               mountPath: /app/config/redis-proxy-server-tls
               readOnly: true
+            {{- end }}
             - name: redis-tls-ca
               mountPath: /app/config/redis-tls
               readOnly: true
@@ -423,6 +427,7 @@ spec:
           - key: jwt.key
             path: jwt.key
           optional: true
+      {{- if .Values.principal.redisProxy.enabled }}
       - name: redis-proxy-server-tls
         secret:
           secretName: {{ .Values.principal.redis.proxy.server.tls.secretName | quote }}
@@ -432,6 +437,7 @@ spec:
           - key: tls.key
             path: tls.key
           optional: true
+      {{- end }}
       - name: redis-tls-ca
         secret:
           secretName: {{ .Values.principal.redis.tls.caSecretName | quote }}

install/helm-repo/argocd-agent-principal/templates/tests/test-sa.yaml

@@ -7,6 +7,9 @@ metadata:
   labels:
     app.kubernetes.io/name: argocd-agent-principal
     app.kubernetes.io/component: test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -16,6 +19,9 @@ metadata:
   labels:
     app.kubernetes.io/name: argocd-agent-principal
     app.kubernetes.io/component: test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 rules:
 - apiGroups: [""]
   resources: ["pods", "services", "endpoints", "configmaps", "secrets", "serviceaccounts"]
@@ -35,6 +41,9 @@ metadata:
   labels:
     app.kubernetes.io/name: argocd-agent-principal
     app.kubernetes.io/component: test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -51,6 +60,9 @@ metadata:
   labels:
     app.kubernetes.io/name: argocd-agent-principal
     app.kubernetes.io/component: test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 rules:
 - apiGroups: [""]
   resources: ["pods", "services", "endpoints", "configmaps", "secrets", "serviceaccounts"]
@@ -69,6 +81,9 @@ metadata:
   labels:
     app.kubernetes.io/name: argocd-agent-principal
     app.kubernetes.io/component: test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

install/helm-repo/argocd-agent-principal/values.schema.json

@@ -25,7 +25,7 @@
       "additionalProperties": false,
       "properties": {
         "repository": {
-          "default": "ghcr.io/argoproj-labs/argocd-agent/argocd-agent",
+          "default": "quay.io/argoprojlabs/argocd-agent",
           "description": "Container image repository.",
           "title": "repository",
           "type": "string"

install/helm-repo/argocd-agent-principal/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 ## @section Image
 image:
   # -- Container image repository for the principal.
-  repository: ghcr.io/argoproj-labs/argocd-agent/argocd-agent
+  repository: quay.io/argoprojlabs/argocd-agent
   # -- Overrides the image tag whose default is the chart appVersion.
   tag: ""
   # -- Image pull policy for the principal container.