DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(argo-cd): Argo CD 1.8.1

Browse source 
Signed-off-by: junnplus <junnplus@gmail.com>
This commit is contained in:
junnplus 2020-12-14 14:32:51 +08:00
parent 182ef88c67
commit 263550488f
14 changed files with 78 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.circleci/chart-testing.yaml
View file

@ -1,2 +1,3 @@
chart-repos: chart-repos:
- argo=https://argoproj.github.io/argo-helm - argo=https://argoproj.github.io/argo-helm
- dandydeveloper=https://dandydeveloper.github.io/charts

2
charts/argo-cd/Chart.yaml
View file

@ -1,5 +1,5 @@
apiVersion: v1 apiVersion: v1
appVersion: 1.7.6 appVersion: 1.8.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 2.11.0 version: 2.11.0

3
charts/argo-cd/charts/redis-ha/Chart.yaml
View file

@ -1,7 +1,6 @@
apiVersion: v1 apiVersion: v1
appVersion: 5.0.6 appVersion: 5.0.6
description: Highly available Kubernetes implementation of Redis description: Highly available Kubernetes implementation of Redis
engine: gotpl
home: http://redis.io/ home: http://redis.io/
icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
keywords: keywords:
@ -18,4 +17,4 @@ sources:
- https://redis.io/download - https://redis.io/download
- https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha - https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha
- https://github.com/oliver006/redis_exporter - https://github.com/oliver006/redis_exporter
version: 4.4.2 version: 4.5.3

6
charts/argo-cd/charts/redis-ha/OWNERS
View file

@ -1,6 +0,0 @@
approvers:
- ssalaues
- dandydeveloper
reviewers:
- ssalaues
- dandydeveloper

12
charts/argo-cd/charts/redis-ha/README.md
View file

@ -5,7 +5,8 @@
## TL;DR; ## TL;DR;
```bash ```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: 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 To install the chart
```bash ```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. 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.image` | Exporter image | `oliver006/redis_exporter` |
| `exporter.tag` | Exporter tag | `v0.31.0` | | `exporter.tag` | Exporter tag | `v0.31.0` |
| `exporter.port` | Exporter port | `9121` | | `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.annotations` | Prometheus scrape annotations | `{prometheus.io/path: /metrics, prometheus.io/port: "9121", prometheus.io/scrape: "true"}` |
| `exporter.extraArgs` | Additional args for the exporter | `{}` | | `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`. | | | `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, Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
```bash ```bash
$ helm repo add dandydev https://dandydeveloper.github.io/charts
$ helm install \ $ helm install \
--set image=redis \ --set image=redis \
--set tag=5.0.5-alpine \ --set tag=5.0.5-alpine \
stable/redis-ha dandydev/redis-ha
``` ```
The above command sets the Redis server within `default` namespace. 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, Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
```bash ```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) > **Tip**: You can use the default [values.yaml](values.yaml)

4
charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml
View file

@ -163,8 +163,8 @@ spec:
- redis-server - redis-server
args: args:
- /data/conf/redis.conf - /data/conf/redis.conf
env:
{{- if .Values.auth }} {{- if .Values.auth }}
env:
- name: AUTH - name: AUTH
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
@ -228,7 +228,7 @@ spec:
{{- end }} {{- end }}
env: env:
- name: REDIS_ADDR - name: REDIS_ADDR
value: redis://localhost:{{ .Values.redis.port }} value: redis://{{ default "localhost" .Values.exporter.address }}:{{ .Values.redis.port }}
{{- if .Values.auth }} {{- if .Values.auth }}
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
valueFrom: valueFrom:

5
charts/argo-cd/charts/redis-ha/values.yaml
View file

@ -269,6 +269,11 @@ exporter:
port: 9121 port: 9121
scrapePath: /metrics 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 # cpu/memory resource limits/requests
resources: {} resources: {}

44
charts/argo-cd/crds/crd-application.yaml
View file

@ -133,6 +133,8 @@ spec:
directory: directory:
description: Directory holds path/directory specific options description: Directory holds path/directory specific options
properties: properties:
exclude:
type: string
jsonnet: jsonnet:
description: ApplicationSourceJsonnet holds jsonnet specific options description: ApplicationSourceJsonnet holds jsonnet specific options
properties: properties:
@ -250,6 +252,11 @@ spec:
kustomize: kustomize:
description: Kustomize holds kustomize specific options description: Kustomize holds kustomize specific options
properties: properties:
commonAnnotations:
additionalProperties:
type: string
description: CommonAnnotations adds additional kustomize commonAnnotations
type: object
commonLabels: commonLabels:
additionalProperties: additionalProperties:
type: string type: string
@ -394,6 +401,8 @@ spec:
directory: directory:
description: Directory holds path/directory specific options description: Directory holds path/directory specific options
properties: properties:
exclude:
type: string
jsonnet: jsonnet:
description: ApplicationSourceJsonnet holds jsonnet specific options description: ApplicationSourceJsonnet holds jsonnet specific options
properties: properties:
@ -511,6 +520,11 @@ spec:
kustomize: kustomize:
description: Kustomize holds kustomize specific options description: Kustomize holds kustomize specific options
properties: properties:
commonAnnotations:
additionalProperties:
type: string
description: CommonAnnotations adds additional kustomize commonAnnotations
type: object
commonLabels: commonLabels:
additionalProperties: additionalProperties:
type: string type: string
@ -671,6 +685,8 @@ spec:
directory: directory:
description: Directory holds path/directory specific options description: Directory holds path/directory specific options
properties: properties:
exclude:
type: string
jsonnet: jsonnet:
description: ApplicationSourceJsonnet holds jsonnet specific options description: ApplicationSourceJsonnet holds jsonnet specific options
properties: properties:
@ -788,6 +804,11 @@ spec:
kustomize: kustomize:
description: Kustomize holds kustomize specific options description: Kustomize holds kustomize specific options
properties: properties:
commonAnnotations:
additionalProperties:
type: string
description: CommonAnnotations adds additional kustomize commonAnnotations
type: object
commonLabels: commonLabels:
additionalProperties: additionalProperties:
type: string type: string
@ -951,6 +972,8 @@ spec:
directory: directory:
description: Directory holds path/directory specific options description: Directory holds path/directory specific options
properties: properties:
exclude:
type: string
jsonnet: jsonnet:
description: ApplicationSourceJsonnet holds jsonnet specific options description: ApplicationSourceJsonnet holds jsonnet specific options
properties: properties:
@ -1068,6 +1091,11 @@ spec:
kustomize: kustomize:
description: Kustomize holds kustomize specific options description: Kustomize holds kustomize specific options
properties: properties:
commonAnnotations:
additionalProperties:
type: string
description: CommonAnnotations adds additional kustomize commonAnnotations
type: object
commonLabels: commonLabels:
additionalProperties: additionalProperties:
type: string type: string
@ -1209,6 +1237,8 @@ spec:
directory: directory:
description: Directory holds path/directory specific options description: Directory holds path/directory specific options
properties: properties:
exclude:
type: string
jsonnet: jsonnet:
description: ApplicationSourceJsonnet holds jsonnet specific options description: ApplicationSourceJsonnet holds jsonnet specific options
properties: properties:
@ -1326,6 +1356,11 @@ spec:
kustomize: kustomize:
description: Kustomize holds kustomize specific options description: Kustomize holds kustomize specific options
properties: properties:
commonAnnotations:
additionalProperties:
type: string
description: CommonAnnotations adds additional kustomize commonAnnotations
type: object
commonLabels: commonLabels:
additionalProperties: additionalProperties:
type: string type: string
@ -1464,6 +1499,8 @@ spec:
directory: directory:
description: Directory holds path/directory specific options description: Directory holds path/directory specific options
properties: properties:
exclude:
type: string
jsonnet: jsonnet:
description: ApplicationSourceJsonnet holds jsonnet specific options description: ApplicationSourceJsonnet holds jsonnet specific options
properties: properties:
@ -1581,6 +1618,11 @@ spec:
kustomize: kustomize:
description: Kustomize holds kustomize specific options description: Kustomize holds kustomize specific options
properties: properties:
commonAnnotations:
additionalProperties:
type: string
description: CommonAnnotations adds additional kustomize commonAnnotations
type: object
commonLabels: commonLabels:
additionalProperties: additionalProperties:
type: string type: string
@ -1654,4 +1696,4 @@ spec:
versions: versions:
- name: v1alpha1 - name: v1alpha1
served: true served: true
storage: true storage: true

