Merge branch 'master' into 20210528_codeowners
This commit is contained in:
commit
9ff3013b98
11 changed files with 58 additions and 19 deletions
|
@ -2,7 +2,7 @@ apiVersion: v2
|
||||||
appVersion: 2.0.3
|
appVersion: 2.0.3
|
||||||
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: 3.6.4
|
version: 3.6.5
|
||||||
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:
|
||||||
|
|
|
@ -559,13 +559,21 @@ server:
|
||||||
# backend:
|
# backend:
|
||||||
# serviceName: ssl-redirect
|
# serviceName: ssl-redirect
|
||||||
# servicePort: use-annotation
|
# servicePort: use-annotation
|
||||||
|
## for Kubernetes >=1.19 (when "networking.k8s.io/v1" is used)
|
||||||
|
# - path: /*
|
||||||
|
# pathType: Prefix
|
||||||
|
# backend:
|
||||||
|
# service
|
||||||
|
# name: ssl-redirect
|
||||||
|
# port:
|
||||||
|
# name: use-annotation
|
||||||
tls:
|
tls:
|
||||||
[]
|
[]
|
||||||
# - secretName: argocd-tls-certificate
|
# - secretName: argocd-tls-certificate
|
||||||
# hosts:
|
# hosts:
|
||||||
# - argocd.example.com
|
# - argocd.example.com
|
||||||
https: false
|
https: false
|
||||||
# dedicated ingess for gRPC as documented at
|
# dedicated ingress for gRPC as documented at
|
||||||
# https://argoproj.github.io/argo-cd/operator-manual/ingress/
|
# https://argoproj.github.io/argo-cd/operator-manual/ingress/
|
||||||
ingressGrpc:
|
ingressGrpc:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
@ -588,6 +596,14 @@ server:
|
||||||
# backend:
|
# backend:
|
||||||
# serviceName: ssl-redirect
|
# serviceName: ssl-redirect
|
||||||
# servicePort: use-annotation
|
# servicePort: use-annotation
|
||||||
|
## for Kubernetes >=1.19 (when "networking.k8s.io/v1" is used)
|
||||||
|
# - path: /*
|
||||||
|
# pathType: Prefix
|
||||||
|
# backend:
|
||||||
|
# service
|
||||||
|
# name: ssl-redirect
|
||||||
|
# port:
|
||||||
|
# name: use-annotation
|
||||||
tls:
|
tls:
|
||||||
[]
|
[]
|
||||||
# - secretName: argocd-tls-certificate
|
# - secretName: argocd-tls-certificate
|
||||||
|
@ -664,7 +680,7 @@ server:
|
||||||
## Annotations to be added to ArgoCD rbac ConfigMap
|
## Annotations to be added to ArgoCD rbac ConfigMap
|
||||||
rbacConfigAnnotations: {}
|
rbacConfigAnnotations: {}
|
||||||
|
|
||||||
# Boolean determining whether or not to create the configmap. If false, it is expected tthe configmap will be created
|
# Boolean determining whether or not to create the configmap. If false, it is expected the configmap will be created
|
||||||
# by something else. ArgoCD will not work if there is no configMap created with the name above.
|
# by something else. ArgoCD will not work if there is no configMap created with the name above.
|
||||||
rbacConfigCreate: true
|
rbacConfigCreate: true
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
||||||
appVersion: "v1.0.1"
|
appVersion: "v1.0.1"
|
||||||
description: A Helm chart for Argo Rollouts
|
description: A Helm chart for Argo Rollouts
|
||||||
name: argo-rollouts
|
name: argo-rollouts
|
||||||
version: 1.0.0
|
version: 1.0.1
|
||||||
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:
|
||||||
|
|
|
@ -39,6 +39,7 @@ $ helm install my-release argo/argo-rollouts
|
||||||
| controller.tolerations | list | `[]` | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) |
|
| controller.tolerations | list | `[]` | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) |
|
||||||
| controller.affinity | object | `{}` | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
|
| controller.affinity | object | `{}` | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
|
||||||
| controller.nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
|
| controller.nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
|
||||||
|
| controller.metrics.enabled | bool | `false` | Deploy metrics service |
|
||||||
| controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
|
| controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
|
||||||
| controller.metrics.serviceMonitor.additionalAnnotations | object | `{}` | Annotations to be added to the ServiceMonitor |
|
| controller.metrics.serviceMonitor.additionalAnnotations | object | `{}` | Annotations to be added to the ServiceMonitor |
|
||||||
| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor |
|
| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor |
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if .Values.controller.metrics.serviceMonitor.enabled }}
|
{{- if .Values.controller.metrics.enabled }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if .Values.controller.metrics.serviceMonitor.enabled }}
|
{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
|
||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: ServiceMonitor
|
kind: ServiceMonitor
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -25,6 +25,7 @@ controller:
|
||||||
# memory: 64Mi
|
# memory: 64Mi
|
||||||
|
|
||||||
metrics:
|
metrics:
|
||||||
|
enabled: false
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
enabled: false
|
enabled: false
|
||||||
additionalLabels: {}
|
additionalLabels: {}
|
||||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
||||||
name: argo-workflows
|
name: argo-workflows
|
||||||
description: A Helm chart for Argo Workflows
|
description: A Helm chart for Argo Workflows
|
||||||
type: application
|
type: application
|
||||||
version: 0.2.0
|
version: 0.2.2
|
||||||
appVersion: "v3.0.2"
|
appVersion: "v3.0.2"
|
||||||
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
|
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
|
|
|
@ -70,7 +70,7 @@ spec:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.name
|
fieldPath: metadata.name
|
||||||
{{- with .Values.controller.extraEnv }}
|
{{- with .Values.controller.extraEnv }}
|
||||||
{{ toYaml . | nindent 10 }}
|
{{- toYaml . | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.controller.resources | nindent 12 }}
|
{{- toYaml .Values.controller.resources | nindent 12 }}
|
||||||
|
|
|
@ -60,15 +60,18 @@ spec:
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 10
|
||||||
periodSeconds: 20
|
periodSeconds: 20
|
||||||
env:
|
env:
|
||||||
- name: IN_CLUSTER
|
- name: IN_CLUSTER
|
||||||
value: "true"
|
value: "true"
|
||||||
- name: ARGO_NAMESPACE
|
- name: ARGO_NAMESPACE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: BASE_HREF
|
- name: BASE_HREF
|
||||||
value: {{ .Values.server.baseHref | quote }}
|
value: {{ .Values.server.baseHref | quote }}
|
||||||
|
{{- with .Values.server.extraEnv }}
|
||||||
|
{{- toYaml . | nindent 12 }}
|
||||||
|
{{- end }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.server.resources | nindent 12 }}
|
{{- toYaml .Values.server.resources | nindent 12 }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
|
|
@ -120,9 +120,13 @@ controller:
|
||||||
# service type `LoadBalancer`
|
# service type `LoadBalancer`
|
||||||
loadBalancerSourceRanges: []
|
loadBalancerSourceRanges: []
|
||||||
resources: {}
|
resources: {}
|
||||||
# The list of environment variable definitions to be added to the controller
|
|
||||||
# manages container verbatim.
|
## Extra environment variables to provide to the controller container
|
||||||
|
## extraEnv:
|
||||||
|
## - name: FOO
|
||||||
|
## value: "bar"
|
||||||
extraEnv: []
|
extraEnv: []
|
||||||
|
|
||||||
# Extra arguments to be added to the controller
|
# Extra arguments to be added to the controller
|
||||||
extraArgs: []
|
extraArgs: []
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
@ -226,6 +230,12 @@ server:
|
||||||
# https://argoproj.github.io/argo-workflows/tls/
|
# https://argoproj.github.io/argo-workflows/tls/
|
||||||
secure: false
|
secure: false
|
||||||
|
|
||||||
|
## Extra environment variables to provide to the argo-server container
|
||||||
|
## extraEnv:
|
||||||
|
## - name: FOO
|
||||||
|
## value: "bar"
|
||||||
|
extraEnv: []
|
||||||
|
|
||||||
# Extra arguments to provide to the Argo server binary.
|
# Extra arguments to provide to the Argo server binary.
|
||||||
extraArgs: []
|
extraArgs: []
|
||||||
|
|
||||||
|
@ -257,6 +267,14 @@ server:
|
||||||
# backend:
|
# backend:
|
||||||
# serviceName: ssl-redirect
|
# serviceName: ssl-redirect
|
||||||
# servicePort: use-annotation
|
# servicePort: use-annotation
|
||||||
|
## for Kubernetes >=1.19 (when "networking.k8s.io/v1" is used)
|
||||||
|
# - path: /*
|
||||||
|
# pathType: Prefix
|
||||||
|
# backend:
|
||||||
|
# service
|
||||||
|
# name: ssl-redirect
|
||||||
|
# port:
|
||||||
|
# name: use-annotation
|
||||||
tls:
|
tls:
|
||||||
[]
|
[]
|
||||||
# - secretName: argocd-example-tls
|
# - secretName: argocd-example-tls
|
||||||
|
|
Loading…
Reference in a new issue