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

Merge branch 'master' into master

Browse source
This commit is contained in:
Marco Kilchhofer 2021-09-16 18:53:59 +02:00 committed by GitHub
commit c8273f0779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 66 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 2.1.1
appVersion: 2.1.2
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 3.17.3
version: 3.17.7
home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-cd/assets/logo.png
keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled
annotations:
artifacthub.io/changes: |
- "[Fixed]: use $ as context for repository secret labels"
- "[Fixed]: global podLabels/podAnnotations object unexpected merge"

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

@ -141,7 +141,7 @@ NAME: my-release
|-----|------|---------|
| 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. | `"v2.0.5"` |
| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v2.1.2"` |
| global.podAnnotations | Annotations for the all deployed pods |
| global.podLabels | Labels for the all deployed pods |
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
@ -329,6 +329,7 @@ NAME: my-release
| server.ingressGrpc.tls | Ingress TLS configuration for dedicated [gRPC-ingress] | `[]` |
| server.ingressGrpc.isAWSALB | Setup up GRPC ingress to work with an AWS ALB | `false` |
| server.ingressGrpc.awsALB.serviceType | Service type for the AWS ALB GRPC service | `NodePort` |
| server.ingressGrpc.awsALB.backendProtocolVersion | Backend protocol version for the AWS ALB GRPC service | `HTTP2` |
| server.route.enabled | Enable a OpenShift route for the server | `false` |
| server.route.hostname | Hostname of OpenShift route | `""` |
| server.lifecycle | PostStart and PreStop hooks configuration | `{}` |

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

@ -17,14 +17,14 @@ spec:
replicas: {{ .Values.controller.replicas }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.controller.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.controller.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 8 }}
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.controller.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.controller.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

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

@ -16,14 +16,14 @@ spec:
{{- end }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.repoServer.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 8 }}
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.repoServer.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.repoServer.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

2
charts/argo-cd/templates/argocd-server/alb-grpc-service.yaml
View file

@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
alb.ingress.kubernetes.io/backend-protocol-version: HTTP2 #This tells AWS to send traffic from the ALB using HTTP2. Can use GRPC as well if you want to leverage GRPC specific features
alb.ingress.kubernetes.io/backend-protocol-version: {{ .Values.server.ingressGrpc.awsALB.backendProtocolVersion }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" (print .Values.server.name "-gprc") "name" (print .Values.server.name "-grpc")) | nindent 4 }}
name: {{ template "argo-cd.server.fullname" . }}-grpc

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

@ -16,14 +16,14 @@ spec:
{{- end }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.server.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.server.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 8 }}
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.server.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.server.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

4
charts/argo-cd/templates/dex/deployment.yaml
View file

@ -12,14 +12,14 @@ spec:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.dex.name) | nindent 6 }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.dex.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.dex.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 8 }}
app.kubernetes.io/version: {{ .Values.dex.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.dex.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.dex.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

4
charts/argo-cd/templates/redis/deployment.yaml
View file

@ -13,14 +13,14 @@ spec:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
template:
metadata:
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.redis.podAnnotations) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.redis.podAnnotations) }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 8 }}
app.kubernetes.io/version: {{ .Values.redis.image.tag | quote }}
{{- with (mergeOverwrite .Values.global.podLabels .Values.redis.podLabels) }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.redis.podLabels) }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:

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

@ -8,7 +8,7 @@ kubeVersionOverride: ""
global:
image:
repository: quay.io/argoproj/argocd
tag: v2.1.1
tag: v2.1.2
imagePullPolicy: IfNotPresent
## Annotations applied to all pods
podAnnotations: {}
@ -243,7 +243,7 @@ dex:
image:
repository: ghcr.io/dexidp/dex
tag: v2.28.1
tag: v2.30.0
imagePullPolicy: IfNotPresent
initImage:
repository:
@ -644,14 +644,15 @@ server:
labels: {}
ingressClassName: ""
## Service Type if isAWSALB is set to true
## Can be of type NodePort or ClusterIP depending on which mode you are
## are running. Instance mode needs type NodePort, IP mode needs type
## ClusterIP
## Ref: https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/how-it-works/#ingress-traffic
##
awsALB:
## Service Type if isAWSALB is set to true
## Can be of type NodePort or ClusterIP depending on which mode you are
## are running. Instance mode needs type NodePort, IP mode needs type
## ClusterIP
## Ref: https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/how-it-works/#ingress-traffic
serviceType: NodePort
# This tells AWS to send traffic from the ALB using HTTP2. Can use GRPC as well if you want to leverage GRPC specific features
backendProtocolVersion: HTTP2
## Argo Ingress.
## Hostnames must be provided if Ingress is enabled.

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

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "v1.0.2"
description: A Helm chart for Argo Rollouts
name: argo-rollouts
version: 2.0.0
version: 2.0.1
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
home: https://github.com/argoproj/argo-helm
maintainers:
@ -11,4 +11,4 @@ maintainers:
- name: jessesuen
annotations:
artifacthub.io/changes: |
- "[Added]: Dashboard manifests"
- "[Fixed]: ServiceMonitor selector labels match metrics Service"

