Merge branch 'master' into argo-appset
This commit is contained in:
commit
13cb7f7e98
22 changed files with 14816 additions and 14024 deletions
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
appVersion: 1.8.4
|
||||
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 2.14.2
|
||||
version: 2.14.6
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
@ -257,6 +257,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
| server.service.servicePortHttps | Server service https port | `443` |
|
||||
| server.service.servicePortHttpName | Server service http port name, can be used to route traffic via istio | `http` |
|
||||
| server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` |
|
||||
| server.service.nodePortHttp | Server service http port for NodePort service type| `30080` |
|
||||
| server.service.servicePortHttps | Server service http port for NodePort service type | `30443` |
|
||||
| server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` |
|
||||
| server.service.externalIPs | Server service external IPs. | `[]` |
|
||||
| server.service.type | Server service type | `"ClusterIP"` |
|
||||
|
|
|
@ -224,6 +224,29 @@ spec:
|
|||
type: object
|
||||
type: array
|
||||
type: object
|
||||
status:
|
||||
description: Status of the AppProject
|
||||
properties:
|
||||
jwtTokensByRole:
|
||||
additionalProperties:
|
||||
description: List of JWTToken objects for a given role
|
||||
items:
|
||||
description: Holds the issuedAt and expiresAt values of the token
|
||||
properties:
|
||||
exp:
|
||||
description: The expiresAt value of a token
|
||||
type: string
|
||||
iat:
|
||||
description: The issuedAt value of a token
|
||||
type: string
|
||||
id:
|
||||
description: ID of the token
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
description: JWT Tokens issued for each of the roles in the project
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- metadata
|
||||
- spec
|
||||
|
|
|
@ -25,10 +25,16 @@ spec:
|
|||
protocol: TCP
|
||||
port: {{ .Values.server.service.servicePortHttp }}
|
||||
targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }}
|
||||
{{- if eq .Values.server.service.type "NodePort" }}
|
||||
nodePort: {{ .Values.server.service.nodePortHttp }}
|
||||
{{- end }}
|
||||
- name: {{ .Values.server.service.servicePortHttpsName }}
|
||||
protocol: TCP
|
||||
port: {{ .Values.server.service.servicePortHttps }}
|
||||
targetPort: {{- if .Values.server.service.namedTargetPort }} {{ .Values.server.name }} {{- else }} {{ .Values.server.containerPort }} {{- end }}
|
||||
{{- if eq .Values.server.service.type "NodePort" }}
|
||||
nodePort: {{ .Values.server.service.nodePortHttps }}
|
||||
{{- end }}
|
||||
selector:
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
|
||||
|
|
|
@ -3,6 +3,12 @@ apiVersion: v1
|
|||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ template "argo-cd.dexServiceAccountName" . }}
|
||||
{{- if .Values.dex.serviceAccount.annotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.dex.serviceAccount.annotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
|
||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||
|
|
|
@ -217,6 +217,8 @@ dex:
|
|||
serviceAccount:
|
||||
create: true
|
||||
name: argocd-dex-server
|
||||
## Annotations applied to created service account
|
||||
annotations: {}
|
||||
|
||||
## Additional volumeMounts to the controller main container.
|
||||
volumeMounts:
|
||||
|
@ -444,6 +446,9 @@ server:
|
|||
annotations: {}
|
||||
labels: {}
|
||||
type: ClusterIP
|
||||
## For node port default ports
|
||||
nodePortHttp: 30080
|
||||
nodePortHttps: 30443
|
||||
servicePortHttp: 80
|
||||
servicePortHttps: 443
|
||||
servicePortHttpName: http
|
||||
|
@ -549,7 +554,7 @@ server:
|
|||
# name: secret-name
|
||||
# key: sshPrivateKey
|
||||
# - type: helm
|
||||
# url: https://kubernetes-charts.storage.googleapis.com
|
||||
# url: https://charts.helm.sh/stable
|
||||
# name: stable
|
||||
# - type: helm
|
||||
# url: https://argoproj.github.io/argo-helm
|
||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
appVersion: "0.10.2"
|
||||
description: A Helm chart for Argo Rollouts
|
||||
name: argo-rollouts
|
||||
version: 0.4.1
|
||||
version: 0.4.3
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
maintainers:
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
appVersion: v2.12.5
|
||||
description: A Helm chart for Argo Workflows
|
||||
name: argo
|
||||
version: 0.16.0
|
||||
version: 0.16.2
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
maintainers:
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
This is a **community maintained** chart. It is used to set up argo and it's needed dependencies through one command. This is used in conjunction with [helm](https://github.com/kubernetes/helm).
|
||||
|
||||
If you want your deployment of this helm chart to most closely match the [argo CLI](https://github.com/argoproj/argo), you should deploy it in the `kube-system` namespace.
|
||||
If you want your deployment of this helm chart to most closely match the [argo CLI](https://github.com/argoproj/argo-workflows), you should deploy it in the `kube-system` namespace.
|
||||
|
||||
## Pre-Requisites
|
||||
This chart uses an install hook to configure the CRD definition. Installation of CRDs is a somewhat privileged process in itself and in RBAC enabled clusters the `default` service account for namespaces does not typically have the ability to do create these.
|
||||
|
||||
A few options are:
|
||||
- Setup the CRD yourself manually and use `--set installCRD=false` when installing the helm chart. Find the CRDs in the [argo codebase](https://raw.githubusercontent.com/argoproj/argo/master/manifests/base/crds/workflow-crd.yaml)
|
||||
- Setup the CRD yourself manually and use `--set installCRD=false` when installing the helm chart. Find the CRDs in the [argo codebase](https://github.com/argoproj/argo-workflows/tree/master/manifests/base/crds/full)
|
||||
- Manually create a ServiceAccount in the Namespace which your release will be deployed w/ appropriate bindings to perform this action and set the `init.serviceAccount` attribute
|
||||
- Augment the `default` ServiceAccount permissions in the Namespace in which your Release is deployed to have the appropriate permissions
|
||||
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
{{- if .Values.server.enabled }}
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: Role
|
||||
{{- else }}
|
||||
kind: ClusterRole
|
||||
{{- end }}
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.server.name }}
|
||||
rules:
|
||||
|
@ -107,7 +111,11 @@ 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:
|
||||
|
|
|
@ -2,16 +2,18 @@
|
|||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
||||
{{ else }}
|
||||
kind: ClusterRoleBinding
|
||||
{{- end }}
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
||||
{{- end }}
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: Role
|
||||
{{ else }}
|
||||
kind: ClusterRole
|
||||
{{- end }}
|
||||
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
|
@ -19,12 +21,20 @@ 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
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
{{- 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
|
||||
|
@ -26,7 +30,11 @@ rules:
|
|||
- watch
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: Role
|
||||
{{ else }}
|
||||
kind: ClusterRole
|
||||
{{- end }}
|
||||
metadata:
|
||||
annotations:
|
||||
helm.sh/hook: pre-install
|
||||
|
@ -57,7 +65,11 @@ rules:
|
|||
- watch
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: Role
|
||||
{{ else }}
|
||||
kind: ClusterRole
|
||||
{{- end }}
|
||||
metadata:
|
||||
annotations:
|
||||
helm.sh/hook: pre-install
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: Role
|
||||
{{- else }}
|
||||
kind: ClusterRole
|
||||
{{- end }}
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
||||
rules:
|
||||
|
@ -127,7 +131,11 @@ 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:
|
||||
|
|
|
@ -8,7 +8,11 @@ metadata:
|
|||
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
{{- if .Values.singleNamespace }}
|
||||
kind: Role
|
||||
{{ else }}
|
||||
kind: ClusterRole
|
||||
{{- end }}
|
||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
|
@ -27,12 +31,20 @@ 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
|
||||
|
|
|
@ -3,7 +3,7 @@ appVersion: 1.0.1
|
|||
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
||||
name: argocd-notifications
|
||||
type: application
|
||||
version: 1.0.13
|
||||
version: 1.0.14
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
@ -51,6 +51,9 @@ spec:
|
|||
name: metrics
|
||||
protocol: TCP
|
||||
{{- end }}
|
||||
{{- with .Values.extraEnv }}
|
||||
env: {{ toYaml . | nindent 12 }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
|
|
@ -54,6 +54,9 @@ metrics:
|
|||
# interval: 30s
|
||||
# scrapeTimeout: 10s
|
||||
|
||||
# Additional container environment variables
|
||||
extraEnv: []
|
||||
|
||||
notifiers:
|
||||
# For more information: https://argocd-notifications.readthedocs.io/en/stable/services/overview/
|
||||
|
||||
|
|
Loading…
Reference in a new issue