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

Merge branch 'master' into argo-affinity

Browse source
This commit is contained in:
Yong Wen Chua 2020-01-30 15:05:04 +08:00 committed by GitHub
commit ab1bb57d7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 120 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,8 @@
apiVersion: v1
appVersion: "1.4.0"
appVersion: "1.4.1"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 1.6.4
version: 1.7.0
home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords:

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

@ -36,11 +36,13 @@ 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.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.4.0"` |
| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.1"` |
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | 
| nameOverride | Provide a name in place of `argocd` | `"argocd"` |
| installCRDs | bool | `true` | Install CRDs if you are using Helm2. |
| configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
| 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.bitbucketSecret | BitBucket incoming webhook secret | `""` |
| configs.secret.createSecret | Create the argocd-secret. | `true` |
| configs.secret.githubSecret | GitHub incoming webhook secret | `""` |

2
charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
View file

@ -35,7 +35,7 @@ data:
{{- end }}
{{- if .Values.configs.secret.argocdServerAdminPassword }}
admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
admin.passwordMtime: {{ default (date "2006-01-02T15:04:05Z" now) .Values.configs.secret.argocdServerAdminPasswordMtime | b64enc }}
{{- end }}
{{- range $key, $value := .Values.configs.secret.extra }}
{{ $key }}: {{ $value | b64enc }}

4
charts/argo-cd/templates/argocd-server/certificate.yaml
View file

@ -1,5 +1,9 @@
{{- if .Values.server.certificate.enabled -}}
{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }}
apiVersion: cert-manager.io/v1alpha2
{{- else }}
apiVersion: certmanager.k8s.io/v1alpha1
{{- end }}
kind: Certificate
metadata:
name: {{ template "argo-cd.server.fullname" . }}

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

@ -10,7 +10,7 @@ installCRDs: true
global:
image:
repository: argoproj/argocd
tag: v1.4.0
tag: v1.4.1
imagePullPolicy: IfNotPresent
securityContext: {}
# runAsUser: 999
@ -23,7 +23,7 @@ controller:
image:
repository: # argoproj/argocd
tag: # v1.3.6
tag: # v1.4.1
imagePullPolicy: # IfNotPresent
## Argo controller commandline flags
@ -270,7 +270,7 @@ server:
image:
repository: # argoproj/argocd
tag: # v1.3.6
tag: # v1.4.1
imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-server
@ -511,7 +511,7 @@ repoServer:
image:
repository: # argoproj/argocd
tag: # v1.3.6
tag: # v1.4.1
imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-repo-server
@ -742,3 +742,5 @@ configs:
# Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
# `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
# argocdServerAdminPassword:
# Password modification time defaults to current time if not set
# argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"

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

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

18
charts/argo-events/crds/event-source-crd.yml Normal file
View file

@ -0,0 +1,18 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: eventsources.argoproj.io
spec:
group: argoproj.io
scope: Namespaced
names:
kind: EventSource
plural: eventsources
singular: eventsource
listKind: EventSourceList
shortNames:
- es
version: "v1alpha1"

16
charts/argo-events/crds/gateway-crd.yml Normal file
View file

@ -0,0 +1,16 @@
---
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"

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

@ -0,0 +1,17 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: sensors.argoproj.io
spec:
group: argoproj.io
names:
kind: Sensor
listKind: SensorList
plural: sensors
singular: sensor
shortNames:
- sn
scope: Namespaced
version: "v1alpha1"

24
charts/argo-events/templates/argo-events-cluster-roles.yaml
View file

@ -24,20 +24,9 @@ kind: ClusterRole
metadata:
name: argo-events-role
rules:
- apiGroups:
- apiextensions.k8s.io
- apiextensions.k8s.io/v1beta1
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
resources:
- customresourcedefinitions
{{- if .Values.additionalServiceAccountRules }}
{{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
{{- end }}
- apiGroups:
- argoproj.io
verbs:
@ -58,6 +47,8 @@ rules:
- gateways/finalizers
- sensors
- sensors/finalizers
- eventsources
- eventsources/finalizers
- apiGroups:
- ""
resources:
@ -89,9 +80,7 @@ rules:
- patch
- delete
- apiGroups:
- "apps/v1"
- "apps/v1beta2"
- "apps/v1beta1"
- "apps"
resources:
- deployments
verbs:
@ -102,3 +91,4 @@ rules:
- update
- patch
- delete

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

@ -0,0 +1,17 @@
{{- if .Values.installCRD }}
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: eventsources.argoproj.io
spec:
group: argoproj.io
scope: Namespaced
names:
kind: EventSource
plural: eventsources
singular: eventsource
listKind: EventSourceList
shortNames:
- es
version: "v1alpha1"
{{- end }}

4
charts/argo-events/templates/gateway-controller-deployment.yaml
View file

@ -25,9 +25,9 @@ spec:
image: "{{ .Values.registry }}/{{ .Values.gatewayController.image }}:{{ .Values.gatewayController.tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: GATEWAY_NAMESPACE
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: GATEWAY_CONTROLLER_CONFIG_MAP
- name: CONTROLLER_CONFIG_MAP
value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap

4
charts/argo-events/templates/gateway-crd.yaml
View file

@ -11,6 +11,8 @@ spec:
listKind: GatewayList
plural: gateways
singular: gateway
shortNames:
- gw
scope: Namespaced
version: v1alpha1
version: "v1alpha1"
{{- end }}

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

@ -25,9 +25,9 @@ spec:
image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: SENSOR_NAMESPACE
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SENSOR_CONFIG_MAP
- name: CONTROLLER_CONFIG_MAP
value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap

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

@ -11,6 +11,8 @@ spec:
listKind: SensorList
plural: sensors
singular: sensor
shortNames:
- sn
scope: Namespaced
version: v1alpha1
{{- end }}

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

@ -9,10 +9,26 @@ installCRD: true
# ServiceAccount to use for running controller.
serviceAccount: argo-events-sa
# Create service accounts in additional namespaces specified
# The SA will always be created in the release namespaces
additionalSaNamespaces: []
# - argo-prod
additionalServiceAccountRules:
- apiGroups:
- apiextensions.k8s.io
- apiextensions.k8s.io/v1beta1
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
resources:
- customresourcedefinitions
instanceID: argo-events
@ -26,11 +42,11 @@ singleNamespace: true
sensorController:
name: sensor-controller
image: sensor-controller
tag: v0.11
tag: v0.12
replicaCount: 1
gatewayController:
name: gateway-controller
image: gateway-controller
tag: v0.11
tag: v0.12
replicaCount: 1