diff --git a/.circleci/chart-testing.yaml b/.circleci/chart-testing.yaml index f9b5e85a..af329780 100644 --- a/.circleci/chart-testing.yaml +++ b/.circleci/chart-testing.yaml @@ -1,2 +1,3 @@ chart-repos: - argo=https://argoproj.github.io/argo-helm + - dandydeveloper=https://dandydeveloper.github.io/charts diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 45acffdd..7ef2fe79 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.7.6 +appVersion: 1.8.1 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd version: 2.11.0 diff --git a/charts/argo-cd/charts/redis-ha/Chart.yaml b/charts/argo-cd/charts/redis-ha/Chart.yaml index 04a04fdf..caec08fe 100644 --- a/charts/argo-cd/charts/redis-ha/Chart.yaml +++ b/charts/argo-cd/charts/redis-ha/Chart.yaml @@ -1,7 +1,6 @@ apiVersion: v1 appVersion: 5.0.6 description: Highly available Kubernetes implementation of Redis -engine: gotpl home: http://redis.io/ icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png keywords: @@ -18,4 +17,4 @@ sources: - https://redis.io/download - https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha - https://github.com/oliver006/redis_exporter -version: 4.4.2 +version: 4.5.3 diff --git a/charts/argo-cd/charts/redis-ha/OWNERS b/charts/argo-cd/charts/redis-ha/OWNERS deleted file mode 100644 index cf4f87d5..00000000 --- a/charts/argo-cd/charts/redis-ha/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- ssalaues -- dandydeveloper -reviewers: -- ssalaues -- dandydeveloper \ No newline at end of file diff --git a/charts/argo-cd/charts/redis-ha/README.md b/charts/argo-cd/charts/redis-ha/README.md index ba93ce0f..896a9559 100644 --- a/charts/argo-cd/charts/redis-ha/README.md +++ b/charts/argo-cd/charts/redis-ha/README.md @@ -5,7 +5,8 @@ ## TL;DR; ```bash -$ helm install stable/redis-ha +$ helm repo add dandydev https://dandydeveloper.github.io/charts +$ helm install dandydev/redis-ha ``` By default this chart install 3 pods total: @@ -34,7 +35,8 @@ Starting from version `4.x` HAProxy sidecar prometheus-exporter removed and repl To install the chart ```bash -$ helm install stable/redis-ha +$ helm repo add dandydev https://dandydeveloper.github.io/charts +$ helm install dandydev/redis-ha ``` The command deploys Redis on the Kubernetes cluster in the default configuration. By default this chart install one master pod containing redis master container and sentinel container along with 2 redis slave pods each containing their own sentinel sidecars. The [configuration](#configuration) section lists the parameters that can be configured during installation. @@ -93,6 +95,7 @@ The following table lists the configurable parameters of the Redis chart and the | `exporter.image` | Exporter image | `oliver006/redis_exporter` | | `exporter.tag` | Exporter tag | `v0.31.0` | | `exporter.port` | Exporter port | `9121` | +| `exporter.address` | Redis instance Hostname/Address Exists to circumvent some issues with issues in IPv6 hostname resolution | `localhost` | | `exporter.annotations` | Prometheus scrape annotations | `{prometheus.io/path: /metrics, prometheus.io/port: "9121", prometheus.io/scrape: "true"}` | | `exporter.extraArgs` | Additional args for the exporter | `{}` | | `exporter.script` | A custom custom Lua script that will be mounted to exporter for collection of custom metrics. Creates a ConfigMap and sets env var `REDIS_EXPORTER_SCRIPT`. | | @@ -156,10 +159,11 @@ The following table lists the configurable parameters of the Redis chart and the Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```bash +$ helm repo add dandydev https://dandydeveloper.github.io/charts $ helm install \ --set image=redis \ --set tag=5.0.5-alpine \ - stable/redis-ha + dandydev/redis-ha ``` The above command sets the Redis server within `default` namespace. @@ -167,7 +171,7 @@ The above command sets the Redis server within `default` namespace. Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, ```bash -$ helm install -f values.yaml stable/redis-ha +$ helm install -f values.yaml dandydev/redis-ha ``` > **Tip**: You can use the default [values.yaml](values.yaml) diff --git a/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml b/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml index 65550968..399d121f 100644 --- a/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml +++ b/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml @@ -163,8 +163,8 @@ spec: - redis-server args: - /data/conf/redis.conf - env: {{- if .Values.auth }} + env: - name: AUTH valueFrom: secretKeyRef: @@ -228,7 +228,7 @@ spec: {{- end }} env: - name: REDIS_ADDR - value: redis://localhost:{{ .Values.redis.port }} + value: redis://{{ default "localhost" .Values.exporter.address }}:{{ .Values.redis.port }} {{- if .Values.auth }} - name: REDIS_PASSWORD valueFrom: diff --git a/charts/argo-cd/charts/redis-ha/values.yaml b/charts/argo-cd/charts/redis-ha/values.yaml index aca78f13..c4e52d4f 100644 --- a/charts/argo-cd/charts/redis-ha/values.yaml +++ b/charts/argo-cd/charts/redis-ha/values.yaml @@ -269,6 +269,11 @@ exporter: port: 9121 scrapePath: /metrics + # Address/Host for Redis instance. Default: localhost + # Exists to circumvent issues with IPv6 dns resolution that occurs on certain environments + ## + address: localhost + # cpu/memory resource limits/requests resources: {} diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml index 5a08d884..8f6c3a5c 100644 --- a/charts/argo-cd/crds/crd-application.yaml +++ b/charts/argo-cd/crds/crd-application.yaml @@ -133,6 +133,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -250,6 +252,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -394,6 +401,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -511,6 +520,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -671,6 +685,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -788,6 +804,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -951,6 +972,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -1068,6 +1091,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -1209,6 +1237,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -1326,6 +1356,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -1464,6 +1499,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -1581,6 +1618,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -1654,4 +1696,4 @@ spec: versions: - name: v1alpha1 served: true - storage: true \ No newline at end of file + storage: true diff --git a/charts/argo-cd/crds/crd-project.yaml b/charts/argo-cd/crds/crd-project.yaml index 35d9dde9..b652449d 100644 --- a/charts/argo-cd/crds/crd-project.yaml +++ b/charts/argo-cd/crds/crd-project.yaml @@ -228,4 +228,4 @@ spec: versions: - name: v1alpha1 served: true - storage: true \ No newline at end of file + storage: true diff --git a/charts/argo-cd/requirements.lock b/charts/argo-cd/requirements.lock index 61752ccb..a122477d 100644 --- a/charts/argo-cd/requirements.lock +++ b/charts/argo-cd/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: redis-ha - repository: https://kubernetes-charts.storage.googleapis.com - version: 4.4.2 -digest: sha256:70fdd035c3aa3b7185882f12a73143c58ab32f04262dda2cf34a2b1a52116d96 -generated: "2020-03-29T14:37:59.349371452+01:00" + repository: https://dandydeveloper.github.io/charts + version: 4.5.3 +digest: sha256:241a06e1b5c76bf0ca50783cac9422040377023365e295762466a3527a3b2676 +generated: "2020-12-14T15:48:25.602957+08:00" diff --git a/charts/argo-cd/requirements.yaml b/charts/argo-cd/requirements.yaml index eb6313dd..bc3e0047 100644 --- a/charts/argo-cd/requirements.yaml +++ b/charts/argo-cd/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: redis-ha - version: 4.4.2 - repository: https://kubernetes-charts.storage.googleapis.com - condition: redis-ha.enabled \ No newline at end of file + version: 4.5.3 + repository: https://dandydeveloper.github.io/charts + condition: redis-ha.enabled diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml old mode 100755 new mode 100644 similarity index 97% rename from charts/argo-cd/templates/argocd-application-controller/deployment.yaml rename to charts/argo-cd/templates/argocd-application-controller/statefulset.yaml index c2260c78..f264e26f --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml @@ -1,6 +1,6 @@ {{- $redisHa := (index .Values "redis-ha") -}} apiVersion: apps/v1 -kind: {{ .Values.controller.enableStatefulSet | ternary "StatefulSet" "Deployment" }} +kind: StatefulSet metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: @@ -16,9 +16,7 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.controller.enableStatefulSet }} serviceName: {{ template "argo-cd.controller.fullname" . }} - {{- end }} revisionHistoryLimit: 5 replicas: {{ .Values.controller.replicas }} template: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 5331d96b..1465d1da 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.7.6 + tag: v1.8.1 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 @@ -28,7 +28,7 @@ controller: image: repository: # argoproj/argocd - tag: # v1.7.6 + tag: # v1.8.1 imagePullPolicy: # IfNotPresent # If changing the number of replicas you must pass the number as ARGOCD_CONTROLLER_REPLICAS as an environment variable @@ -160,7 +160,7 @@ controller: # resolved for this cloud to continue to maintain state. # - alert: ArgoAppNotSynced # expr: | - # argocd_app_sync_status{sync_status!="Synced"} == 1 + # argocd_app_info{sync_status!="Synced"} == 1 # for: 12h # labels: # severity: warning @@ -267,7 +267,7 @@ redis: image: repository: redis - tag: 5.0.8 + tag: 5.0.10-alpine imagePullPolicy: IfNotPresent containerPort: 6379 @@ -337,7 +337,7 @@ redis-ha: metrics: enabled: true image: - tag: 5.0.8-alpine + tag: 5.0.10-alpine ## Server server: @@ -354,7 +354,7 @@ server: image: repository: # argoproj/argocd - tag: # v1.7.6 + tag: # v1.8.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -706,7 +706,7 @@ repoServer: image: repository: # argoproj/argocd - tag: # v1.7.6 + tag: # v1.8.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server diff --git a/scripts/publish.sh b/scripts/publish.sh index be918fe4..2572d257 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -8,6 +8,7 @@ rm -rf $SRCROOT/output && git clone -b gh-pages git@github.com:argoproj/argo-hel helm repo add stable https://kubernetes-charts.storage.googleapis.com helm repo add argoproj https://argoproj.github.io/argo-helm +helm repo add dandydeveloper https://dandydeveloper.github.io/charts for dir in $(find $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d); do