diff --git a/charts/kubezero-argocd/Chart.yaml b/charts/kubezero-argocd/Chart.yaml index f5bd506d..16942499 100644 --- a/charts/kubezero-argocd/Chart.yaml +++ b/charts/kubezero-argocd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application name: kubezero-argocd -version: 0.8.0 +version: 0.8.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -12,9 +12,9 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.3" + version: ">= 0.1.4" repository: https://zero-down-time.github.io/kubezero/ - name: argo-cd - version: 3.6.10 + version: 3.13.1 repository: https://argoproj.github.io/argo-helm kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-argocd/README.md b/charts/kubezero-argocd/README.md index 272c3512..0d4c1e8c 100644 --- a/charts/kubezero-argocd/README.md +++ b/charts/kubezero-argocd/README.md @@ -1,6 +1,6 @@ # kubezero-argocd -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) +![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application @@ -18,8 +18,8 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| https://argoproj.github.io/argo-helm | argo-cd | 3.6.10 | -| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | +| https://argoproj.github.io/argo-helm | argo-cd | 3.13.1 | +| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.4 | ## Values @@ -34,7 +34,6 @@ Kubernetes: `>= 1.18.0` | argo-cd.controller.resources.requests.cpu | string | `"100m"` | | | argo-cd.controller.resources.requests.memory | string | `"256Mi"` | | | argo-cd.dex.enabled | bool | `false` | | -| argo-cd.global.image.tag | string | `"v2.0.4"` | | | argo-cd.installCRDs | bool | `false` | | | argo-cd.repoServer.logFormat | string | `"json"` | | | argo-cd.repoServer.metrics.enabled | bool | `false` | | @@ -51,12 +50,6 @@ Kubernetes: `>= 1.18.0` | istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD | | istio.gateway | string | `"istio-ingress/ingressgateway"` | Name of the Istio gateway to add the VirtualService to | | istio.ipBlocks | list | `[]` | | -| kubezero.enabled | bool | `false` | | -| kubezero.path | string | `"charts/kubezero"` | path within repoURL | -| kubezero.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | repository for kubezero argo applications | -| kubezero.server | string | `"https://kubernetes.default.svc"` | destination cluster | -| kubezero.targetRevision | string | `"HEAD"` | git branch to track | -| kubezero.valuesFiles[0] | string | `"values.yaml"` | | ## Resources - https://argoproj.github.io/argo-cd/operator-manual/metrics/ diff --git a/charts/kubezero-argocd/templates/kubezero.yaml b/charts/kubezero-argocd/templates/kubezero.yaml deleted file mode 100644 index 36808fd5..00000000 --- a/charts/kubezero-argocd/templates/kubezero.yaml +++ /dev/null @@ -1,65 +0,0 @@ -{{- if .Values.kubezero.enabled }} -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: kubezero - namespace: argocd - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - description: KubeZero - ZeroDownTime Kubernetes Platform - - # Allow manifests to deploy from any Git repos - sourceRepos: - - '*' - - destinations: - - namespace: argocd - server: https://kubernetes.default.svc - - namespace: kube-system - server: https://kubernetes.default.svc - - namespace: cert-manager - server: https://kubernetes.default.svc - - namespace: istio-system - server: https://kubernetes.default.svc - - namespace: istio-ingress - server: https://kubernetes.default.svc - - namespace: monitoring - server: https://kubernetes.default.svc - - namespace: elastic-system - server: https://kubernetes.default.svc - - namespace: logging - server: https://kubernetes.default.svc - - clusterResourceWhitelist: - - group: '*' - kind: '*' - ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: kubezero - namespace: argocd - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - project: kubezero - source: - repoURL: {{ .Values.kubezero.repoURL }} - targetRevision: {{ .Values.kubezero.targetRevision }} - path: {{ .Values.kubezero.path }} - - helm: - valueFiles: - {{- toYaml .Values.kubezero.valuesFiles | nindent 6 }} - - destination: - server: {{ .Values.kubezero.server }} - namespace: argocd - - {{- with .Values.kubezero.syncPolicy }} - syncPolicy: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/kubezero-argocd/values.yaml b/charts/kubezero-argocd/values.yaml index 9f7ec78f..ace01401 100644 --- a/charts/kubezero-argocd/values.yaml +++ b/charts/kubezero-argocd/values.yaml @@ -1,28 +1,3 @@ -# Configure app of apps -kubezero: - enabled: false - - # kubezero.server -- destination cluster - server: https://kubernetes.default.svc - - # This repoURL is used a base for all the repoURLs applications - # Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be - # integrated into any repository as a git subtree if for example public internet access is unavailable - # kubezero.repoURL -- repository for kubezero argo applications - repoURL: https://github.com/zero-down-time/kubezero - # kubezero.targetRevision -- git branch to track - targetRevision: HEAD - # kubezero.path -- path within repoURL - path: 'charts/kubezero' - - # syncPolicy, details see: https://argoproj.github.io/argo-cd/user-guide/auto_sync - #syncPolicy: - # automated: - # prune: true - - valuesFiles: - - values.yaml - # Support for Istio Ingress for ArgoCD istio: # istio.enabled -- Deploy Istio VirtualService to expose ArgoCD @@ -40,9 +15,9 @@ argo-cd: # argocdServerAdminPassword: "$2a$10$ivKzaXVxMqdeDSfS3nqi1Od3iDbnL7oXrixzDfZFRHlXHnAG6LydG" # argocdServerAdminPasswordMtime: "2020-04-24T15:33:09BST" - global: - image: - tag: v2.0.4 + #global: + # image: + # tag: v2.0.4 controller: args: