Merge branch 'master' into updated-crds
This commit is contained in:
chgl
commit
99d68b7ae3
5 changed files with 1937 additions and 1929 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,230 +1,230 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: appprojects.argoproj.io
|
app.kubernetes.io/name: appprojects.argoproj.io
|
||||||
app.kubernetes.io/part-of: argocd
|
app.kubernetes.io/part-of: argocd
|
||||||
name: appprojects.argoproj.io
|
name: appprojects.argoproj.io
|
||||||
annotations:
|
annotations:
|
||||||
helm.sh/hook: crd-install
|
helm.sh/hook: crd-install
|
||||||
spec:
|
spec:
|
||||||
group: argoproj.io
|
group: argoproj.io
|
||||||
names:
|
names:
|
||||||
kind: AppProject
|
kind: AppProject
|
||||||
listKind: AppProjectList
|
listKind: AppProjectList
|
||||||
plural: appprojects
|
plural: appprojects
|
||||||
shortNames:
|
shortNames:
|
||||||
- appproj
|
- appproj
|
||||||
- appprojs
|
- appprojs
|
||||||
singular: appproject
|
singular: appproject
|
||||||
scope: Namespaced
|
scope: Namespaced
|
||||||
versions:
|
versions:
|
||||||
- name: v1alpha1
|
- name: v1alpha1
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: true
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
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)'
|
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)'
|
||||||
properties:
|
properties:
|
||||||
apiVersion:
|
apiVersion:
|
||||||
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'
|
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'
|
||||||
type: string
|
type: string
|
||||||
kind:
|
kind:
|
||||||
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'
|
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'
|
||||||
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:
|
||||||
clusterResourceBlacklist:
|
clusterResourceBlacklist:
|
||||||
description: ClusterResourceBlacklist contains list of blacklisted cluster level resources
|
description: ClusterResourceBlacklist contains list of blacklisted cluster level resources
|
||||||
items:
|
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
|
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
|
||||||
kind:
|
kind:
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- group
|
- group
|
||||||
- kind
|
- kind
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
clusterResourceWhitelist:
|
clusterResourceWhitelist:
|
||||||
description: ClusterResourceWhitelist contains list of whitelisted cluster level resources
|
description: ClusterResourceWhitelist contains list of whitelisted cluster level resources
|
||||||
items:
|
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
|
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
|
||||||
kind:
|
kind:
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- group
|
- group
|
||||||
- kind
|
- kind
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
description:
|
description:
|
||||||
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 deployment
|
description: Destinations contains list of destinations available for deployment
|
||||||
items:
|
items:
|
||||||
description: ApplicationDestination contains deployment destination information
|
description: ApplicationDestination contains deployment destination information
|
||||||
properties:
|
properties:
|
||||||
name:
|
name:
|
||||||
description: Name of the destination cluster which can be used instead of server (url) field
|
description: Name of the destination cluster which can be used instead of server (url) field
|
||||||
type: string
|
type: string
|
||||||
namespace:
|
namespace:
|
||||||
description: Namespace overrides the environment namespace value in the ksonnet app.yaml
|
description: Namespace overrides the environment namespace value in the ksonnet app.yaml
|
||||||
type: string
|
type: string
|
||||||
server:
|
server:
|
||||||
description: Server overrides the environment server value in the ksonnet app.yaml
|
description: Server overrides the environment server value in the ksonnet app.yaml
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
namespaceResourceBlacklist:
|
namespaceResourceBlacklist:
|
||||||
description: NamespaceResourceBlacklist contains list of blacklisted namespace level resources
|
description: NamespaceResourceBlacklist contains list of blacklisted namespace level resources
|
||||||
items:
|
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
|
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
|
||||||
kind:
|
kind:
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- group
|
- group
|
||||||
- kind
|
- kind
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
namespaceResourceWhitelist:
|
namespaceResourceWhitelist:
|
||||||
description: NamespaceResourceWhitelist contains list of whitelisted namespace level resources
|
description: NamespaceResourceWhitelist contains list of whitelisted namespace level resources
|
||||||
items:
|
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
|
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
|
||||||
kind:
|
kind:
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- group
|
- group
|
||||||
- kind
|
- kind
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
orphanedResources:
|
orphanedResources:
|
||||||
description: OrphanedResources specifies if controller should monitor orphaned resources of apps in this project
|
description: OrphanedResources specifies if controller should monitor orphaned resources of apps in this project
|
||||||
properties:
|
properties:
|
||||||
ignore:
|
ignore:
|
||||||
items:
|
items:
|
||||||
properties:
|
properties:
|
||||||
group:
|
group:
|
||||||
type: string
|
type: string
|
||||||
kind:
|
kind:
|
||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
warn:
|
warn:
|
||||||
description: Warn indicates if warning condition should be created for apps which have orphaned resources
|
description: Warn indicates if warning condition should be created 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 project
|
description: Roles are user defined RBAC roles associated with this 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:
|
||||||
description:
|
description:
|
||||||
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 role
|
description: Groups are a list of OIDC group claims bound to this role
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
jwtTokens:
|
jwtTokens:
|
||||||
description: JWTTokens are a list of generated JWT tokens bound to this role
|
description: JWTTokens are a list of generated JWT tokens bound to this role
|
||||||
items:
|
items:
|
||||||
description: JWTToken holds the issuedAt and expiresAt values of a token
|
description: JWTToken holds the issuedAt and expiresAt values of a token
|
||||||
properties:
|
properties:
|
||||||
exp:
|
exp:
|
||||||
format: int64
|
format: int64
|
||||||
type: integer
|
type: integer
|
||||||
iat:
|
iat:
|
||||||
format: int64
|
format: int64
|
||||||
type: integer
|
type: integer
|
||||||
id:
|
id:
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- iat
|
- iat
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
name:
|
name:
|
||||||
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 that define access policies for the role in the project
|
description: Policies Stores a list of casbin formated strings that define access policies for the role in the project
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
required:
|
required:
|
||||||
- name
|
- name
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
signatureKeys:
|
signatureKeys:
|
||||||
description: List of PGP key IDs that commits to be synced to must be signed with
|
description: List of PGP key IDs that commits to be synced to must be signed with
|
||||||
items:
|
items:
|
||||||
description: SignatureKey is the specification of a key required to verify commit signatures with
|
description: SignatureKey is the specification of a key required to verify commit signatures with
|
||||||
properties:
|
properties:
|
||||||
keyID:
|
keyID:
|
||||||
description: The ID of the key in hexadecimal notation
|
description: The ID of the key in hexadecimal notation
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- keyID
|
- keyID
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
sourceRepos:
|
sourceRepos:
|
||||||
description: SourceRepos contains list of repository URLs which can be used for deployment
|
description: SourceRepos contains list of repository URLs which can 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 this project
|
description: SyncWindows controls when syncs can be run for apps in this project
|
||||||
items:
|
items:
|
||||||
description: SyncWindow contains the kind, time, duration and attributes that are used to assign the syncWindows to apps
|
description: SyncWindow contains the kind, time, duration and attributes that are used to assign the syncWindows to apps
|
||||||
properties:
|
properties:
|
||||||
applications:
|
applications:
|
||||||
description: Applications contains a list of applications that the window will apply to
|
description: Applications contains a list of applications that 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 will apply to
|
description: Clusters contains a list of clusters that the window 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 be open
|
description: Duration is the amount of time the sync window will 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 be blocked
|
description: ManualSync enables manual syncs when they would otherwise be blocked
|
||||||
type: boolean
|
type: boolean
|
||||||
namespaces:
|
namespaces:
|
||||||
description: Namespaces contains a list of namespaces that the window will apply to
|
description: Namespaces contains a list of namespaces that the 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 in cron format
|
description: Schedule is the time the window will begin, specified in cron format
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- metadata
|
- metadata
|
||||||
- spec
|
- spec
|
||||||
type: object
|
type: object
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
||||||
appVersion: v2.12.5
|
appVersion: v2.12.5
|
||||||
description: A Helm chart for Argo Workflows
|
description: A Helm chart for Argo Workflows
|
||||||
name: argo
|
name: argo
|
||||||
version: 0.15.4
|
version: 0.16.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
|
||||||
maintainers:
|
maintainers:
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,9 @@ metadata:
|
||||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||||
release: {{ .Release.Name }}
|
release: {{ .Release.Name }}
|
||||||
heritage: {{ .Release.Service }}
|
heritage: {{ .Release.Service }}
|
||||||
|
{{- range $key, $value := .Values.server.ingress.labels }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
annotations:
|
annotations:
|
||||||
{{- range $key, $value := .Values.server.ingress.annotations }}
|
{{- range $key, $value := .Values.server.ingress.annotations }}
|
||||||
{{ $key }}: {{ $value | quote }}
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
|
|
||||||
|
|
@ -226,6 +226,11 @@ server:
|
||||||
# kubernetes.io/ingress.class: nginx
|
# kubernetes.io/ingress.class: nginx
|
||||||
# kubernetes.io/tls-acme: "true"
|
# kubernetes.io/tls-acme: "true"
|
||||||
|
|
||||||
|
## Labels to be added to the web ingress.
|
||||||
|
##
|
||||||
|
# labels:
|
||||||
|
# use-cloudflare-solver: "true"
|
||||||
|
|
||||||
## Hostnames.
|
## Hostnames.
|
||||||
## Must be provided if Ingress is enabled.
|
## Must be provided if Ingress is enabled.
|
||||||
##
|
##
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue