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

Merge branch 'master' of github.com:argoproj/argo-helm into add-flag-for-cm

Browse source
This commit is contained in:
Matt Gowie 2021-03-08 11:28:13 -07:00
commit 913a8c0d98
22 changed files with 129 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/README.md
View file

@ -14,6 +14,10 @@ This chart currently installs the non-HA version of ArgoCD.
## Upgrading
### 2.14.7 and above
The `matchLabels` key in the ArgoCD Appliaction Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource.
### 2.10.x to 2.11.0
The application controller is now available as a `StatefulSet` when the `controller.enableStatefulSet` flag is set to true. Depending on your Helm deployment this may be a downtime or breaking change if enabled when using HA and will become the default in 3.x.
@ -329,7 +333,7 @@ through `xxx.extraArgs`
| 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 | |
| redis-ha | Configures [Redis HA subchart](https://github.com/DandyDeveloper/charts/tree/master/charts/redis-ha) The properties below have been changed from the subchart defaults | |
| redis-ha.enabled | Enables the Redis HA subchart and disables the custom Redis single node deployment| `false` |
| redis-ha.exporter.enabled | If `true`, the prometheus exporter sidecar is enabled | `true` |
| redis-ha.persistentVolume.enabled | Configures persistency on Redis nodes | `false`

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

@ -1,6 +1,6 @@
dependencies:
- name: redis-ha
repository: https://dandydeveloper.github.io/charts/
version: 4.10.1
digest: sha256:e1e0526ad009ecc065df937b48c4e0e5877e5194242c7888b1dc4467775f2663
generated: "2020-12-14T14:00:30.830130403+01:00"
version: 4.10.4
digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2
generated: "2021-03-03T10:13:21.0955491+01:00"

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

@ -1,5 +1,5 @@
dependencies:
- name: redis-ha
version: 4.10.1
version: 4.10.4
repository: https://dandydeveloper.github.io/charts/
condition: redis-ha.enabled

2
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -14,7 +14,7 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.controller.enableStatefulSet }}
serviceName: {{ template "argo-cd.controller.fullname" . }}

6
charts/argo-events/Chart.yaml
View file

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

7
charts/argo-events/crds/eventbus-crd.yml
View file

@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: eventbus.argoproj.io
@ -12,4 +12,7 @@ spec:
- eb
singular: eventbus
scope: Namespaced
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true

7
charts/argo-events/crds/eventsource-crd.yml
View file

@ -1,5 +1,5 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: eventsources.argoproj.io
@ -13,6 +13,9 @@ spec:
listKind: EventSourceList
shortNames:
- es
version: "v1alpha1"
versions:
- name: v1alpha1
served: true
storage: true

7
charts/argo-events/crds/sensor-crd.yml
View file

@ -1,5 +1,5 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: sensors.argoproj.io
@ -13,5 +13,8 @@ spec:
shortNames:
- sn
scope: Namespaced
version: "v1alpha1"
versions:
- name: v1alpha1
served: true
storage: true

24
charts/argo-events/templates/eventbus-controller-deployment.yaml
View file

@ -37,7 +37,31 @@ spec:
value: {{ .Values.eventbusController.natsStreamingImage }}
- name: NATS_METRICS_EXPORTER_IMAGE
value: {{ .Values.eventbusController.natsMetricsExporterImage }}
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
readinessProbe:
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
{{- with .Values.securityContext }}
securityContext: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.eventbusController.nodeSelector }}
nodeSelector: {{ toYaml .Values.eventbusController.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.eventbusController.tolerations }}
tolerations: {{ toYaml .Values.eventbusController.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.eventbusController.affinity }}
affinity: {{ toYaml .Values.eventbusController.affinity | nindent 8 }}
{{- end }}

3
charts/argo-events/templates/eventbus-crd.yaml
View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: eventbus.argoproj.io
@ -16,7 +16,6 @@ spec:
- eb
singular: eventbus
scope: Namespaced
version: v1alpha1
versions:
- name: v1alpha1
served: true

24
charts/argo-events/templates/eventsource-controller-deployment.yaml
View file

@ -35,7 +35,31 @@ spec:
fieldPath: metadata.namespace
- name: EVENTSOURCE_IMAGE
value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}"
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
readinessProbe:
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
{{- with .Values.securityContext }}
securityContext: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.eventsourceController.nodeSelector }}
nodeSelector: {{ toYaml .Values.eventsourceController.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.eventsourceController.tolerations }}
tolerations: {{ toYaml .Values.eventsourceController.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.eventsourceController.affinity }}
affinity: {{ toYaml .Values.eventsourceController.affinity | nindent 8 }}
{{- end }}

7
charts/argo-events/templates/eventsource-crd.yaml
View file