4
charts/argo-rollouts/templates/argo-rollouts-service-monitor.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceMonitor
metadata:
name: {{ include "argo-rollouts.fullname" . }}
labels:
app.kubernetes.io/component: server
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}
{{- range $key, $value := .Values.controller.metrics.serviceMonitor.additionalLabels }}
{{ $key }}: {{ $value | quote }}
@ -21,6 +21,6 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
app.kubernetes.io/component: server
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
{{- end }}

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

@ -2,7 +2,7 @@ apiVersion: v2
name: argo-workflows
description: A Helm chart for Argo Workflows
type: application
version: 0.4.2
version: 0.5.2
appVersion: "v3.1.8"
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm
@ -15,4 +15,4 @@ maintainers:
- name: benjaminws
annotations:
artifacthub.io/changes: |
- "[Changed]: Bump appVersion to 3.1.8"
- "[Added]: Add controller initialDelay param to configmap"

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

@ -14,9 +14,19 @@ data:
{{- end }}
{{- end }}
containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }}
{{- with .Values.controller.containerRuntimeExecutors }}
containerRuntimeExecutors:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.controller.parallelism }}
parallelism: {{ .Values.controller.parallelism }}
{{- end }}
{{- with .Values.controller.namespaceParallelism }}
namespaceParallelism: {{ . }}
{{- end }}
{{- with .Values.controller.initialDelay }}
initialDelay: {{ . }}
{{- end }}
{{- if or .Values.executor.resources .Values.executor.env .Values.executor.securityContext}}
executor:
{{- with .Values.executor.resources }}

9
charts/argo-workflows/values.yaml
View file

@ -42,6 +42,10 @@ controller:
tag: ""
# parallelism dictates how many workflows can be running at the same time
parallelism:
# Limits the maximum number of incomplete workflows in a namespace
namespaceParallelism:
# Resolves ongoing, uncommon AWS EKS bug: https://github.com/argoproj/argo-workflows/pull/4224
initialDelay:
# podAnnotations is an optional map of annotations to be applied to the controller Pods
podAnnotations: {}
# Optional labels to add to the controller pods
@ -111,6 +115,11 @@ controller:
workflowNamespaces:
- default
containerRuntimeExecutor: docker
# containerRuntimeExecutors:
# - name: emissary
# selector:
# matchLabels:
# workflows.argoproj.io/container-runtime-executor: emissary
instanceID:
# `instanceID.enabled` configures the controller to filter workflow submissions
# to only those which have a matching instanceID attribute.

4
charts/argocd-applicationset/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
name: argocd-applicationset
description: A Helm chart for installing ArgoCD ApplicationSet
type: application
version: 1.3.1
version: 1.4.0
appVersion: "v0.2.0"
home: https://github.com/argoproj/argo-helm
icon: https://argocd-applicationset.readthedocs.io/en/stable/assets/logo.png
@ -14,4 +14,4 @@ maintainers:
- name: maruina
annotations:
artifacthub.io/changes: |
- "[Changed]: Update README and convert it to helm-docs"
- "[Added]: Configuration for Pod labels"

1
charts/argocd-applicationset/README.md
View file

@ -79,6 +79,7 @@ kubectl apply -k https://github.com/argoproj-labs/applicationset.git/manifests/c
| nameOverride | string | `""` | Provide a name in place of `argocd-applicationset` |
| nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
| podAnnotations | object | `{}` | Annotations for the controller pods |
| podLabels | object | `{}` | Labels for the controller pods |
| podSecurityContext | object | `{}` | Pod Security Context |
| priorityClassName | string | `""` | If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default. |
| rbac.pspEnabled | bool | `true` | Enable Pod Security Policy |

3
charts/argocd-applicationset/templates/deployment.yaml
View file

@ -17,6 +17,9 @@ spec:
{{- end }}
labels:
{{- include "argo-applicationset.selectorLabels" . | nindent 8 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

3
charts/argocd-applicationset/values.yaml
View file

@ -50,6 +50,9 @@ serviceAccount:
# -- Annotations for the controller pods
podAnnotations: {}
# -- Labels for the controller pods
podLabels: {}
rbac:
# -- Enable Pod Security Policy
pspEnabled: true

4
charts/argocd-notifications/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: 1.1.1
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
name: argocd-notifications
type: application
version: 1.4.4
version: 1.5.0
home: https://github.com/argoproj/argo-helm
icon: https://argocd-notifications.readthedocs.io/en/stable/assets/logo.png
keywords:
@ -15,4 +15,4 @@ maintainers:
- name: andyfeller
annotations:
artifacthub.io/changes: |
- "[Fixed]: Use correct names for ConfigMap and Secret"
- "[Added]: Configuration for Pod labels"

3
charts/argocd-notifications/templates/deployment.yaml
View file

@ -20,6 +20,9 @@ spec:
{{- end }}
labels:
{{- include "argocd-notifications.selectorLabels" . | nindent 8 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

2
charts/argocd-notifications/values.yaml
View file

@ -73,6 +73,8 @@ notifiers:
podAnnotations: {}
podLabels: {}
## Pod Security Context
securityContext:
runAsNonRoot: true