Merge branch 'master' into ocp-clusterrole

This commit is contained in:
John Kost 2020-10-08 08:42:08 -04:00 committed by GitHub
commit 828034c6a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 3662 additions and 714 deletions

1
.gitignore vendored
View file

@ -3,3 +3,4 @@ output
.DS_Store .DS_Store
.idea .idea
**/*.tgz **/*.tgz
**/charts/*/charts

View file

@ -1,8 +1,8 @@
apiVersion: v1 apiVersion: v1
appVersion: "1.6.2" appVersion: 1.7.6
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: 2.6.0 version: 2.9.0
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:

View file

@ -62,7 +62,7 @@ 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.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.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.6.1"` | | global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.7.6"` |
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
| global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
| global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
@ -273,6 +273,11 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
| dex.initImage.repository | Argo CD init image repository. | `global.image.repository` | | dex.initImage.repository | Argo CD init image repository. | `global.image.repository` |
| dex.initImage.imagePullPolicy | Argo CD init image imagePullPolicy | `global.image.imagePullPolicy` | | dex.initImage.imagePullPolicy | Argo CD init image imagePullPolicy | `global.image.imagePullPolicy` |
| dex.initImage.tag | Argo CD init image tag | `global.image.tag` | | dex.initImage.tag | Argo CD init image tag | `global.image.tag` |
| dex.metrics.enabled | Deploy metrics service | `false` |
| dex.metrics.service.annotations | Metrics service annotations | `{}` |
| dex.metrics.service.labels | Metrics service labels | `{}` |
| dex.metrics.serviceMonitor.enabled | Enable a prometheus ServiceMonitor. | `false` |
| dex.metrics.serviceMonitor.selector | Prometheus ServiceMonitor selector. | `{}` |
| dex.name | Dex name | `"dex-server"` | | dex.name | Dex name | `"dex-server"` |
| dex.env | Environment variables for the Dex server. | `[]` | | dex.env | Environment variables for the Dex server. | `[]` |
| dex.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` | | dex.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |

File diff suppressed because it is too large Load diff

View file

@ -20,34 +20,37 @@ spec:
scope: Namespaced scope: Namespaced
validation: validation:
openAPIV3Schema: openAPIV3Schema:
description: 'AppProject provides a logical grouping of applications, providing description: 'AppProject provides a logical grouping of applications, providing controls for: * where the apps may deploy to (cluster whitelist) * what may be deployed (repository whitelist, resource whitelist/blacklist) * who can access these applications (roles, OIDC group claims bindings) * and what they can do (RBAC policies) * automation access to these roles (JWT tokens)'
controls for: * where the apps may deploy to (cluster whitelist) * what may
be deployed (repository whitelist, resource whitelist/blacklist) * who can
access these applications (roles, OIDC group claims bindings) * and what they
can do (RBAC policies) * automation access to these roles (JWT tokens)'
properties: properties:
apiVersion: apiVersion:
description: 'APIVersion defines the versioned schema of this representation description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string type: string
kind: kind:
description: 'Kind is a string value representing the REST resource this description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string type: string
metadata: metadata:
type: object type: object
spec: spec:
description: AppProjectSpec is the specification of an AppProject description: AppProjectSpec is the specification of an AppProject
properties: properties:
clusterResourceWhitelist: clusterResourceBlacklist:
description: ClusterResourceWhitelist contains list of whitelisted cluster description: ClusterResourceBlacklist contains list of blacklisted cluster level resources
level resources
items: items:
description: GroupKind specifies a Group and a Kind, but does not description: GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types
force a version. This is useful for identifying concepts during properties:
lookup stages without having partially valid types group:
type: string
kind:
type: string
required:
- group
- kind
type: object
type: array
clusterResourceWhitelist:
description: ClusterResourceWhitelist contains list of whitelisted cluster level resources
items:
description: GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types
properties: properties:
group: group:
type: string type: string
@ -62,29 +65,25 @@ spec:
description: Description contains optional project description description: Description contains optional project description
type: string type: string
destinations: destinations:
description: Destinations contains list of destinations available for description: Destinations contains list of destinations available for deployment
deployment
items: items:
description: ApplicationDestination contains deployment destination description: ApplicationDestination contains deployment destination information
information
properties: properties:
name:
description: Name of the destination cluster which can be used instead of server (url) field
type: string
namespace: namespace:
description: Namespace overrides the environment namespace value description: Namespace overrides the environment namespace value in the ksonnet app.yaml
in the ksonnet app.yaml
type: string type: string
server: server:
description: Server overrides the environment server value in description: Server overrides the environment server value in the ksonnet app.yaml
the ksonnet app.yaml
type: string type: string
type: object type: object
type: array type: array
namespaceResourceBlacklist: namespaceResourceBlacklist:
description: NamespaceResourceBlacklist contains list of blacklisted description: NamespaceResourceBlacklist contains list of blacklisted namespace level resources
namespace level resources
items: items:
description: GroupKind specifies a Group and a Kind, but does not description: GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
properties: properties:
group: group:
type: string type: string
@ -96,12 +95,9 @@ spec:
type: object type: object
type: array type: array
namespaceResourceWhitelist: namespaceResourceWhitelist:
description: NamespaceResourceWhitelist contains list of whitelisted description: NamespaceResourceWhitelist contains list of whitelisted namespace level resources
namespace level resources
items: items:
description: GroupKind specifies a Group and a Kind, but does not description: GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
properties: properties:
group: group:
type: string type: string
@ -113,17 +109,25 @@ spec:
type: object type: object
type: array type: array
orphanedResources: orphanedResources:
description: OrphanedResources specifies if controller should monitor description: OrphanedResources specifies if controller should monitor orphaned resources of apps in this project
orphaned resources of apps in this project
properties: properties:
ignore:
items:
properties:
group:
type: string
kind:
type: string
name:
type: string
type: object
type: array
warn: warn:
description: Warn indicates if warning condition should be created description: Warn indicates if warning condition should be created for apps which have orphaned resources
for apps which have orphaned resources
type: boolean type: boolean
type: object type: object
roles: roles:
description: Roles are user defined RBAC roles associated with this description: Roles are user defined RBAC roles associated with this project
project
items: items:
description: ProjectRole represents a role that has access to a project description: ProjectRole represents a role that has access to a project
properties: properties:
@ -131,17 +135,14 @@ spec:
description: Description is a description of the role description: Description is a description of the role
type: string type: string
groups: groups:
description: Groups are a list of OIDC group claims bound to this description: Groups are a list of OIDC group claims bound to this role
role
items: items:
type: string type: string
type: array type: array
jwtTokens: jwtTokens:
description: JWTTokens are a list of generated JWT tokens bound description: JWTTokens are a list of generated JWT tokens bound to this role
to this role
items: items:
description: JWTToken holds the issuedAt and expiresAt values description: JWTToken holds the issuedAt and expiresAt values of a token
of a token
properties: properties:
exp: exp:
format: int64 format: int64
@ -159,8 +160,7 @@ spec:
description: Name is a name for this role description: Name is a name for this role
type: string type: string
policies: policies:
description: Policies Stores a list of casbin formated strings description: Policies Stores a list of casbin formated strings that define access policies for the role in the project
that define access policies for the role in the project
items: items:
type: string type: string
type: array type: array
@ -168,55 +168,83 @@ spec:
- name - name
type: object type: object
type: array type: array
signatureKeys:
description: List of PGP key IDs that commits to be synced to must be signed with
items:
description: SignatureKey is the specification of a key required to verify commit signatures with
properties:
keyID:
description: The ID of the key in hexadecimal notation
type: string
required:
- keyID
type: object
type: array
sourceRepos: sourceRepos:
description: SourceRepos contains list of repository URLs which can description: SourceRepos contains list of repository URLs which can be used for deployment
be used for deployment
items: items:
type: string type: string
type: array type: array
syncWindows: syncWindows:
description: SyncWindows controls when syncs can be run for apps in description: SyncWindows controls when syncs can be run for apps in this project
this project
items: items:
description: SyncWindow contains the kind, time, duration and attributes description: SyncWindow contains the kind, time, duration and attributes that are used to assign the syncWindows to apps
that are used to assign the syncWindows to apps
properties: properties:
applications: applications:
description: Applications contains a list of applications that description: Applications contains a list of applications that the window will apply to
the window will apply to
items: items:
type: string type: string
type: array type: array
clusters: clusters:
description: Clusters contains a list of clusters that the window description: Clusters contains a list of clusters that the window will apply to
will apply to
items: items:
type: string type: string
type: array type: array
duration: duration:
description: Duration is the amount of time the sync window will description: Duration is the amount of time the sync window will be open
be open
type: string type: string
kind: kind:
description: Kind defines if the window allows or blocks syncs description: Kind defines if the window allows or blocks syncs
type: string type: string
manualSync: manualSync:
description: ManualSync enables manual syncs when they would otherwise description: ManualSync enables manual syncs when they would otherwise be blocked
be blocked
type: boolean type: boolean
namespaces: namespaces:
description: Namespaces contains a list of namespaces that the description: Namespaces contains a list of namespaces that the window will apply to
window will apply to
items: items:
type: string type: string
type: array type: array
schedule: schedule:
description: Schedule is the time the window will begin, specified description: Schedule is the time the window will begin, specified in cron format
in cron format
type: string type: string
type: object type: object
type: array type: array
type: object type: object
status:
description: AppProjectStatus contains information about appproj
properties:
jwtTokensByRole:
additionalProperties:
properties:
items:
items:
description: JWTToken holds the issuedAt and expiresAt values of a token
properties:
exp:
format: int64
type: integer
iat:
format: int64
type: integer
id:
type: string
required:
- iat
type: object
type: array
type: object
type: object
type: object
required: required:
- metadata - metadata
- spec - spec
@ -225,4 +253,4 @@ spec:
versions: versions:
- name: v1alpha1 - name: v1alpha1
served: true served: true
storage: true storage: true

View file

@ -56,6 +56,8 @@ spec:
- {{ .Values.controller.args.appResyncPeriod | quote }} - {{ .Values.controller.args.appResyncPeriod | quote }}
- --repo-server - --repo-server
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }} - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
- --logformat
- {{ .Values.controller.logFormat }}
- --loglevel - --loglevel
- {{ .Values.controller.logLevel }} - {{ .Values.controller.logLevel }}
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}

View file

@ -52,14 +52,14 @@ spec:
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }} image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }}
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }} imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
command: command:
{{- if .Values.openshift.enabled }}
- uid_entrypoint.sh - uid_entrypoint.sh
{{- end }}
- argocd-repo-server - argocd-repo-server
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
- --redis - --redis
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
{{- end }} {{- end }}
- --logformat
- {{ .Values.repoServer.logFormat }}
- --loglevel - --loglevel
- {{ .Values.repoServer.logLevel }} - {{ .Values.repoServer.logLevel }}
{{- with .Values.repoServer.extraArgs }} {{- with .Values.repoServer.extraArgs }}
@ -82,6 +82,10 @@ spec:
{{- if .Values.repoServer.volumeMounts }} {{- if .Values.repoServer.volumeMounts }}
{{- toYaml .Values.repoServer.volumeMounts | nindent 8}} {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
{{- end }} {{- end }}
{{- if .Values.openshift.enabled }}
- mountPath: /app/config/gpg/keys
name: gpg-keyring
{{- end }}
{{- if .Values.configs.knownHosts }} {{- if .Values.configs.knownHosts }}
- mountPath: /app/config/ssh - mountPath: /app/config/ssh
name: ssh-known-hosts name: ssh-known-hosts
@ -138,6 +142,10 @@ spec:
{{- if .Values.repoServer.volumes }} {{- if .Values.repoServer.volumes }}
{{- toYaml .Values.repoServer.volumes | nindent 6}} {{- toYaml .Values.repoServer.volumes | nindent 6}}
{{- end }} {{- end }}
{{- if .Values.openshift.enabled }}
- emptyDir: {}
name: gpg-keyring
{{- end }}
{{- if .Values.configs.knownHosts }} {{- if .Values.configs.knownHosts }}
- configMap: - configMap:
name: argocd-ssh-known-hosts-cm name: argocd-ssh-known-hosts-cm

View file

@ -1,5 +1,7 @@
{{- if .Values.server.certificate.enabled -}} {{- if .Values.server.certificate.enabled -}}
{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }} {{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
apiVersion: cert-manager.io/v1
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" }}
apiVersion: cert-manager.io/v1alpha3 apiVersion: cert-manager.io/v1alpha3
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }} {{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }}
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha2

View file

@ -61,6 +61,8 @@ spec:
- --dex-server - --dex-server
- http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }} - http://{{ template "argo-cd.dex.fullname" . }}:{{ .Values.dex.servicePortHttp }}
{{- end }} {{- end }}
- --logformat
- {{ .Values.server.logFormat }}
- --loglevel - --loglevel
- {{ .Values.server.logLevel }} - {{ .Values.server.logLevel }}
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}

View file

@ -2,6 +2,7 @@
{{- $serviceName := include "argo-cd.server.fullname" . -}} {{- $serviceName := include "argo-cd.server.fullname" . -}}
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}} {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}}
{{- $paths := .Values.server.ingressGrpc.paths -}} {{- $paths := .Values.server.ingressGrpc.paths -}}
{{- $extraPaths := .Values.server.ingressGrpc.extraPaths -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{ else }} {{ else }}
@ -33,6 +34,9 @@ spec:
- host: {{ $host }} - host: {{ $host }}
http: http:
paths: paths:
{{- if $extraPaths }}
{{- toYaml $extraPaths | nindent 10 }}
{{- end -}}
{{- range $p := $paths }} {{- range $p := $paths }}
- path: {{ $p }} - path: {{ $p }}
backend: backend:
@ -43,6 +47,9 @@ spec:
{{- else }} {{- else }}
- http: - http:
paths: paths:
{{- if $extraPaths }}
{{- toYaml $extraPaths | nindent 10 }}
{{- end -}}
{{- range $p := $paths }} {{- range $p := $paths }}
- path: {{ $p }} - path: {{ $p }}
backend: backend:
@ -54,4 +61,4 @@ spec:
tls: tls:
{{- toYaml .Values.server.ingressGrpc.tls | nindent 4 }} {{- toYaml .Values.server.ingressGrpc.tls | nindent 4 }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

View file

@ -2,6 +2,7 @@
{{- $serviceName := include "argo-cd.server.fullname" . -}} {{- $serviceName := include "argo-cd.server.fullname" . -}}
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}} {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}}
{{- $paths := .Values.server.ingress.paths -}} {{- $paths := .Values.server.ingress.paths -}}
{{- $extraPaths := .Values.server.ingress.extraPaths -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{ else }} {{ else }}
@ -33,6 +34,9 @@ spec:
- host: {{ $host }} - host: {{ $host }}
http: http:
paths: paths:
{{- if $extraPaths }}
{{- toYaml $extraPaths | nindent 10 }}
{{- end }}
{{- range $p := $paths }} {{- range $p := $paths }}
- path: {{ $p }} - path: {{ $p }}
backend: backend:
@ -43,6 +47,9 @@ spec:
{{- else }} {{- else }}
- http: - http:
paths: paths:
{{- if $extraPaths }}
{{- toYaml $extraPaths | nindent 10 }}
{{- end }}
{{- range $p := $paths }} {{- range $p := $paths }}
- path: {{ $p }} - path: {{ $p }}
backend: backend:
@ -54,4 +61,4 @@ spec:
tls: tls:
{{- toYaml .Values.server.ingress.tls | nindent 4 }} {{- toYaml .Values.server.ingress.tls | nindent 4 }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

View file

@ -46,5 +46,9 @@ items:
roles: roles:
{{- toYaml .roles | nindent 8 }} {{- toYaml .roles | nindent 8 }}
{{- end }} {{- end }}
{{- if .syncWindows }}
syncWindows:
{{- toYaml .syncWindows | nindent 8 }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -80,6 +80,11 @@ spec:
- name: grpc - name: grpc
containerPort: {{ .Values.dex.containerPortGrpc }} containerPort: {{ .Values.dex.containerPortGrpc }}
protocol: TCP protocol: TCP
{{- if .Values.dex.metrics.enabled }}
- name: metrics
containerPort: {{ .Values.dex.containerPortMetrics }}
protocol: TCP
{{- end }}
{{- if .Values.dex.volumeMounts }} {{- if .Values.dex.volumeMounts }}
volumeMounts: volumeMounts:
{{- toYaml .Values.dex.volumeMounts | nindent 10 }} {{- toYaml .Values.dex.volumeMounts | nindent 10 }}

View file

@ -20,6 +20,12 @@ spec:
protocol: TCP protocol: TCP
port: {{ .Values.dex.servicePortGrpc }} port: {{ .Values.dex.servicePortGrpc }}
targetPort: grpc targetPort: grpc
{{- if .Values.dex.metrics.enabled }}
- name: metrics
protocol: TCP
port: {{ .Values.dex.servicePortMetrics }}
targetPort: metrics
{{- end }}
selector: selector:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}

View file

@ -0,0 +1,35 @@
{{- if and .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "argo-cd.dex.fullname" . }}
{{- if .Values.dex.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.dex.metrics.serviceMonitor.namespace }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.dex.name }}
{{- if .Values.dex.metrics.serviceMonitor.selector }}
{{- toYaml .Values.dex.metrics.serviceMonitor.selector | nindent 4 }}
{{- end }}
{{- if .Values.dex.metrics.serviceMonitor.additionalLabels }}
{{- toYaml .Values.dex.metrics.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }}
spec:
endpoints:
- port: metrics
interval: 30s
path: /metrics
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
selector:
matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
app.kubernetes.io/component: {{ .Values.dex.name }}
{{- end }}

View file

@ -10,7 +10,7 @@ installCRDs: true
global: global:
image: image:
repository: argoproj/argocd repository: argoproj/argocd
tag: v1.6.2 tag: v1.7.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
securityContext: {} securityContext: {}
# runAsUser: 999 # runAsUser: 999
@ -28,7 +28,7 @@ controller:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.6.2 tag: # v1.7.6
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Argo controller commandline flags ## Argo controller commandline flags
@ -37,6 +37,8 @@ controller:
operationProcessors: "10" operationProcessors: "10"
appResyncPeriod: "180" appResyncPeriod: "180"
## Argo controller log format: text|json
logFormat: text
## Argo controller log level ## Argo controller log level
logLevel: info logLevel: info
@ -172,6 +174,14 @@ dex:
enabled: true enabled: true
name: dex-server name: dex-server
metrics:
enabled: false
service:
annotations: {}
labels: {}
serviceMonitor:
enabled: false
image: image:
repository: quay.io/dexidp/dex repository: quay.io/dexidp/dex
tag: v2.22.0 tag: v2.22.0
@ -212,6 +222,8 @@ dex:
servicePortHttp: 5556 servicePortHttp: 5556
containerPortGrpc: 5557 containerPortGrpc: 5557
servicePortGrpc: 5557 servicePortGrpc: 5557
containerPortMetrics: 5558
servicePortMetrics: 5558
## Node selectors and tolerations for server scheduling to nodes with taints ## Node selectors and tolerations for server scheduling to nodes with taints
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@ -330,7 +342,7 @@ server:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.6.1 tag: # v1.7.6
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-server ## Additional command line arguments to pass to argocd-server
@ -342,6 +354,8 @@ server:
## ##
env: [] env: []
## Argo server log format: text|json
logFormat: text
## Argo server log level ## Argo server log level
logLevel: info logLevel: info
@ -454,6 +468,12 @@ server:
# - argocd.example.com # - argocd.example.com
paths: paths:
- / - /
extraPaths:
[]
# - path: /*
# backend:
# serviceName: ssl-redirect
# servicePort: use-annotation
tls: tls:
[] []
# - secretName: argocd-example-tls # - secretName: argocd-example-tls
@ -476,6 +496,12 @@ server:
# - argocd.example.com # - argocd.example.com
paths: paths:
- / - /
extraPaths:
[]
# - path: /*
# backend:
# serviceName: ssl-redirect
# servicePort: use-annotation
tls: tls:
[] []
# - secretName: argocd-example-tls # - secretName: argocd-example-tls
@ -604,6 +630,13 @@ server:
# kind: StatefulSet # kind: StatefulSet
# orphanedResources: {} # orphanedResources: {}
# roles: [] # roles: []
# syncWindows:
# - kind: allow
# schedule: '10 1 * * *'
# duration: 1h
# applications:
# - '*-prod'
# manualSync: true
## Enable Admin ClusterRole resources. ## Enable Admin ClusterRole resources.
## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster. ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
@ -635,7 +668,7 @@ repoServer:
image: image:
repository: # argoproj/argocd repository: # argoproj/argocd
tag: # v1.6.1 tag: # v1.7.6
imagePullPolicy: # IfNotPresent imagePullPolicy: # IfNotPresent
## Additional command line arguments to pass to argocd-repo-server ## Additional command line arguments to pass to argocd-repo-server
@ -646,6 +679,8 @@ repoServer:
## ##
env: [] env: []
## Argo repoServer log format: text|json
logFormat: text
## Argo repoServer log level ## Argo repoServer log level
logLevel: info logLevel: info

View file

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
description: A Helm chart for Argo-CI description: A Helm chart for Argo-CI
name: argo-ci name: argo-ci
version: 0.1.6 version: 0.1.7
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
appVersion: v1.0.0-alpha2 appVersion: v1.0.0-alpha2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm

View file

@ -33,3 +33,7 @@ spec:
ports: ports:
- containerPort: 8001 - containerPort: 8001
- containerPort: 8002 - containerPort: 8002
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -2,6 +2,9 @@ imageNamespace: argoproj
ciImage: argoci ciImage: argoci
imageTag: v1.0.0-alpha2 imageTag: v1.0.0-alpha2
imagePullPolicy: Always imagePullPolicy: Always
# Secrets with credentials to pull images from a private registry
imagePullSecrets: []
# - name: argo-pull-secret
workflowNamespace: default workflowNamespace: default
argo: argo:

View file

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

View file

@ -37,3 +37,7 @@ spec:
value: {{ .Values.eventbusController.natsStreamingImage }} value: {{ .Values.eventbusController.natsStreamingImage }}
- name: NATS_METRICS_EXPORTER_IMAGE - name: NATS_METRICS_EXPORTER_IMAGE
value: {{ .Values.eventbusController.natsMetricsExporterImage }} value: {{ .Values.eventbusController.natsMetricsExporterImage }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventbus.argoproj.io name: eventbus.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec: spec:
group: argoproj.io group: argoproj.io
names: names:

View file

@ -35,3 +35,7 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: EVENTSOURCE_IMAGE - name: EVENTSOURCE_IMAGE
value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}" value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}"
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventsources.argoproj.io name: eventsources.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec: spec:
group: argoproj.io group: argoproj.io
scope: Namespaced scope: Namespaced

View file

@ -35,3 +35,7 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SENSOR_IMAGE - name: SENSOR_IMAGE
value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}" value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -4,6 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: sensors.argoproj.io name: sensors.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec: spec:
group: argoproj.io group: argoproj.io
names: names:

View file

@ -4,6 +4,10 @@ registry: argoproj
# The image pull policy # The image pull policy
imagePullPolicy: Always imagePullPolicy: Always
# Secrets with credentials to pull images from a private registry
imagePullSecrets: []
# - name: argo-pull-secret
# If set to false, skip installing the CRDs. Requires user to have them installed prior to helm chart installation. # If set to false, skip installing the CRDs. Requires user to have them installed prior to helm chart installation.
installCRD: true installCRD: true
@ -42,21 +46,21 @@ singleNamespace: true
sensorController: sensorController:
name: sensor-controller name: sensor-controller
image: sensor-controller image: sensor-controller
tag: v0.17.0 tag: v1.0.0
replicaCount: 1 replicaCount: 1
sensorImage: sensor sensorImage: sensor
eventsourceController: eventsourceController:
name: eventsource-controller name: eventsource-controller
image: eventsource-controller image: eventsource-controller
tag: v0.17.0 tag: v1.0.0
replicaCount: 1 replicaCount: 1
eventsourceImage: eventsource eventsourceImage: eventsource
eventbusController: eventbusController:
name: eventbus-controller name: eventbus-controller
image: eventbus-controller image: eventbus-controller
tag: v0.17.0 tag: v1.0.0
replicaCount: 1 replicaCount: 1
natsStreamingImage: nats-streaming:0.17.0 natsStreamingImage: nats-streaming:0.17.0
natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2 natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2

View file

@ -1,8 +1,8 @@
apiVersion: v1 apiVersion: v1
appVersion: "0.8.0" appVersion: "0.9.1"
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 0.3.2 version: 0.3.7
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:

View file

@ -2,7 +2,7 @@ Argo Rollouts Chart
============= =============
A Helm chart for Argo Rollouts, progressive delivery for Kubernetes. A Helm chart for Argo Rollouts, progressive delivery for Kubernetes.
Current chart version is `0.3.1` Current chart version is `0.3.7`
Source code can be found [here](https://github.com/argoproj/argo-rollouts) Source code can be found [here](https://github.com/argoproj/argo-rollouts)

View file

@ -47,6 +47,12 @@ rules:
- watch - watch
- update - update
- patch - patch
- apiGroups:
- argoproj.io
resources:
- rollouts/finalizers
verbs:
- update
- apiGroups: - apiGroups:
- argoproj.io - argoproj.io
resources: resources:
@ -60,10 +66,18 @@ rules:
- update - update
- patch - patch
- delete - delete
- apiGroups:
- argoproj.io
resources:
- analysisruns/finalizers
- experiments/finalizers
verbs:
- update
- apiGroups: - apiGroups:
- argoproj.io - argoproj.io
resources: resources:
- analysistemplates - analysistemplates
- clusteranalysistemplates
verbs: verbs:
- get - get
- list - list
@ -106,6 +120,24 @@ rules:
- watch - watch
- get - get
- update - update
- list
- apiGroups:
- split.smi-spec.io
resources:
- trafficsplits
verbs:
- create
- watch
- get
- update
- patch
- apiGroups:
- ""
resources:
- pods
verbs:
- list
- delete
- apiGroups: - apiGroups:
- "*" - "*"
resources: resources:

View file

@ -6,6 +6,10 @@ metadata:
app.kubernetes.io/component: server app.kubernetes.io/component: server
app.kubernetes.io/name: {{ .Release.Name }}-metrics app.kubernetes.io/name: {{ .Release.Name }}-metrics
app.kubernetes.io/part-of: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Name }}
annotations:
{{- range $key, $value := .Values.serviceAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec: spec:
ports: ports:
- name: metrics - name: metrics

View file

@ -28,6 +28,14 @@ rules:
- list - list
- watch - watch
- patch - patch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups: - apiGroups:
- argoproj.io - argoproj.io
resources: resources:
@ -38,6 +46,12 @@ rules:
- watch - watch
- update - update
- patch - patch
- apiGroups:
- argoproj.io
resources:
- rollouts/finalizers
verbs:
- update
- apiGroups: - apiGroups:
- argoproj.io - argoproj.io
resources: resources:
@ -51,10 +65,18 @@ rules:
- update - update
- patch - patch
- delete - delete
- apiGroups:
- argoproj.io
resources:
- analysisruns/finalizers
- experiments/finalizers
verbs:
- update
- apiGroups: - apiGroups:
- argoproj.io - argoproj.io
resources: resources:
- analysistemplates - analysistemplates
- clusteranalysistemplates
verbs: verbs:
- get - get
- list - list
@ -90,17 +112,9 @@ rules:
- update - update
- patch - patch
- apiGroups: - apiGroups:
- "" - ""
resources: resources:
- secrets - pods
verbs: verbs:
- get - list
- list - delete
- watch
- apiGroups:
- ""
resources:
- pods
verbs:
- list
- delete

View file

@ -84,6 +84,15 @@ spec:
job: job:
properties: properties:
metadata: metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object type: object
spec: spec:
properties: properties:
@ -127,6 +136,15 @@ spec:
template: template:
properties: properties:
metadata: metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object type: object
spec: spec:
properties: properties:
@ -748,23 +766,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1304,23 +1305,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1864,23 +1848,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -2740,6 +2707,8 @@ spec:
- value - value
type: object type: object
type: array type: array
insecure:
type: boolean
jsonPath: jsonPath:
type: string type: string
timeoutSeconds: timeoutSeconds:
@ -2747,7 +2716,6 @@ spec:
url: url:
type: string type: string
required: required:
- jsonPath
- url - url
type: object type: object
type: object type: object

View file

@ -78,6 +78,15 @@ spec:
job: job:
properties: properties:
metadata: metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object type: object
spec: spec:
properties: properties:
@ -121,6 +130,15 @@ spec:
template: template:
properties: properties:
metadata: metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object type: object
spec: spec:
properties: properties:
@ -742,23 +760,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1298,23 +1299,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1858,23 +1842,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -2734,6 +2701,8 @@ spec:
- value - value
type: object type: object
type: array type: array
insecure:
type: boolean
jsonPath: jsonPath:
type: string type: string
timeoutSeconds: timeoutSeconds:
@ -2741,7 +2710,6 @@ spec:
url: url:
type: string type: string
required: required:
- jsonPath
- url - url
type: object type: object
type: object type: object

File diff suppressed because it is too large Load diff

View file

@ -59,6 +59,8 @@ spec:
- name - name
type: object type: object
type: array type: array
clusterScope:
type: boolean
name: name:
type: string type: string
requiredForCompletion: requiredForCompletion:
@ -112,6 +114,15 @@ spec:
template: template:
properties: properties:
metadata: metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object type: object
spec: spec:
properties: properties:
@ -733,23 +744,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1289,23 +1283,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1849,23 +1826,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:

View file

@ -132,15 +132,17 @@ spec:
- name - name
type: object type: object
type: array type: array
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
templates: templates:
items: items:
properties: properties:
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
required:
- templateName
type: object type: object
type: array type: array
type: object type: object
@ -162,15 +164,17 @@ spec:
- name - name
type: object type: object
type: array type: array
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
templates: templates:
items: items:
properties: properties:
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
required:
- templateName
type: object type: object
type: array type: array
type: object type: object
@ -208,6 +212,8 @@ spec:
- name - name
type: object type: object
type: array type: array
clusterScope:
type: boolean
startingStep: startingStep:
format: int32 format: int32
type: integer type: integer
@ -216,10 +222,10 @@ spec:
templates: templates:
items: items:
properties: properties:
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
required:
- templateName
type: object type: object
type: array type: array
type: object type: object
@ -271,15 +277,17 @@ spec:
- name - name
type: object type: object
type: array type: array
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
templates: templates:
items: items:
properties: properties:
clusterScope:
type: boolean
templateName: templateName:
type: string type: string
required:
- templateName
type: object type: object
type: array type: array
type: object type: object
@ -304,6 +312,8 @@ spec:
- name - name
type: object type: object
type: array type: array
clusterScope:
type: boolean
name: name:
type: string type: string
templateName: templateName:
@ -388,6 +398,8 @@ spec:
type: string type: string
ingress: ingress:
type: string type: string
rootService:
type: string
servicePort: servicePort:
format: int32 format: int32
type: integer type: integer
@ -425,12 +437,28 @@ spec:
required: required:
- stableIngress - stableIngress
type: object type: object
smi:
properties:
rootService:
type: string
trafficSplitName:
type: string
type: object
type: object type: object
type: object type: object
type: object type: object
template: template:
properties: properties:
metadata: metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object type: object
spec: spec:
properties: properties:
@ -1052,23 +1080,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -1608,23 +1619,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -2168,23 +2162,6 @@ spec:
type: integer type: integer
type: object type: object
resources: resources:
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object type: object
securityContext: securityContext:
properties: properties:
@ -2935,6 +2912,9 @@ spec:
type: integer type: integer
abort: abort:
type: boolean type: boolean
abortedAt:
format: date-time
type: string
availableReplicas: availableReplicas:
format: int32 format: int32
type: integer type: integer
@ -2944,8 +2924,32 @@ spec:
type: string type: string
postPromotionAnalysisRun: postPromotionAnalysisRun:
type: string type: string
postPromotionAnalysisRunStatus:
properties:
message:
type: string
name:
type: string
status:
type: string
required:
- name
- status
type: object
prePromotionAnalysisRun: prePromotionAnalysisRun:
type: string type: string
prePromotionAnalysisRunStatus:
properties:
message:
type: string
name:
type: string
status:
type: string
required:
- name
- status
type: object
previewSelector: previewSelector:
type: string type: string
previousActiveSelector: previousActiveSelector:
@ -2960,10 +2964,34 @@ spec:
properties: properties:
currentBackgroundAnalysisRun: currentBackgroundAnalysisRun:
type: string type: string
currentBackgroundAnalysisRunStatus:
properties:
message:
type: string
name:
type: string
status:
type: string
required:
- name
- status
type: object
currentExperiment: currentExperiment:
type: string type: string
currentStepAnalysisRun: currentStepAnalysisRun:
type: string type: string
currentStepAnalysisRunStatus:
properties:
message:
type: string
name:
type: string
status:
type: string
required:
- name
- status
type: object
stableRS: stableRS:
type: string type: string
type: object type: object

View file

@ -13,7 +13,7 @@ controller:
affinity: {} affinity: {}
image: image:
repository: argoproj/argo-rollouts repository: argoproj/argo-rollouts
tag: v0.8.0 tag: v0.9.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -28,12 +28,18 @@ controller:
serviceAccount: serviceAccount:
name: argo-rollouts name: argo-rollouts
## Annotations to be added to the Redis server pods ## Annotations to be added to the Rollout pods
## ##
podAnnotations: {} podAnnotations: {}
## Labels to be added to the Redis server pods ## Annotations to be added to the Rollout service
##
serviceAnnotations: {}
## Labels to be added to the Rollout pods
## ##
podLabels: {} podLabels: {}
# Secrets with credentials to pull images from a private registry
imagePullSecrets: [] imagePullSecrets: []
# - name: argo-pull-secret

View file

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

View file

@ -8,6 +8,7 @@ rules:
- "" - ""
resources: resources:
- configmaps - configmaps
- events
verbs: verbs:
- get - get
- watch - watch

View file

@ -1,4 +1,4 @@
{{- if .Values.server.enabled -}} {{- if and .Values.server.enabled .Values.server.createServiceAccount -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.singleNamespace }} {{- if .Values.singleNamespace }}
kind: RoleBinding kind: RoleBinding

View file

@ -26,6 +26,10 @@ spec:
{{ toYaml .Values.server.podAnnotations | indent 8}}{{- end }} {{ toYaml .Values.server.podAnnotations | indent 8}}{{- end }}
spec: spec:
serviceAccountName: {{ .Values.server.serviceAccount | quote }} serviceAccountName: {{ .Values.server.serviceAccount | quote }}
{{- if .Values.server.podSecurityContext }}
securityContext:
{{- toYaml .Values.server.podSecurityContext | nindent 8 }}
{{- end }}
containers: containers:
- name: argo-server - name: argo-server
args: args:
@ -67,6 +71,10 @@ spec:
volumeMounts: volumeMounts:
{{- toYaml . | nindent 12}} {{- toYaml . | nindent 12}}
{{- end }} {{- end }}
{{- with .Values.images.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.server.volumes }} {{- with .Values.server.volumes }}
volumes: volumes:
{{- toYaml . | nindent 8}} {{- toYaml . | nindent 8}}

View file

@ -1,4 +1,4 @@
{{- if .Values.server.enabled -}} {{- if and .Values.server.enabled .Values.server.createServiceAccount -}}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:

View file

@ -73,6 +73,7 @@ rules:
- events - events
verbs: verbs:
- create - create
- patch
- apiGroups: - apiGroups:
- "" - ""
resources: resources:
@ -80,6 +81,14 @@ rules:
verbs: verbs:
- get - get
- list - list
- apiGroups:
- "policy"
resources:
- poddisruptionbudgets
verbs:
- create
- get
- delete
{{- if .Values.controller.persistence }} {{- if .Values.controller.persistence }}
- apiGroups: - apiGroups:
- "" - ""

View file

@ -16,7 +16,7 @@ data:
{{- end }} {{- end }}
{{- end }} {{- end }}
containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }} containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }}
{{- if or .Values.executor.resources .Values.executor.env }} {{- if or .Values.executor.resources .Values.executor.env .Values.executor.securityContext}}
executor: executor:
{{- with .Values.executor.resources }} {{- with .Values.executor.resources }}
resources: {{- toYaml . | nindent 8 }} resources: {{- toYaml . | nindent 8 }}
@ -24,12 +24,19 @@ data:
{{- with .Values.executor.env }} {{- with .Values.executor.env }}
env: {{- toYaml . | nindent 8 }} env: {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.executor.securityContext }}
securityContext: {{- toYaml . | nindent 8 }}
{{- end }}
{{- end }} {{- end }}
{{- if or .Values.minio.install .Values.useDefaultArtifactRepo }} {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
artifactRepository: artifactRepository:
{{- if .Values.artifactRepository.archiveLogs }} {{- if .Values.artifactRepository.archiveLogs }}
archiveLogs: {{ .Values.artifactRepository.archiveLogs }} archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
{{- end }} {{- end }}
{{- if .Values.artifactRepository.gcs }}
gcs:
{{ toYaml .Values.artifactRepository.gcs | indent 8}}
{{- else }}
s3: s3:
{{- if .Values.useStaticCredentials }} {{- if .Values.useStaticCredentials }}
accessKeySecret: accessKeySecret:
@ -54,6 +61,7 @@ data:
{{- if .Values.artifactRepository.s3.useSDKCreds }} {{- if .Values.artifactRepository.s3.useSDKCreds }}
useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }} useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }}
{{- end }} {{- end }}
{{- end }}
{{- end}} {{- end}}
{{- if .Values.controller.metricsConfig.enabled }} {{- if .Values.controller.metricsConfig.enabled }}
metricsConfig: metricsConfig:
@ -70,3 +78,6 @@ data:
{{- with .Values.server.sso }} {{- with .Values.server.sso }}
sso: {{- toYaml . | nindent 6 }} sso: {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- with .Values.controller.workflowRestrictions }}
workflowRestrictions: {{- toYaml . | nindent 6 }}
{{- end }}

View file

@ -26,6 +26,10 @@ spec:
{{ toYaml .Values.controller.podAnnotations | indent 8}}{{- end }} {{ toYaml .Values.controller.podAnnotations | indent 8}}{{- end }}
spec: spec:
serviceAccountName: {{ .Values.controller.serviceAccount | quote }} serviceAccountName: {{ .Values.controller.serviceAccount | quote }}
{{- if .Values.controller.podSecurityContext }}
securityContext:
{{- toYaml .Values.controller.podSecurityContext | nindent 8 }}
{{- end }}
containers: containers:
- name: controller - name: controller
image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}" image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}"
@ -63,6 +67,10 @@ spec:
ports: ports:
- containerPort: 8080 - containerPort: 8080
{{- end }} {{- end }}
{{- with .Values.images.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.controller.nodeSelector }} {{- with .Values.controller.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -0,0 +1,19 @@
{{- if .Values.workflow.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ .Release.Name }}-workflow
{{- if .Values.workflow.namespace }}
namespace: {{ .Values.workflow.namespace }}
{{- end }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: {{ .Release.Name }}-workflow
subjects:
- kind: ServiceAccount
name: {{ .Values.workflow.serviceAccount.name }}
{{- if .Values.workflow.namespace }}
namespace: {{ .Values.workflow.namespace }}
{{- end }}
{{- end }}

View file

@ -0,0 +1,25 @@
{{- if .Values.workflow.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ .Release.Name }}-workflow
{{- if .Values.workflow.namespace }}
namespace: {{ .Values.workflow.namespace }}
{{- end }}
rules:
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- watch
- patch
- apiGroups:
- ""
resources:
- pods/log
verbs:
- get
- watch
{{- end }}

View file

@ -0,0 +1,13 @@
{{- if .Values.workflow.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.workflow.serviceAccount.name }}
{{- if .Values.workflow.namespace }}
namespace: {{ .Values.workflow.namespace }}
{{- end }}
{{- with .Values.workflow.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}

View file

@ -4,6 +4,9 @@ images:
server: argocli server: argocli
executor: argoexec executor: argoexec
pullPolicy: Always pullPolicy: Always
# Secrets with credentials to pull images from a private registry
pullSecrets: []
# - name: argo-pull-secret
tag: v2.7.6 tag: v2.7.6
crdVersion: v1alpha1 crdVersion: v1alpha1
@ -20,6 +23,15 @@ createAggregateRoles: true
# and start argo-cli with the --namespaced flag. Use it in clusters with strict access policy. # and start argo-cli with the --namespaced flag. Use it in clusters with strict access policy.
singleNamespace: false singleNamespace: false
workflow:
namespace: "" # Speficy namespace if workflows run in another namespace than argo. This controls where the service account and RBAC resources will be created.
serviceAccount:
create: false # Specifies whether a service account should be created
annotations: {}
name: "argo-workflow" # Service account which is used to run workflows
rbac:
create: false # adds Role and RoleBinding for the above specified service account to be able to run workflows
controller: controller:
image: image:
# Overrides .images.tag if defined. # Overrides .images.tag if defined.
@ -28,6 +40,8 @@ controller:
podAnnotations: {} podAnnotations: {}
# Optional labels to add to the controller pods # Optional labels to add to the controller pods
podLabels: {} podLabels: {}
# SecurityContext to set on the controller pods
podSecurityContext: {}
# podPortName: http # podPortName: http
metricsConfig: metricsConfig:
enabled: false enabled: false
@ -59,6 +73,8 @@ controller:
# secondsAfterCompletion: 84600 # secondsAfterCompletion: 84600
# workflowWorkers: 32 # workflowWorkers: 32
# podWorkers: 32 # podWorkers: 32
workflowRestrictions: {} # Only valid for 2.9+
# templateReferencing: Strict|Secure
telemetryConfig: telemetryConfig:
enabled: false enabled: false
path: /telemetry path: /telemetry
@ -105,7 +121,8 @@ controller:
## Node selectors and tolerations for server scheduling to nodes with taints ## Node selectors and tolerations for server scheduling to nodes with taints
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
## ##
nodeSelector: {} nodeSelector:
kubernetes.io/os: linux
tolerations: [] tolerations: []
affinity: {} affinity: {}
@ -117,6 +134,8 @@ executor:
resources: {} resources: {}
# Adds environment variables for the executor. # Adds environment variables for the executor.
env: {} env: {}
# sets security context for the executor container
securityContext: {}
server: server:
enabled: true enabled: true
@ -131,11 +150,16 @@ server:
podAnnotations: {} podAnnotations: {}
# Optional labels to add to the UI pods # Optional labels to add to the UI pods
podLabels: {} podLabels: {}
# SecurityContext to set on the server pods
podSecurityContext: {}
name: server name: server
serviceType: ClusterIP serviceType: ClusterIP
servicePort: 2746 servicePort: 2746
# servicePortName: http # servicePortName: http
serviceAccount: argo-server serviceAccount: argo-server
# Whether to create the service account with the name specified in
# server.serviceAccount and bind it to the server role.
createServiceAccount: true
# Service account annotations # Service account annotations
serviceAccountAnnotations: {} serviceAccountAnnotations: {}
# Annotations to be applied to the UI Service # Annotations to be applied to the UI Service
@ -157,7 +181,8 @@ server:
## Node selectors and tolerations for server scheduling to nodes with taints ## Node selectors and tolerations for server scheduling to nodes with taints
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
## ##
nodeSelector: {} nodeSelector:
kubernetes.io/os: linux
tolerations: [] tolerations: []
affinity: {} affinity: {}
@ -240,6 +265,21 @@ artifactRepository:
# region: # region:
# roleARN: # roleARN:
# useSDKCreds: true # useSDKCreds: true
# gcs:
# bucket: <project>-argo
# keyFormat: "{{workflow.namespace}}/{{workflow.name}}/"
# serviceAccountKeySecret is a secret selector.
# It references the k8s secret named 'my-gcs-credentials'.
# This secret is expected to have have the key 'serviceAccountKey',
# containing the base64 encoded credentials
# to the bucket.
#
# If it's running on GKE and Workload Identity is used,
# serviceAccountKeySecret is not needed.
# serviceAccountKeySecret:
# name: my-gcs-credentials
# key: serviceAccountKey
# NOTE: These are setting attributes for the `minio` optional dependency # NOTE: These are setting attributes for the `minio` optional dependency
minio: minio:

View file

@ -3,7 +3,7 @@ appVersion: 0.7.0
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD. description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
name: argocd-notifications name: argocd-notifications
type: application type: application
version: 1.0.9 version: 1.0.11
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:

View file

@ -30,6 +30,9 @@ spec:
command: command:
- /app/argocd-notifications - /app/argocd-notifications
- bot - bot
ports:
- containerPort: 8080
name: http
{{- with .Values.bots.slack.nodeSelector }} {{- with .Values.bots.slack.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -9,10 +9,10 @@ metadata:
{{- end }} {{- end }}
spec: spec:
ports: ports:
- name: server - name: http
port: 80 port: {{ .Values.bots.slack.service.port }}
protocol: TCP protocol: TCP
targetPort: 8080 targetPort: http
selector: selector:
{{- include "argocd-notifications.bots.slack.selectorLabels" . | nindent 4 }} {{- include "argocd-notifications.bots.slack.selectorLabels" . | nindent 4 }}
type: {{ .Values.bots.slack.service.type }} type: {{ .Values.bots.slack.service.type }}

View file

@ -12,6 +12,12 @@ spec:
{{- include "argocd-notifications.selectorLabels" . | nindent 6 }} {{- include "argocd-notifications.selectorLabels" . | nindent 6 }}
template: template:
metadata: metadata:
{{- if .Values.podAnnotations }}
annotations:
{{- range $key, $value := .Values.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
labels: labels:
{{- include "argocd-notifications.selectorLabels" . | nindent 8 }} {{- include "argocd-notifications.selectorLabels" . | nindent 8 }}
spec: spec:

View file

@ -101,6 +101,8 @@ metrics:
# interval: 30s # interval: 30s
# scrapeTimeout: 10s # scrapeTimeout: 10s
podAnnotations: {}
resources: {} resources: {}
# limits: # limits:
# cpu: 100m # cpu: 100m
@ -209,6 +211,7 @@ bots:
service: service:
annotations: {} annotations: {}
port: 80
type: LoadBalancer type: LoadBalancer
serviceAccount: serviceAccount: