add more control to extensions values and update readme

Signed-off-by: Qing Ye <ye.qing@gojek.com>

charts/argo-cd/README.md

@@ -394,6 +394,11 @@ NAME: my-release
 | server.containerSecurityContext | object | `{}` | Servers container-level security context |
 | server.env | list | `[]` | Environment variables to pass to Argo CD server |
 | server.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to Argo CD server |
+| server.extensions.contents | list | `[]` | Extensions to be loaded into the server |
+| server.extensions.enabled | bool | `false` | Enable support for extensions |
+| server.extensions.image.imagePullPolicy | string | `"IfNotPresent"` | Image pull policy for extensions |
+| server.extensions.image.repository | string | `"ghcr.io/argoproj-labs/argocd-extensions"` | Repository to use for extensions image |
+| server.extensions.image.tag | string | `"v0.1.0"` | Tag to use for extensions image |
 | server.extraArgs | list | `[]` | Additional command line arguments to pass to Argo CD server |
 | server.extraContainers | list | `[]` | Additional containers to be added to the server pod |
 | server.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Argo CD server |

charts/argo-cd/crds/crd-extension.yaml

@@ -1,6 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
+  labels:
+    app.kubernetes.io/name: argocdextensions.argoproj.io
+    app.kubernetes.io/part-of: argocd
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   name: argocdextensions.argoproj.io

charts/argo-cd/templates/argocd-server/deployment.yaml

@@ -75,7 +75,7 @@ spec:
         {{- if .Values.server.volumeMounts }}
 {{- toYaml .Values.server.volumeMounts | nindent 8}}
         {{- end }}
-        {{- if .Values.server.extensions }}
+        {{- if .Values.server.extensions.enabled }}
         - name: extensions
           mountPath: /tmp/extensions/
         {{- end }}
@@ -136,9 +136,10 @@ spec:
       {{- with .Values.server.extraContainers }}
         {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- if .Values.server.extensions }}
+      {{- if .Values.server.extensions.enabled }}
       - name: argocd-extensions
-        image: ghcr.io/argoproj-labs/argocd-extensions:latest
+        image: {{ .Values.server.extensions.image.repository }}:{{ .Values.server.extensions.image.tag }}
+        imagePullPolicy: {{ .Values.server.extensions.image.imagePullPolicy }}
         volumeMounts:
           - name: extensions
             mountPath: /tmp/extensions/

charts/argo-cd/templates/argocd-server/extensions-rolebinding.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/name: argocd-server
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: server
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
   name: argocd-server-extensions
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14,4 +12,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: argocd-server
-{{- end }}
+{{- end }}

charts/argo-cd/templates/argocd-server/extentions-role.yaml

@@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    app.kubernetes.io/name: argocd-server
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: server
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
   name: argocd-server-extensions
 rules:
 - apiGroups:

charts/argo-cd/values.yaml

@@ -1276,8 +1276,22 @@ server:
   #    name: custom-tools
   #    subPath: helm
 
-  # -- Enable support for extensions
-  extensions: false
+  extensions:
+    # -- Enable support for extensions
+    enabled: false
+
+    image:
+      # -- Repository to use for extensions image
+      repository: "ghcr.io/argoproj-labs/argocd-extensions"
+      # -- Tag to use for extensions image
+      tag: "v0.1.0"
+      # -- Image pull policy for extensions
+      imagePullPolicy: IfNotPresent
+
+    # -- Extensions to be loaded into the server
+    contents: []
+    # - name: argo-rollouts
+    #   url: https://github.com/argoproj-labs/rollout-extension/releases/download/v0.1.0/extension.tar
 
 ## Repo Server
 repoServer: