Merge branch 'master' into master

This commit is contained in:
Sébastien Prud'homme 2020-04-16 22:30:09 +02:00 committed by GitHub
commit f71b803b93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 15 deletions

View file

@ -1,8 +1,8 @@
apiVersion: v1 apiVersion: v1
appVersion: "1.5.1" appVersion: "1.5.2"
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.2.1 version: 2.2.5
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

View file

@ -47,7 +47,7 @@ $ helm install --name my-release argo/argo-cd
### Helm v3 Compatability ### Helm v3 Compatability
Requires chart version 1.5.1 or newer. Requires chart version 1.5.2 or newer.
Helm v3 has removed the `install-crds` hook so CRDs are now populated by files in the [crds](./crds) directory. Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistant webhooks. Helm v3 has removed the `install-crds` hook so CRDs are now populated by files in the [crds](./crds) directory. Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistant webhooks.
@ -57,13 +57,14 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|-----|------|---------| |-----|------|---------|
| global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` |
| global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` |
| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.5.1"` | | global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.5.2"` |
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
| global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
| global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
| nameOverride | Provide a name in place of `argocd` | `"argocd"` | | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
| installCRDs | bool | `true` | Install CRDs if you are using Helm2. | | installCRDs | bool | `true` | Install CRDs if you are using Helm2. |
| configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) | | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
| configs.secret.annotations | Annotations for argocd-secret | `{}` |
| configs.secret.argocdServerAdminPassword | Admin password | `null` | | configs.secret.argocdServerAdminPassword | Admin password | `null` |
| configs.secret.argocdServerAdminPasswordMtime | Admin password modification time | `date "2006-01-02T15:04:05Z" now` if configs.secret.argocdServerAdminPassword is set | | configs.secret.argocdServerAdminPasswordMtime | Admin password modification time | `date "2006-01-02T15:04:05Z" now` if configs.secret.argocdServerAdminPassword is set |
| configs.secret.bitbucketSecret | BitBucket incoming webhook secret | `""` | | configs.secret.bitbucketSecret | BitBucket incoming webhook secret | `""` |

View file

@ -10,6 +10,12 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
{{- if .Values.configs.secret.annotations }}
annotations:
{{- range $key, $value := .Values.configs.secret.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
type: Opaque type: Opaque
{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig .Values.configs.secret.extra) }} {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig .Values.configs.secret.extra) }}
# Setting a blank data again will wipe admin password/key/cert # Setting a blank data again will wipe admin password/key/cert

View file

@ -15,6 +15,9 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
{{- if .Values.server.service.labels }}
{{- toYaml .Values.server.service.labels | nindent 4 }}
{{- end }}
spec: spec:
type: {{ .Values.server.service.type }} type: {{ .Values.server.service.type }}
ports: ports:
@ -29,7 +32,12 @@ spec:
selector: selector:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
{{- if and (eq .Values.server.service.type "LoadBalancer") .Values.server.service.loadBalancerSourceRanges }} {{- if eq .Values.server.service.type "LoadBalancer" }}
{{- if .Values.server.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }}
{{- end }}
{{- if .Values.server.service.loadBalancerSourceRanges }}
loadBalancerSourceranges: loadBalancerSourceranges:
{{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }} {{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }}
{{- end }}
{{- end -}} {{- end -}}

View file

@ -10,7 +10,7 @@ installCRDs: true
global: global:
image: image:
repository: argoproj/argocd repository: argoproj/argocd
tag: v1.5.1 tag: v1.5.2
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.5.1 tag: # v1.5.2
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Argo controller commandline flags ## Argo controller commandline flags
@ -319,7 +319,7 @@ server:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.5.1 tag: # v1.5.2
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-server ## Additional command line arguments to pass to argocd-server
@ -404,6 +404,7 @@ server:
type: ClusterIP type: ClusterIP
servicePortHttp: 80 servicePortHttp: 80
servicePortHttps: 443 servicePortHttps: 443
loadBalancerIP: ""
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
## Server metrics service configuration ## Server metrics service configuration
@ -575,7 +576,7 @@ repoServer:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.5.1 tag: # v1.5.2
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-repo-server ## Additional command line arguments to pass to argocd-repo-server
@ -778,6 +779,9 @@ configs:
# -----END RSA PRIVATE KEY----- # -----END RSA PRIVATE KEY-----
secret: secret:
createSecret: true createSecret: true
## Annotations to be added to argocd-secret
##
annotations: {}
# Webhook Configs # Webhook Configs
githubSecret: "" githubSecret: ""

View file

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
description: A Helm chart to install Argo-Events in k8s Cluster description: A Helm chart to install Argo-Events in k8s Cluster
name: argo-events name: argo-events
version: 0.13.0 version: 0.14.0
keywords: keywords:
- argo-events - argo-events
- sensor-controller - sensor-controller
@ -10,6 +10,6 @@ sources:
- https://github.com/argoproj/argo-events - https://github.com/argoproj/argo-events
maintainers: maintainers:
- name: VaibhavPage - name: VaibhavPage
appVersion: 0.13.0 appVersion: 0.14.0
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm

View file

@ -3,6 +3,7 @@
This is a **community maintained** chart. It installs the [argo-events](https://github.com/argoproj/argo-events) application. This application comes packaged with: This is a **community maintained** chart. It installs the [argo-events](https://github.com/argoproj/argo-events) application. This application comes packaged with:
- Sensor Custom Resource Definition (See CRD Notes) - Sensor Custom Resource Definition (See CRD Notes)
- Gateway Custom Resource Definition (See CRD Notes) - Gateway Custom Resource Definition (See CRD Notes)
- EventSource Custom Resource Definition (See CRD Notes)
- Sensor Controller Deployment - Sensor Controller Deployment
- Sensor Controller ConfigMap - Sensor Controller ConfigMap
- Gateway Controller Deployment - Gateway Controller Deployment
@ -18,6 +19,7 @@ Some users would prefer to install the CRDs _outside_ of the chart. You can disa
You can install the CRDs manually like so: You can install the CRDs manually like so:
``` ```
kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.11/hack/k8s/manifests/sensor-crd.yaml kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.14.0/hack/k8s/manifests/sensor-crd.yaml
kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.11/hack/k8s/manifests/gateway-crd.yaml kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.14.0/hack/k8s/manifests/gateway-crd.yaml
kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.14.0/hack/k8s/manifests/event-source-crd.yaml
``` ```

View file

@ -42,11 +42,11 @@ singleNamespace: true
sensorController: sensorController:
name: sensor-controller name: sensor-controller
image: sensor-controller image: sensor-controller
tag: v0.13.0 tag: v0.14.0
replicaCount: 1 replicaCount: 1
gatewayController: gatewayController:
name: gateway-controller name: gateway-controller
image: gateway-controller image: gateway-controller
tag: v0.13.0 tag: v0.14.0
replicaCount: 1 replicaCount: 1