Merge branch 'master' into patch-1
This commit is contained in:
commit
fc2a7cb95c
40 changed files with 470 additions and 122 deletions
|
@ -1,8 +1,8 @@
|
|||
apiVersion: v1
|
||||
appVersion: "1.6.1"
|
||||
appVersion: "1.6.2"
|
||||
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 2.5.0
|
||||
version: 2.6.0
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
@ -68,6 +68,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
| 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"` |
|
||||
| installCRDs | Install CRDs if you are using Helm2. | `true` |
|
||||
| configs.knownHostsAnnotations | Known Hosts configmap annotations | `{}` |
|
||||
| configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
|
||||
| configs.secret.annotations | Annotations for argocd-secret | `{}` |
|
||||
| configs.secret.argocdServerAdminPassword | Bcrypt hashed admin password | `null` |
|
||||
|
@ -76,6 +77,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
| configs.secret.createSecret | Create the argocd-secret. | `true` |
|
||||
| configs.secret.githubSecret | GitHub incoming webhook secret | `""` |
|
||||
| configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` |
|
||||
| configs.tlsCertsAnnotations | TLS certificate configmap annotations | `{}` |
|
||||
| configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
|
||||
| configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
|
||||
| openshift.enabled | enables using arbitrary uid for argo repo server | `false` |
|
||||
|
@ -86,6 +88,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
|-----|---------|-------------|
|
||||
| controller.affinity | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) | `{}` |
|
||||
| controller.args.operationProcessors | define the controller `--operation-processors` | `"10"` |
|
||||
| controller.args.appResyncPeriod | define the controller `--app-resync` | `"180"` |
|
||||
| controller.args.statusProcessors | define the controller `--status-processors` | `"20"` |
|
||||
| controller.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
|
||||
| controller.containerPort | Controller listening port. | `8082` |
|
||||
|
@ -194,6 +197,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
| server.certificate.enabled | Enables a certificate manager certificate. | `false` |
|
||||
| server.certificate.issuer | Certificate manager issuer | `{}` |
|
||||
| server.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
|
||||
| server.configAnnotations | ArgoCD configuration configmap annotations | `{}` |
|
||||
| server.config | [General Argo CD configuration](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#repositories) | See [values.yaml](values.yaml) |
|
||||
| server.containerPort | Server container port. | `8080` |
|
||||
| server.extraArgs | Additional arguments for the server. A list of flags. | `[]` |
|
||||
|
@ -231,6 +235,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
| server.podAnnotations | Annotations for the server pods | `{}` |
|
||||
| server.podLabels | Labels for the server pods | `{}` |
|
||||
| server.priorityClassName | Priority class for the server | `""` |
|
||||
| server.rbacConfigAnnotations | RBAC configmap annotations | `{}` |
|
||||
| server.rbacConfig | [Argo CD RBAC policy](https://argoproj.github.io/argo-cd/operator-manual/rbac/) | `{}` |
|
||||
| server.readinessProbe.failureThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `3` |
|
||||
| server.readinessProbe.initialDelaySeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` |
|
||||
|
@ -306,6 +311,7 @@ through `xxx.extraArgs`
|
|||
| redis.podLabels | Labels for the Redis server pods | `{}` |
|
||||
| redis.priorityClassName | Priority class for redis | `""` |
|
||||
| redis.resources | Resource limits and requests for redis | `{}` |
|
||||
| redis.securityContext | Redis Pod Security Context | See [values.yaml](values.yaml) |
|
||||
| redis.servicePort | Redis service port | `6379` |
|
||||
| redis.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
|
||||
| redis-ha | Configures [Redis HA subchart](https://github.com/helm/charts/tree/master/stable/redis-ha) The properties below have been changed from the subchart defaults | |
|
||||
|
|
|
@ -52,6 +52,8 @@ spec:
|
|||
- {{ .Values.controller.args.statusProcessors | quote }}
|
||||
- --operation-processors
|
||||
- {{ .Values.controller.args.operationProcessors | quote }}
|
||||
- --app-resync
|
||||
- {{ .Values.controller.args.appResyncPeriod | quote }}
|
||||
- --repo-server
|
||||
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
|
||||
- --loglevel
|
||||
|
@ -121,3 +123,6 @@ spec:
|
|||
volumes:
|
||||
{{- toYaml .Values.controller.volumes | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- if .Values.controller.priorityClassName }}
|
||||
priorityClassName: {{ .Values.controller.priorityClassName }}
|
||||
{{- end }}
|
||||
|
|
|
@ -9,5 +9,11 @@ metadata:
|
|||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
app.kubernetes.io/part-of: argocd
|
||||
app.kubernetes.io/component: {{ .Values.server.name }}
|
||||
{{- if .Values.server.configAnnotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.server.configAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
data:
|
||||
{{- toYaml .Values.server.config | nindent 4 }}
|
|
@ -9,6 +9,12 @@ metadata:
|
|||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
app.kubernetes.io/part-of: argocd
|
||||
app.kubernetes.io/component: {{ .Values.server.name }}
|
||||
{{- if .Values.server.rbacConfigAnnotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.server.rbacConfigAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.server.rbacConfig }}
|
||||
data:
|
||||
{{- toYaml .Values.server.rbacConfig | nindent 4 }}
|
||||
|
|
|
@ -9,4 +9,10 @@ metadata:
|
|||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
app.kubernetes.io/part-of: argocd
|
||||
app.kubernetes.io/component: {{ .Values.server.name }}
|
||||
{{- if .Values.configs.knownHostsAnnotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.configs.knownHostsAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
name: argocd-ssh-known-hosts-cm
|
|
@ -11,4 +11,10 @@ metadata:
|
|||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
app.kubernetes.io/part-of: argocd
|
||||
app.kubernetes.io/component: {{ .Values.server.name }}
|
||||
{{- if .Values.configs.tlsCertsAnnotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.configs.tlsCertsAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
name: argocd-tls-certs-cm
|
|
@ -152,3 +152,6 @@ spec:
|
|||
initContainers:
|
||||
{{- toYaml .Values.repoServer.initContainers | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- if .Values.repoServer.priorityClassName }}
|
||||
priorityClassName: {{ .Values.repoServer.priorityClassName }}
|
||||
{{- end }}
|
||||
|
|
|
@ -151,3 +151,6 @@ spec:
|
|||
name: argocd-tls-certs-cm
|
||||
name: tls-certs
|
||||
{{- end }}
|
||||
{{- if .Values.server.priorityClassName }}
|
||||
priorityClassName: {{ .Values.server.priorityClassName }}
|
||||
{{- end }}
|
||||
|
|
|
@ -103,4 +103,7 @@ spec:
|
|||
volumes:
|
||||
{{- toYaml .Values.dex.volumes | nindent 8}}
|
||||
{{- end }}
|
||||
{{- if .Values.dex.priorityClassName }}
|
||||
priorityClassName: {{ .Values.dex.priorityClassName }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
@ -41,8 +41,8 @@ spec:
|
|||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
automountServiceAccountToken: false
|
||||
{{- if .Values.global.securityContext }}
|
||||
securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
|
||||
{{- if .Values.redis.securityContext }}
|
||||
securityContext: {{- toYaml .Values.redis.securityContext | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ template "argo-cd.redis.fullname" . }}
|
||||
|
@ -85,4 +85,7 @@ spec:
|
|||
volumes:
|
||||
{{- toYaml .Values.redis.volumes | nindent 8}}
|
||||
{{- end }}
|
||||
{{- if .Values.redis.priorityClassName }}
|
||||
priorityClassName: {{ .Values.redis.priorityClassName }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
@ -10,7 +10,7 @@ installCRDs: true
|
|||
global:
|
||||
image:
|
||||
repository: argoproj/argocd
|
||||
tag: v1.6.1
|
||||
tag: v1.6.2
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext: {}
|
||||
# runAsUser: 999
|
||||
|
@ -28,13 +28,14 @@ controller:
|
|||
|
||||
image:
|
||||
repository: # argoproj/argocd
|
||||
tag: # v1.6.1
|
||||
tag: # v1.6.2
|
||||
imagePullPolicy: # IfNotPresent
|
||||
|
||||
## Argo controller commandline flags
|
||||
args:
|
||||
statusProcessors: "20"
|
||||
operationProcessors: "10"
|
||||
appResyncPeriod: "180"
|
||||
|
||||
## Argo controller log level
|
||||
logLevel: info
|
||||
|
@ -276,6 +277,12 @@ redis:
|
|||
# drop:
|
||||
# - all
|
||||
|
||||
## Redis Pod specific security context
|
||||
securityContext:
|
||||
runAsUser: 1000
|
||||
runAsGroup: 1000
|
||||
fsGroup: 1000
|
||||
runAsNonRoot: true
|
||||
|
||||
resources: {}
|
||||
# limits:
|
||||
|
@ -515,6 +522,9 @@ server:
|
|||
# - profile
|
||||
# - email
|
||||
|
||||
## Annotations to be added to ArgoCD ConfigMap
|
||||
configAnnotations: {}
|
||||
|
||||
## ArgoCD rbac config
|
||||
## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md
|
||||
rbacConfig:
|
||||
|
@ -538,6 +548,9 @@ server:
|
|||
# If omitted, defaults to: '[groups]'. The scope value can be a string, or a list of strings.
|
||||
# scopes: '[cognito:groups, email]'
|
||||
|
||||
## Annotations to be added to ArgoCD rbac ConfigMap
|
||||
rbacConfigAnnotations: {}
|
||||
|
||||
## Not well tested and not well supported on release v1.0.0.
|
||||
## Applications
|
||||
## reference: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
|
||||
|
@ -756,6 +769,7 @@ repoServer:
|
|||
|
||||
## Argo Configs
|
||||
configs:
|
||||
knownHostsAnnotations: {}
|
||||
knownHosts:
|
||||
data:
|
||||
ssh_known_hosts: |
|
||||
|
@ -766,6 +780,7 @@ configs:
|
|||
gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
|
||||
ssh.dev.azure.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
|
||||
vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
|
||||
tlsCertsAnnotations: {}
|
||||
tlsCerts:
|
||||
{}
|
||||
# data:
|
||||
|
|
|
@ -1,15 +1,17 @@
|
|||
apiVersion: v1
|
||||
description: A Helm chart to install Argo-Events in k8s Cluster
|
||||
name: argo-events
|
||||
version: 0.14.0
|
||||
version: 0.17.0
|
||||
keywords:
|
||||
- argo-events
|
||||
- sensor-controller
|
||||
- gateway-controller
|
||||
- eventsource-controller
|
||||
- eventbus-controller
|
||||
sources:
|
||||
- https://github.com/argoproj/argo-events
|
||||
maintainers:
|
||||
- name: VaibhavPage
|
||||
appVersion: 0.14.0
|
||||
- name: whynowy
|
||||
appVersion: 0.17.0
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
|
|
|
@ -2,13 +2,14 @@
|
|||
|
||||
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)
|
||||
- Gateway Custom Resource Definition (See CRD Notes)
|
||||
- EventSource Custom Resource Definition (See CRD Notes)
|
||||
- EventBus Custom Resource Definition (See CRD Notes)
|
||||
- Sensor Controller Deployment
|
||||
- Sensor Controller ConfigMap
|
||||
- Gateway Controller Deployment
|
||||
- Gateway Controller ConfigMap
|
||||
- EventSource Controller Deployment
|
||||
- EventBus Controller Deployment
|
||||
- Service Account
|
||||
- Roles
|
||||
- Role Bindings
|
||||
- Cluster Roles
|
||||
- Cluster Role Bindings
|
||||
|
||||
|
@ -16,10 +17,4 @@ This is a **community maintained** chart. It installs the [argo-events](https://
|
|||
|
||||
Some users would prefer to install the CRDs _outside_ of the chart. You can disable the CRD installation of this chart by using `--set installCRD=false` when installing the chart.
|
||||
|
||||
You can install the CRDs manually like so:
|
||||
|
||||
```
|
||||
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.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
|
||||
```
|
||||
You can install the CRDs manually from `crds` folder.
|
|
@ -1,16 +1,15 @@
|
|||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: gateways.argoproj.io
|
||||
name: eventbus.argoproj.io
|
||||
spec:
|
||||
group: argoproj.io
|
||||
names:
|
||||
kind: Gateway
|
||||
listKind: GatewayList
|
||||
plural: gateways
|
||||
singular: gateway
|
||||
kind: EventBus
|
||||
listKind: EventBusList
|
||||
plural: eventbus
|
||||
shortNames:
|
||||
- gw
|
||||
- eb
|
||||
singular: eventbus
|
||||
scope: Namespaced
|
||||
version: "v1alpha1"
|
||||
version: v1alpha1
|
|
@ -1,3 +1,5 @@
|
|||
{{- if not .Values.singleNamespace }}
|
||||
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRoleBinding
|
||||
metadata:
|
||||
|
@ -43,12 +45,12 @@ rules:
|
|||
- workflows/finalizers
|
||||
- workflowtemplates
|
||||
- workflowtemplates/finalizers
|
||||
- gateways
|
||||
- gateways/finalizers
|
||||
- sensors
|
||||
- sensors/finalizers
|
||||
- eventsources
|
||||
- eventsources/finalizers
|
||||
- eventbus
|
||||
- eventbus/finalizers
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
|
@ -83,6 +85,7 @@ rules:
|
|||
- "apps"
|
||||
resources:
|
||||
- deployments
|
||||
- statefulsets
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
|
@ -92,3 +95,4 @@ rules:
|
|||
- patch
|
||||
- delete
|
||||
|
||||
{{- end }}
|
||||
|
|
100
charts/argo-events/templates/argo-events-roles.yaml
Normal file
100
charts/argo-events/templates/argo-events-roles.yaml
Normal file
|
@ -0,0 +1,100 @@
|
|||
{{- if .Values.singleNamespace }}
|
||||
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
name: argo-events-binding
|
||||
namespace: {{ .Release.Namespace }}
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
name: argo-events-role
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: {{ .Values.serviceAccount }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
{{- if .Values.additionalSaNamespaces }}
|
||||
{{ $sa := .Values.serviceAccount }}
|
||||
{{- range $namespace := .Values.additionalSaNamespaces }}
|
||||
- kind: ServiceAccount
|
||||
name: {{ $sa }}
|
||||
namespace: {{ $namespace }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
name: argo-events-role
|
||||
namespace: {{ .Release.Namespace }}
|
||||
rules:
|
||||
{{- if .Values.additionalServiceAccountRules }}
|
||||
{{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
|
||||
{{- end }}
|
||||
- apiGroups:
|
||||
- argoproj.io
|
||||
verbs:
|
||||
- create
|
||||
- delete
|
||||
- deletecollection
|
||||
- get
|
||||
- list
|
||||
- patch
|
||||
- update
|
||||
- watch
|
||||
resources:
|
||||
- workflows
|
||||
- workflows/finalizers
|
||||
- workflowtemplates
|
||||
- workflowtemplates/finalizers
|
||||
- sensors
|
||||
- sensors/finalizers
|
||||
- eventsources
|
||||
- eventsources/finalizers
|
||||
- eventbus
|
||||
- eventbus/finalizers
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- pods
|
||||
- pods/exec
|
||||
- configmaps
|
||||
- secrets
|
||||
- services
|
||||
- events
|
||||
- persistentvolumeclaims
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- update
|
||||
- patch
|
||||
- delete
|
||||
- apiGroups:
|
||||
- "batch"
|
||||
resources:
|
||||
- jobs
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- update
|
||||
- patch
|
||||
- delete
|
||||
- apiGroups:
|
||||
- "apps"
|
||||
resources:
|
||||
- deployments
|
||||
- statefulsets
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- update
|
||||
- patch
|
||||
- delete
|
||||
|
||||
{{- end }}
|
|
@ -0,0 +1,39 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
|
||||
labels:
|
||||
app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
replicas: {{ .Values.eventbusController.replicaCount }}
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
|
||||
release: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
|
||||
release: {{ .Release.Name }}
|
||||
spec:
|
||||
serviceAccountName: {{ .Values.serviceAccount }}
|
||||
containers:
|
||||
- name: {{ .Values.eventbusController.name }}
|
||||
image: "{{ .Values.registry }}/{{ .Values.eventbusController.image }}:{{ .Values.eventbusController.tag }}"
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
{{- if .Values.singleNamespace }}
|
||||
args:
|
||||
- --namespaced
|
||||
{{- end }}
|
||||
env:
|
||||
- name: NAMESPACE
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
- name: NATS_STREAMING_IMAGE
|
||||
value: {{ .Values.eventbusController.natsStreamingImage }}
|
||||
- name: NATS_METRICS_EXPORTER_IMAGE
|
||||
value: {{ .Values.eventbusController.natsMetricsExporterImage }}
|
21
charts/argo-events/templates/eventbus-crd.yaml
Normal file
21
charts/argo-events/templates/eventbus-crd.yaml
Normal file
|
@ -0,0 +1,21 @@
|
|||
{{- if .Values.installCRD }}
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: eventbus.argoproj.io
|
||||
spec:
|
||||
group: argoproj.io
|
||||
names:
|
||||
kind: EventBus
|
||||
listKind: EventBusList
|
||||
plural: eventbus
|
||||
shortNames:
|
||||
- eb
|
||||
singular: eventbus
|
||||
scope: Namespaced
|
||||
version: v1alpha1
|
||||
versions:
|
||||
- name: v1alpha1
|
||||
served: true
|
||||
storage: true
|
||||
{{- end }}
|
|
@ -0,0 +1,37 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
|
||||
labels:
|
||||
app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
replicas: {{ .Values.eventsourceController.replicaCount }}
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
|
||||
release: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
|
||||
release: {{ .Release.Name }}
|
||||
spec:
|
||||
serviceAccountName: {{ .Values.serviceAccount }}
|
||||
containers:
|
||||
- name: {{ .Values.eventsourceController.name }}
|
||||
image: "{{ .Values.registry }}/{{ .Values.eventsourceController.image }}:{{ .Values.eventsourceController.tag }}"
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
{{- if .Values.singleNamespace }}
|
||||
args:
|
||||
- --namespaced
|
||||
{{- end }}
|
||||
env:
|
||||
- name: NAMESPACE
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
- name: EVENTSOURCE_IMAGE
|
||||
value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}"
|
|
@ -1,14 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap
|
||||
labels:
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
data:
|
||||
config: |
|
||||
instanceID: {{ .Values.instanceID }}
|
||||
{{- if .Values.singleNamespace }}
|
||||
namespace: {{ .Values.namespace }}
|
||||
{{- end }}
|
|
@ -1,33 +0,0 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.gatewayController.name }}
|
||||
labels:
|
||||
app: {{ .Release.Name }}-{{ .Values.gatewayController.name }}
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
replicas: {{ .Values.gatewayController.replicaCount }}
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ .Release.Name }}-{{ .Values.gatewayController.name }}
|
||||
release: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ .Release.Name }}-{{ .Values.gatewayController.name }}
|
||||
release: {{ .Release.Name }}
|
||||
spec:
|
||||
serviceAccountName: {{ .Values.serviceAccount }}
|
||||
containers:
|
||||
- name: {{ .Values.gatewayController.name }}
|
||||
image: "{{ .Values.registry }}/{{ .Values.gatewayController.image }}:{{ .Values.gatewayController.tag }}"
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
env:
|
||||
- name: NAMESPACE
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
- name: CONTROLLER_CONFIG_MAP
|
||||
value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap
|
|
@ -1,18 +0,0 @@
|
|||
{{- if .Values.installCRD }}
|
||||
# Define a "gateway" custom resource definition
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: gateways.argoproj.io
|
||||
spec:
|
||||
group: argoproj.io
|
||||
names:
|
||||
kind: Gateway
|
||||
listKind: GatewayList
|
||||
plural: gateways
|
||||
singular: gateway
|
||||
shortNames:
|
||||
- gw
|
||||
scope: Namespaced
|
||||
version: "v1alpha1"
|
||||
{{- end }}
|
|
@ -1,14 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap
|
||||
labels:
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
data:
|
||||
config: |
|
||||
instanceID: {{ .Values.instanceID }}
|
||||
{{- if .Values.singleNamespace }}
|
||||
namespace: {{ .Values.namespace }}
|
||||
{{- end }}
|
|
@ -24,10 +24,14 @@ spec:
|
|||
- name: {{ .Values.sensorController.name }}
|
||||
image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}"
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
{{- if .Values.singleNamespace }}
|
||||
args:
|
||||
- --namespaced
|
||||
{{- end }}
|
||||
env:
|
||||
- name: NAMESPACE
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
- name: CONTROLLER_CONFIG_MAP
|
||||
value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap
|
||||
- name: SENSOR_IMAGE
|
||||
value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
|
||||
|
|
|
@ -42,11 +42,21 @@ singleNamespace: true
|
|||
sensorController:
|
||||
name: sensor-controller
|
||||
image: sensor-controller
|
||||
tag: v0.14.0
|
||||
tag: v0.17.0
|
||||
replicaCount: 1
|
||||
sensorImage: sensor
|
||||
|
||||
gatewayController:
|
||||
name: gateway-controller
|
||||
image: gateway-controller
|
||||
tag: v0.14.0
|
||||
eventsourceController:
|
||||
name: eventsource-controller
|
||||
image: eventsource-controller
|
||||
tag: v0.17.0
|
||||
replicaCount: 1
|
||||
eventsourceImage: eventsource
|
||||
|
||||
eventbusController:
|
||||
name: eventbus-controller
|
||||
image: eventbus-controller
|
||||
tag: v0.17.0
|
||||
replicaCount: 1
|
||||
natsStreamingImage: nats-streaming:0.17.0
|
||||
natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
apiVersion: v1
|
||||
appVersion: "0.8.0"
|
||||
appVersion: "0.8.3"
|
||||
description: A Helm chart for Argo Rollouts
|
||||
name: argo-rollouts
|
||||
version: 0.3.0
|
||||
version: 0.3.5
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
maintainers:
|
||||
|
|
|
@ -35,6 +35,10 @@ $ helm install --name my-release argo/argo-rollouts
|
|||
| controller.image.repository | string | `"argoproj/argo-rollouts"` | |
|
||||
| controller.image.tag | string | `"v0.8.0"` | |
|
||||
| controller.name | string | `"argo-rollouts"` | |
|
||||
| controller.resources | Resource limits and requests for the controller pods. | `{}` |
|
||||
| controller.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
|
||||
| controller.affinity | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) | `{}` |
|
||||
| controller.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
|
||||
| imagePullSecrets | list | `[]` | |
|
||||
| installCRDs | bool | `true` | |
|
||||
| podAnnotations | object | `{}` | |
|
||||
|
|
|
@ -106,4 +106,11 @@ rules:
|
|||
- watch
|
||||
- get
|
||||
- update
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- pods
|
||||
verbs:
|
||||
- list
|
||||
- delete
|
||||
{{- end }}
|
||||
|
|
|
@ -38,6 +38,20 @@ spec:
|
|||
volumeMounts:
|
||||
- name: tmp
|
||||
mountPath: /tmp
|
||||
resources:
|
||||
{{- toYaml .Values.controller.resources | nindent 10 }}
|
||||
{{- if .Values.controller.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml .Values.controller.nodeSelector | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- if .Values.controller.tolerations }}
|
||||
tolerations:
|
||||
{{- toYaml .Values.controller.tolerations | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- if .Values.controller.affinity }}
|
||||
affinity:
|
||||
{{- toYaml .Values.controller.affinity | nindent 8 }}
|
||||
{{- end }}
|
||||
volumes:
|
||||
- name: tmp
|
||||
emptyDir: {}
|
||||
|
|
|
@ -6,6 +6,10 @@ metadata:
|
|||
app.kubernetes.io/component: server
|
||||
app.kubernetes.io/name: {{ .Release.Name }}-metrics
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.serviceAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
spec:
|
||||
ports:
|
||||
- name: metrics
|
||||
|
|
|
@ -5,19 +5,38 @@ clusterInstall: true
|
|||
controller:
|
||||
name: argo-rollouts
|
||||
component: rollouts-controller
|
||||
## Node selectors and tolerations for server scheduling to nodes with taints
|
||||
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
|
||||
##
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
image:
|
||||
repository: argoproj/argo-rollouts
|
||||
tag: v0.8.0
|
||||
tag: v0.8.3
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
resources: {}
|
||||
# limits:
|
||||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
# requests:
|
||||
# cpu: 50m
|
||||
# memory: 64Mi
|
||||
|
||||
|
||||
serviceAccount:
|
||||
name: argo-rollouts
|
||||
|
||||
## Annotations to be added to the Redis server pods
|
||||
## Annotations to be added to the Rollout pods
|
||||
##
|
||||
podAnnotations: {}
|
||||
|
||||
## Labels to be added to the Redis server pods
|
||||
## Annotations to be added to the Rollout service
|
||||
##
|
||||
serviceAnnotations: {}
|
||||
|
||||
## Labels to be added to the Rollout pods
|
||||
##
|
||||
podLabels: {}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ appVersion: 0.7.0
|
|||
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
||||
name: argocd-notifications
|
||||
type: application
|
||||
version: 1.0.7
|
||||
version: 1.0.10
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
@ -43,6 +43,19 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
|||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Common metrics labels
|
||||
*/}}
|
||||
{{- define "argocd-notifications.metrics.labels" -}}
|
||||
helm.sh/chart: {{ include "argocd-notifications.chart" . }}
|
||||
{{ include "argocd-notifications.metrics.selectorLabels" . }}
|
||||
{{- if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
{{- end -}}
|
||||
|
||||
|
||||
{{/*
|
||||
Common slack bot labels
|
||||
*/}}
|
||||
|
@ -63,6 +76,14 @@ app.kubernetes.io/name: {{ include "argocd-notifications.name" . }}
|
|||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Selector metrics labels
|
||||
*/}}
|
||||
{{- define "argocd-notifications.metrics.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "argocd-notifications.name" . }}-metrics
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Selector slack bot labels
|
||||
*/}}
|
||||
|
|
|
@ -3,6 +3,10 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "argocd-notifications.name" . }}-bot
|
||||
{{- if .Values.bots.slack.service.annotations }}
|
||||
annotations:
|
||||
{{- toYaml .Values.bots.slack.service.annotations | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
ports:
|
||||
- name: server
|
||||
|
|
|
@ -12,6 +12,12 @@ spec:
|
|||
{{- include "argocd-notifications.selectorLabels" . | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.podAnnotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.podAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argocd-notifications.selectorLabels" . | nindent 8 }}
|
||||
spec:
|
||||
|
@ -29,6 +35,19 @@ spec:
|
|||
command:
|
||||
- /app/argocd-notifications
|
||||
- controller
|
||||
- --loglevel={{ .Values.logLevel }}
|
||||
{{- if .Values.metrics.enabled }}
|
||||
- --metrics-port={{ .Values.metrics.port }}
|
||||
{{- end }}
|
||||
{{- range .Values.extraArgs }}
|
||||
- {{ . | squote }}
|
||||
{{- end }}
|
||||
ports:
|
||||
{{- if .Values.metrics.enabled }}
|
||||
- containerPort: {{ .Values.metrics.port }}
|
||||
name: metrics
|
||||
protocol: TCP
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
|
15
charts/argocd-notifications/templates/service-metrics.yaml
Normal file
15
charts/argocd-notifications/templates/service-metrics.yaml
Normal file
|
@ -0,0 +1,15 @@
|
|||
{{- if .Values.metrics.enabled }}
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "argocd-notifications.name" . }}-metrics
|
||||
labels:
|
||||
{{- include "argocd-notifications.metrics.labels" . | nindent 4 }}
|
||||
spec:
|
||||
selector:
|
||||
{{- include "argocd-notifications.selectorLabels" . | nindent 4 }}
|
||||
ports:
|
||||
- name: metrics
|
||||
port: {{ .Values.metrics.port }}
|
||||
targetPort: {{ .Values.metrics.port }}
|
||||
{{- end }}
|
30
charts/argocd-notifications/templates/servicemonitor.yaml
Normal file
30
charts/argocd-notifications/templates/servicemonitor.yaml
Normal file
|
@ -0,0 +1,30 @@
|
|||
{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: {{ include "argocd-notifications.name" . }}-metrics
|
||||
{{- if .Values.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argocd-notifications.metrics.labels" . | nindent 4 }}
|
||||
{{- if .Values.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml .Values.metrics.serviceMonitor.additionalLabels | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
endpoints:
|
||||
- port: metrics
|
||||
path: /metrics
|
||||
{{- if .Values.metrics.serviceMonitor.interval }}
|
||||
interval: {{ .Values.metrics.serviceMonitor.interval }}
|
||||
{{- end }}
|
||||
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
|
||||
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
|
||||
{{- end }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Release.Namespace }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "argocd-notifications.metrics.selectorLabels" . | nindent 6 }}
|
||||
{{- end }}
|
|
@ -87,6 +87,22 @@ secret:
|
|||
# email address in from field
|
||||
from:
|
||||
|
||||
logLevel: info
|
||||
|
||||
extraArgs: []
|
||||
|
||||
metrics:
|
||||
enabled: false
|
||||
port: 9001
|
||||
serviceMonitor:
|
||||
enabled: false
|
||||
additionalLabels: {}
|
||||
# namespace: monitoring
|
||||
# interval: 30s
|
||||
# scrapeTimeout: 10s
|
||||
|
||||
podAnnotations: {}
|
||||
|
||||
resources: {}
|
||||
# limits:
|
||||
# cpu: 100m
|
||||
|
@ -194,6 +210,7 @@ bots:
|
|||
imagePullSecrets: []
|
||||
|
||||
service:
|
||||
annotations: {}
|
||||
type: LoadBalancer
|
||||
|
||||
serviceAccount:
|
||||
|
|
Loading…
Reference in a new issue