diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index bbc2abf1..1e6ce3e3 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.4.14 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.5.25 +version: 5.6.0 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]: Leader election permissions for ApplicationSet controller" + - "[Changed]: Moved Argo Extension resource to argocd-apps chart" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 95d64340..ff267d15 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -590,8 +590,7 @@ 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.enabled | bool | `false` | Enable support for Argo UI 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 | diff --git a/charts/argo-cd/templates/argocd-server/extensions-rolebinding.yaml b/charts/argo-cd/templates/argocd-server/extensions-rolebinding.yaml deleted file mode 100644 index 3e8ec5d6..00000000 --- a/charts/argo-cd/templates/argocd-server/extensions-rolebinding.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.server.extensions.enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - labels: - {{- 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 - kind: Role - name: argocd-server-extensions -subjects: -- kind: ServiceAccount - name: argocd-server -{{- end }} diff --git a/charts/argo-cd/templates/argocd-server/extensions.yaml b/charts/argo-cd/templates/argocd-server/extensions.yaml deleted file mode 100644 index 5ac595db..00000000 --- a/charts/argo-cd/templates/argocd-server/extensions.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.server.extensions.enabled }} -{{- range $extension := .Values.server.extensions.contents }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCDExtension -metadata: - name: {{ $extension.name }} - finalizers: - - extensions-finalizer.argocd.argoproj.io - labels: - {{- include "argo-cd.labels" (dict "context" $ "component" $.Values.server.name "name" (printf "%s-extensions" $.Values.server.name)) | nindent 4 }} -spec: - sources: - - web: - url: {{ $extension.url }} -{{- end }} -{{- end }} diff --git a/charts/argo-cd/templates/argocd-server/extentions-role.yaml b/charts/argo-cd/templates/argocd-server/extentions-role.yaml deleted file mode 100644 index 53e592ae..00000000 --- a/charts/argo-cd/templates/argocd-server/extentions-role.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Values.server.extensions.enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - labels: - {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }} - name: argocd-server-extensions -rules: -- apiGroups: - - argoproj.io - resources: - - argocdextensions - verbs: - - create - - get - - list - - watch - - update - - delete - - patch -{{- end }} diff --git a/charts/argo-cd/templates/argocd-server/role.yaml b/charts/argo-cd/templates/argocd-server/role.yaml index 46eb68d5..c73d189c 100644 --- a/charts/argo-cd/templates/argocd-server/role.yaml +++ b/charts/argo-cd/templates/argocd-server/role.yaml @@ -23,6 +23,9 @@ rules: resources: - applications - appprojects + {{- if .Values.server.extensions.enabled }} + - argocdextensions + {{- end }} verbs: - create - get @@ -37,4 +40,4 @@ rules: - events verbs: - create - - list \ No newline at end of file + - list diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index f630a092..9f546d24 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -1713,11 +1713,14 @@ server: # name: custom-tools # subPath: helm + ## Argo UI extensions + ## This function in tech preview stage, do expect unstability or breaking changes in newer versions. + ## Ref: https://github.com/argoproj-labs/argocd-extensions extensions: - # -- Enable support for extensions - ## This function in tech preview stage, do expect unstability or breaking changes in newer versions. Bump image.tag if necessary. + # -- Enable support for Argo UI extensions enabled: false + ## Argo UI extensions image image: # -- Repository to use for extensions image repository: "ghcr.io/argoproj-labs/argocd-extensions" @@ -1735,11 +1738,6 @@ server: # cpu: 10m # memory: 64Mi - # -- 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: # -- Repo server name