@ -1,5 +1,5 @@
{{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: eventsources.argoproj.io
@ -16,5 +16,8 @@ spec:
listKind: EventSourceList
shortNames:
- es
version: "v1alpha1"
versions:
- name: v1alpha1
served: true
storage: true
{{- end }}

24
charts/argo-events/templates/sensor-controller-deployment.yaml
View file

@ -35,7 +35,31 @@ spec:
fieldPath: metadata.namespace
- name: SENSOR_IMAGE
value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
readinessProbe:
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 3
periodSeconds: 3
{{- with .Values.securityContext }}
securityContext: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.sensorController.nodeSelector }}
nodeSelector: {{ toYaml .Values.sensorController.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.sensorController.tolerations }}
tolerations: {{ toYaml .Values.sensorController.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.sensorController.affinity }}
affinity: {{ toYaml .Values.sensorController.affinity | nindent 8 }}
{{- end }}

7
charts/argo-events/templates/sensor-crd.yaml
View file

@ -1,6 +1,6 @@
{{- if .Values.installCRD }}
# Define a "sensor" custom resource definition
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: sensors.argoproj.io
@ -17,5 +17,8 @@ spec:
shortNames:
- sn
scope: Namespaced
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
{{- end }}

20
charts/argo-events/values.yaml
View file

@ -21,7 +21,6 @@ additionalSaNamespaces: []
additionalServiceAccountRules:
- apiGroups:
- apiextensions.k8s.io
- apiextensions.k8s.io/v1beta1
verbs:
- create
- delete
@ -46,21 +45,34 @@ singleNamespace: true
sensorController:
name: sensor-controller
image: sensor-controller
tag: v1.0.0
tag: v1.2.3
replicaCount: 1
sensorImage: sensor
nodeSelector: {}
tolerations: {}
affinity: {}
eventsourceController:
name: eventsource-controller
image: eventsource-controller
tag: v1.0.0
tag: v1.2.3
replicaCount: 1
eventsourceImage: eventsource
nodeSelector: {}
tolerations: {}
affinity: {}
eventbusController:
name: eventbus-controller
image: eventbus-controller
tag: v1.0.0
tag: v1.2.3
replicaCount: 1
nodeSelector: {}
tolerations: {}
affinity: {}
natsStreamingImage: nats-streaming:0.17.0
natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2
securityContext:
runAsNonRoot: true
runAsUser: 9731

2
charts/argo/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.12.5
description: A Helm chart for Argo Workflows
name: argo
version: 0.16.2
version: 0.16.7
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm
maintainers:

4
charts/argo/templates/server-cluster-roles.yaml
View file

@ -111,11 +111,7 @@ rules:
- delete
---
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
{{- else }}
kind: ClusterRole
{{- end }}
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template
rules:

8
charts/argo/templates/server-crb.yaml
View file

@ -21,20 +21,12 @@ subjects:
namespace: {{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: RoleBinding
{{ else }}
kind: ClusterRoleBinding
{{- end }}
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
roleRef:
apiGroup: rbac.authorization.k8s.io
{{- if .Values.singleNamespace }}
kind: Role
{{ else }}
kind: ClusterRole
{{- end }}
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
subjects:
- kind: ServiceAccount

12
charts/argo/templates/workflow-aggregate-roles.yaml
View file

@ -1,10 +1,6 @@
{{- if .Values.createAggregateRoles }}
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
{{ else }}
kind: ClusterRole
{{- end }}
metadata:
annotations:
helm.sh/hook: pre-install
@ -30,11 +26,7 @@ rules:
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
{{ else }}
kind: ClusterRole
{{- end }}
metadata:
annotations:
helm.sh/hook: pre-install
@ -65,11 +57,7 @@ rules:
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
{{ else }}
kind: ClusterRole
{{- end }}
metadata:
annotations:
helm.sh/hook: pre-install

4
charts/argo/templates/workflow-controller-cluster-roles.yaml
View file

@ -131,11 +131,7 @@ rules:
- delete
---
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: Role
{{- else }}
kind: ClusterRole
{{- end }}
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
rules:

2
charts/argo/templates/workflow-controller-config-map.yaml
View file

@ -53,7 +53,7 @@ data:
endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio:9000") }}
insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- if .Values.artifactRepository.s3.keyFormat }}
keyFormat: {{ .Values.artifactRepository.s3.keyFormat }}
keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }}
{{- end }}
{{- if .Values.artifactRepository.s3.region }}
region: {{ .Values.artifactRepository.s3.region }}

8
charts/argo/templates/workflow-controller-crb.yaml
View file

@ -31,20 +31,12 @@ subjects:
{{- end }}
---
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }}
kind: RoleBinding
{{ else }}
kind: ClusterRoleBinding
{{- end }}
metadata:
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
roleRef:
apiGroup: rbac.authorization.k8s.io
{{- if .Values.singleNamespace }}
kind: Role
{{ else }}
kind: ClusterRole
{{- end }}
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
subjects:
- kind: ServiceAccount