2
charts/argo-cd/crds/crd-project.yaml
View file

@ -228,4 +228,4 @@ spec:
versions: versions:
- name: v1alpha1 - name: v1alpha1
served: true served: true
storage: true storage: true

8
charts/argo-cd/requirements.lock
View file

@ -1,6 +1,6 @@
dependencies: dependencies:
- name: redis-ha - name: redis-ha
repository: https://kubernetes-charts.storage.googleapis.com repository: https://dandydeveloper.github.io/charts
version: 4.4.2 version: 4.5.3
digest: sha256:70fdd035c3aa3b7185882f12a73143c58ab32f04262dda2cf34a2b1a52116d96 digest: sha256:241a06e1b5c76bf0ca50783cac9422040377023365e295762466a3527a3b2676
generated: "2020-03-29T14:37:59.349371452+01:00" generated: "2020-12-14T15:48:25.602957+08:00"

6
charts/argo-cd/requirements.yaml
View file

@ -1,5 +1,5 @@
dependencies: dependencies:
- name: redis-ha - name: redis-ha
version: 4.4.2 version: 4.5.3
repository: https://kubernetes-charts.storage.googleapis.com repository: https://dandydeveloper.github.io/charts
condition: redis-ha.enabled condition: redis-ha.enabled

4
charts/argo-cd/templates/argocd-application-controller/deployment.yaml → charts/argo-cd/templates/argocd-application-controller/statefulset.yaml Executable file → Normal file
View file

@ -1,6 +1,6 @@
{{- $redisHa := (index .Values "redis-ha") -}} {{- $redisHa := (index .Values "redis-ha") -}}
apiVersion: apps/v1 apiVersion: apps/v1
kind: {{ .Values.controller.enableStatefulSet | ternary "StatefulSet" "Deployment" }} kind: StatefulSet
metadata: metadata:
name: {{ template "argo-cd.controller.fullname" . }} name: {{ template "argo-cd.controller.fullname" . }}
labels: labels:
@ -16,9 +16,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.controller.enableStatefulSet }}
serviceName: {{ template "argo-cd.controller.fullname" . }} serviceName: {{ template "argo-cd.controller.fullname" . }}
{{- end }}
revisionHistoryLimit: 5 revisionHistoryLimit: 5
replicas: {{ .Values.controller.replicas }} replicas: {{ .Values.controller.replicas }}
template: template:

14
charts/argo-cd/values.yaml
View file

@ -10,7 +10,7 @@ installCRDs: true
global: global:
image: image:
repository: argoproj/argocd repository: argoproj/argocd
tag: v1.7.6 tag: v1.8.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext: {} securityContext: {}
# runAsUser: 999 # runAsUser: 999
@ -28,7 +28,7 @@ controller:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.7.6 tag: # v1.8.1
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
# If changing the number of replicas you must pass the number as ARGOCD_CONTROLLER_REPLICAS as an environment variable # 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. # resolved for this cloud to continue to maintain state.
# - alert: ArgoAppNotSynced # - alert: ArgoAppNotSynced
# expr: | # expr: |
# argocd_app_sync_status{sync_status!="Synced"} == 1 # argocd_app_info{sync_status!="Synced"} == 1
# for: 12h # for: 12h
# labels: # labels:
# severity: warning # severity: warning
@ -267,7 +267,7 @@ redis:
image: image:
repository: redis repository: redis
tag: 5.0.8 tag: 5.0.10-alpine
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
containerPort: 6379 containerPort: 6379
@ -337,7 +337,7 @@ redis-ha:
metrics: metrics:
enabled: true enabled: true
image: image:
tag: 5.0.8-alpine tag: 5.0.10-alpine
## Server ## Server
server: server:
@ -354,7 +354,7 @@ server:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.7.6 tag: # v1.8.1
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-server ## Additional command line arguments to pass to argocd-server
@ -706,7 +706,7 @@ repoServer:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.7.6 tag: # v1.8.1
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-repo-server ## Additional command line arguments to pass to argocd-repo-server

1
scripts/publish.sh
View file

@ -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 stable https://kubernetes-charts.storage.googleapis.com
helm repo add argoproj https://argoproj.github.io/argo-helm 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); for dir in $(find $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d);
do do