Merge branch 'master' into patch-1
This commit is contained in:
commit
eb8687c6ca
28 changed files with 365 additions and 120 deletions
|
@ -1,8 +1,8 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
appVersion: "1.6.1"
|
appVersion: "1.6.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.5.3
|
version: 2.6.0
|
||||||
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:
|
||||||
|
|
|
@ -311,6 +311,7 @@ through `xxx.extraArgs`
|
||||||
| redis.podLabels | Labels for the Redis server pods | `{}` |
|
| redis.podLabels | Labels for the Redis server pods | `{}` |
|
||||||
| redis.priorityClassName | Priority class for redis | `""` |
|
| redis.priorityClassName | Priority class for redis | `""` |
|
||||||
| redis.resources | Resource limits and requests 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.servicePort | Redis service port | `6379` |
|
||||||
| redis.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
|
| 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 | |
|
| 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 | |
|
||||||
|
|
|
@ -41,8 +41,8 @@ spec:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
{{- if .Values.global.securityContext }}
|
{{- if .Values.redis.securityContext }}
|
||||||
securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
|
securityContext: {{- toYaml .Values.redis.securityContext | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ template "argo-cd.redis.fullname" . }}
|
- name: {{ template "argo-cd.redis.fullname" . }}
|
||||||
|
|
|
@ -10,7 +10,7 @@ installCRDs: true
|
||||||
global:
|
global:
|
||||||
image:
|
image:
|
||||||
repository: argoproj/argocd
|
repository: argoproj/argocd
|
||||||
tag: v1.6.1
|
tag: v1.6.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.6.1
|
tag: # v1.6.2
|
||||||
imagePullPolicy: # IfNotPresent
|
imagePullPolicy: # IfNotPresent
|
||||||
|
|
||||||
## Argo controller commandline flags
|
## Argo controller commandline flags
|
||||||
|
@ -277,6 +277,12 @@ redis:
|
||||||
# drop:
|
# drop:
|
||||||
# - all
|
# - all
|
||||||
|
|
||||||
|
## Redis Pod specific security context
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 1000
|
||||||
|
runAsGroup: 1000
|
||||||
|
fsGroup: 1000
|
||||||
|
runAsNonRoot: true
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
# limits:
|
# limits:
|
||||||
|
|
|
@ -1,15 +1,17 @@
|
||||||
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.14.0
|
version: 0.17.0
|
||||||
keywords:
|
keywords:
|
||||||
- argo-events
|
- argo-events
|
||||||
- sensor-controller
|
- sensor-controller
|
||||||
- gateway-controller
|
- eventsource-controller
|
||||||
|
- eventbus-controller
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/argoproj/argo-events
|
- https://github.com/argoproj/argo-events
|
||||||
maintainers:
|
maintainers:
|
||||||
- name: VaibhavPage
|
- name: VaibhavPage
|
||||||
appVersion: 0.14.0
|
- name: whynowy
|
||||||
|
appVersion: 0.17.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
|
||||||
|
|
|
@ -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:
|
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)
|
|
||||||
- EventSource 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 Deployment
|
||||||
- Sensor Controller ConfigMap
|
- EventSource Controller Deployment
|
||||||
- Gateway Controller Deployment
|
- EventBus Controller Deployment
|
||||||
- Gateway Controller ConfigMap
|
|
||||||
- Service Account
|
- Service Account
|
||||||
|
- Roles
|
||||||
|
- Role Bindings
|
||||||
- Cluster Roles
|
- Cluster Roles
|
||||||
- Cluster Role Bindings
|
- 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.
|
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:
|
You can install the CRDs manually from `crds` folder.
|
||||||
|
|
||||||
```
|
|
||||||
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
|
|
||||||
```
|
|
|
@ -1,16 +1,15 @@
|
||||||
---
|
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
apiVersion: apiextensions.k8s.io/v1beta1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
name: gateways.argoproj.io
|
name: eventbus.argoproj.io
|
||||||
spec:
|
spec:
|
||||||
group: argoproj.io
|
group: argoproj.io
|
||||||
names:
|
names:
|
||||||
kind: Gateway
|
kind: EventBus
|
||||||
listKind: GatewayList
|
listKind: EventBusList
|
||||||
plural: gateways
|
plural: eventbus
|
||||||
singular: gateway
|
|
||||||
shortNames:
|
shortNames:
|
||||||
- gw
|
- eb
|
||||||
|
singular: eventbus
|
||||||
scope: Namespaced
|
scope: Namespaced
|
||||||
version: "v1alpha1"
|
version: v1alpha1
|
|
@ -1,3 +1,5 @@
|
||||||
|
{{- if not .Values.singleNamespace }}
|
||||||
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -43,12 +45,12 @@ rules:
|
||||||
- workflows/finalizers
|
- workflows/finalizers
|
||||||
- workflowtemplates
|
- workflowtemplates
|
||||||
- workflowtemplates/finalizers
|
- workflowtemplates/finalizers
|
||||||
- gateways
|
|
||||||
- gateways/finalizers
|
|
||||||
- sensors
|
- sensors
|
||||||
- sensors/finalizers
|
- sensors/finalizers
|
||||||
- eventsources
|
- eventsources
|
||||||
- eventsources/finalizers
|
- eventsources/finalizers
|
||||||
|
- eventbus
|
||||||
|
- eventbus/finalizers
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
|
@ -83,6 +85,7 @@ rules:
|
||||||
- "apps"
|
- "apps"
|
||||||
resources:
|
resources:
|
||||||
- deployments
|
- deployments
|
||||||
|
- statefulsets
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
- get
|
- get
|
||||||
|
@ -92,3 +95,4 @@ rules:
|
||||||
- patch
|
- patch
|
||||||
- delete
|
- 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 }}
|
- name: {{ .Values.sensorController.name }}
|
||||||
image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}"
|
image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}"
|
||||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
args:
|
||||||
|
- --namespaced
|
||||||
|
{{- end }}
|
||||||
env:
|
env:
|
||||||
- name: NAMESPACE
|
- name: NAMESPACE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: CONTROLLER_CONFIG_MAP
|
- name: SENSOR_IMAGE
|
||||||
value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap
|
value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
|
||||||
|
|
|
@ -42,11 +42,21 @@ singleNamespace: true
|
||||||
sensorController:
|
sensorController:
|
||||||
name: sensor-controller
|
name: sensor-controller
|
||||||
image: sensor-controller
|
image: sensor-controller
|
||||||
tag: v0.14.0
|
tag: v0.17.0
|
||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
|
sensorImage: sensor
|
||||||
|
|
||||||
gatewayController:
|
eventsourceController:
|
||||||
name: gateway-controller
|
name: eventsource-controller
|
||||||
image: gateway-controller
|
image: eventsource-controller
|
||||||
tag: v0.14.0
|
tag: v0.17.0
|
||||||
replicaCount: 1
|
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
|
apiVersion: v1
|
||||||
appVersion: "0.8.0"
|
appVersion: "0.8.3"
|
||||||
description: A Helm chart for Argo Rollouts
|
description: A Helm chart for Argo Rollouts
|
||||||
name: argo-rollouts
|
name: argo-rollouts
|
||||||
version: 0.3.2
|
version: 0.3.4
|
||||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
|
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
maintainers:
|
maintainers:
|
||||||
|
|
|
@ -13,7 +13,7 @@ controller:
|
||||||
affinity: {}
|
affinity: {}
|
||||||
image:
|
image:
|
||||||
repository: argoproj/argo-rollouts
|
repository: argoproj/argo-rollouts
|
||||||
tag: v0.8.0
|
tag: v0.8.3
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
|
|
|
@ -3,7 +3,7 @@ appVersion: 0.7.0
|
||||||
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
||||||
name: argocd-notifications
|
name: argocd-notifications
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.7
|
version: 1.0.10
|
||||||
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:
|
||||||
|
|
|
@ -43,6 +43,19 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
{{- end -}}
|
{{- 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
|
Common slack bot labels
|
||||||
*/}}
|
*/}}
|
||||||
|
@ -63,6 +76,14 @@ app.kubernetes.io/name: {{ include "argocd-notifications.name" . }}
|
||||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
{{- end -}}
|
{{- 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
|
Selector slack bot labels
|
||||||
*/}}
|
*/}}
|
||||||
|
|
|
@ -3,6 +3,10 @@ apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argocd-notifications.name" . }}-bot
|
name: {{ include "argocd-notifications.name" . }}-bot
|
||||||
|
{{- if .Values.bots.slack.service.annotations }}
|
||||||
|
annotations:
|
||||||
|
{{- toYaml .Values.bots.slack.service.annotations | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- name: server
|
- name: server
|
||||||
|
|
|
@ -12,6 +12,12 @@ spec:
|
||||||
{{- include "argocd-notifications.selectorLabels" . | nindent 6 }}
|
{{- include "argocd-notifications.selectorLabels" . | nindent 6 }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
|
{{- if .Values.podAnnotations }}
|
||||||
|
annotations:
|
||||||
|
{{- range $key, $value := .Values.podAnnotations }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "argocd-notifications.selectorLabels" . | nindent 8 }}
|
{{- include "argocd-notifications.selectorLabels" . | nindent 8 }}
|
||||||
spec:
|
spec:
|
||||||
|
@ -29,6 +35,19 @@ spec:
|
||||||
command:
|
command:
|
||||||
- /app/argocd-notifications
|
- /app/argocd-notifications
|
||||||
- controller
|
- 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 }}
|
{{- with .Values.nodeSelector }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- 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
|
# email address in from field
|
||||||
from:
|
from:
|
||||||
|
|
||||||
|
logLevel: info
|
||||||
|
|
||||||
|
extraArgs: []
|
||||||
|
|
||||||
|
metrics:
|
||||||
|
enabled: false
|
||||||
|
port: 9001
|
||||||
|
serviceMonitor:
|
||||||
|
enabled: false
|
||||||
|
additionalLabels: {}
|
||||||
|
# namespace: monitoring
|
||||||
|
# interval: 30s
|
||||||
|
# scrapeTimeout: 10s
|
||||||
|
|
||||||
|
podAnnotations: {}
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
# limits:
|
# limits:
|
||||||
# cpu: 100m
|
# cpu: 100m
|
||||||
|
@ -194,6 +210,7 @@ bots:
|
||||||
imagePullSecrets: []
|
imagePullSecrets: []
|
||||||
|
|
||||||
service:
|
service:
|
||||||
|
annotations: {}
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
|
|
||||||
serviceAccount:
|
serviceAccount:
|
||||||
|
|
Loading…
Reference in a new issue