From 5ffa599b0c6c54c88804c7619c06a56979a08d28 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 11 Dec 2020 21:07:50 +0100 Subject: [PATCH] update argocd deployment --- argocd/argocd.yaml | 1022 ++++++++++++++++++++------------------------ 1 file changed, 471 insertions(+), 551 deletions(-) diff --git a/argocd/argocd.yaml b/argocd/argocd.yaml index e769972..b5a86b9 100644 --- a/argocd/argocd.yaml +++ b/argocd/argocd.yaml @@ -7,6 +7,17 @@ metadata: app.kubernetes.io/part-of: argocd name: applications.argoproj.io spec: + additionalPrinterColumns: + - JSONPath: .status.sync.status + name: Sync Status + type: string + - JSONPath: .status.health.status + name: Health Status + type: string + - JSONPath: .status.sync.revision + name: Revision + priority: 10 + type: string group: argoproj.io names: kind: Application @@ -17,19 +28,16 @@ spec: - apps singular: application scope: Namespaced + subresources: {} validation: openAPIV3Schema: description: Application is a definition of Application resource. properties: 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 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 metadata: type: object @@ -49,12 +57,10 @@ spec: type: object type: array initiatedBy: - description: OperationInitiator holds information about the operation - initiator + description: OperationInitiator holds information about the operation initiator properties: automated: - description: Automated is set to true if operation was initiated - automatically by the application controller. + description: Automated is set to true if operation was initiated automatically by the application controller. type: boolean username: description: Name of a user who started operation. @@ -67,22 +73,18 @@ spec: description: Backoff is a backoff strategy properties: duration: - description: Duration is the amount to back off. Default unit - is seconds, but could also be a duration (e.g. "2m", "1h") + description: Duration is the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") type: string factor: - description: Factor is a factor to multiply the base duration - after each failed retry + description: Factor is a factor to multiply the base duration after each failed retry format: int64 type: integer maxDuration: - description: MaxDuration is the maximum amount of time allowed - for the backoff strategy + description: MaxDuration is the maximum amount of time allowed for the backoff strategy type: string type: object limit: - description: Limit is the maximum number of attempts when retrying - a container + description: Limit is the maximum number of attempts when retrying a container format: int64 type: integer type: object @@ -90,18 +92,15 @@ spec: description: SyncOperation contains sync operation details. properties: dryRun: - description: DryRun will perform a `kubectl apply --dry-run` without - actually performing the sync + description: DryRun will perform a `kubectl apply --dry-run` without actually performing the sync type: boolean manifests: - description: Manifests is an optional field that overrides sync - source with a local directory for development + description: Manifests is an optional field that overrides sync source with a local directory for development items: type: string type: array prune: - description: Prune deletes resources that are no longer tracked - in git + description: Prune deletes resources that are no longer tracked in git type: boolean resources: description: Resources describes which resources to sync @@ -122,13 +121,10 @@ spec: type: object type: array revision: - description: Revision is the revision in which to sync the application - to. If omitted, will use the revision specified in app spec. + description: Revision is the revision in which to sync the application to. If omitted, will use the revision specified in app spec. type: string source: - description: Source overrides the source definition set in the application. - This is typically set in a Rollback operation and nil during a - Sync operation + description: Source overrides the source definition set in the application. This is typically set in a Rollback operation and nil during a Sync operation properties: chart: description: Chart is a Helm chart name @@ -136,9 +132,10 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific - options + description: ApplicationSourceJsonnet holds jsonnet specific options properties: extVars: description: ExtVars is a list of Jsonnet External Variables @@ -185,11 +182,9 @@ spec: description: Helm holds helm specific options properties: fileParameters: - description: FileParameters are file parameters to the helm - template + description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to - a helm template + description: HelmFileParameter is a file parameter to a helm template properties: name: description: Name is the name of the helm parameter @@ -205,8 +200,7 @@ spec: description: HelmParameter is a parameter to a helm template properties: forceString: - description: ForceString determines whether to tell - Helm to interpret booleans and numbers as strings + description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: description: Name is the name of the helm parameter @@ -217,30 +211,28 @@ spec: type: object type: array releaseName: - description: The Helm release name. If omitted it will use - the application name + description: The Helm release name. If omitted it will use the application name type: string valueFiles: - description: ValuesFiles is a list of Helm value files to - use when generating a template + description: ValuesFiles is a list of Helm value files to use when generating a template items: type: string type: array values: - description: Values is Helm values, typically defined as - a block + description: Values is Helm values, typically defined as a block + type: string + version: + description: Version is the Helm version to use for templating with type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options properties: environment: - description: Environment is a ksonnet application environment - name + description: Environment is a ksonnet application environment name type: string parameters: - description: Parameters are a list of ksonnet component - parameter override values + description: Parameters are a list of ksonnet component parameter override values items: description: KsonnetParameter is a ksonnet component parameter properties: @@ -259,6 +251,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -270,12 +267,10 @@ spec: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources - for kustomize apps + description: NamePrefix is a prefix appended to resources for kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for kustomize apps + description: NameSuffix is a suffix appended to resources for kustomize apps type: string version: description: Version contains optional Kustomize version @@ -285,8 +280,7 @@ spec: description: Path is a directory path within the Git repository type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: ConfigManagementPlugin holds config management plugin specific options properties: env: items: @@ -306,13 +300,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application - manifests + description: RepoURL is the repository URL of the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch - in which to sync the application to. If omitted, will sync - to HEAD + description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD type: string required: - repoURL @@ -326,59 +317,42 @@ spec: description: SyncStrategy describes how to perform the sync properties: apply: - description: Apply wil perform a `kubectl apply` to perform - the sync. + description: Apply will perform a `kubectl apply` to perform the sync. properties: force: - description: Force indicates whether or not to supply the - --force flag to `kubectl apply`. The --force flag deletes - and re-create the resource, when PATCH encounters conflict - and has retried for 5 times. + description: Force indicates whether or not to supply the --force flag to `kubectl apply`. The --force flag deletes and re-create the resource, when PATCH encounters conflict and has retried for 5 times. type: boolean type: object hook: - description: Hook will submit any referenced resources to perform - the sync. This is the default strategy + description: Hook will submit any referenced resources to perform the sync. This is the default strategy properties: force: - description: Force indicates whether or not to supply the - --force flag to `kubectl apply`. The --force flag deletes - and re-create the resource, when PATCH encounters conflict - and has retried for 5 times. + description: Force indicates whether or not to supply the --force flag to `kubectl apply`. The --force flag deletes and re-create the resource, when PATCH encounters conflict and has retried for 5 times. type: boolean type: object type: object type: object type: object spec: - description: ApplicationSpec represents desired application state. Contains - link to repository with application definition and additional parameters - link definition revision. + description: ApplicationSpec represents desired application state. Contains link to repository with application definition and additional parameters link definition revision. properties: destination: - description: Destination overrides the kubernetes server and namespace - defined in the environment ksonnet app.yaml + description: Destination overrides the kubernetes server and namespace defined in the environment ksonnet app.yaml properties: 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 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 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: object ignoreDifferences: - description: IgnoreDifferences controls resources fields which should - be ignored during comparison + description: IgnoreDifferences controls resources fields which should be ignored during comparison items: - description: ResourceIgnoreDifferences contains resource filter and - list of json paths which should be ignored during comparison with - live state. + description: ResourceIgnoreDifferences contains resource filter and list of json paths which should be ignored during comparison with live state. properties: group: type: string @@ -398,8 +372,7 @@ spec: type: object type: array info: - description: Infos contains a list of useful information (URLs, email - addresses, and plain text) that relates to the application + description: Infos contains a list of useful information (URLs, email addresses, and plain text) that relates to the application items: properties: name: @@ -412,20 +385,14 @@ spec: type: object type: array project: - description: Project is a application project name. Empty name means - that application belongs to 'default' project. + description: Project is a application project name. Empty name means that application belongs to 'default' project. type: string revisionHistoryLimit: - description: This limits this number of items kept in the apps revision - history. This should only be changed in exceptional circumstances. - Setting to zero will store no history. This will reduce storage used. - Increasing will increase the space used to store the history, so we - do not recommend increasing it. Default is 10. + description: This limits this number of items kept in the apps revision history. This should only be changed in exceptional circumstances. Setting to zero will store no history. This will reduce storage used. Increasing will increase the space used to store the history, so we do not recommend increasing it. Default is 10. format: int64 type: integer source: - description: Source is a reference to the location ksonnet application - definition + description: Source is a reference to the location ksonnet application definition properties: chart: description: Chart is a Helm chart name @@ -433,9 +400,10 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific - options + description: ApplicationSourceJsonnet holds jsonnet specific options properties: extVars: description: ExtVars is a list of Jsonnet External Variables @@ -482,11 +450,9 @@ spec: description: Helm holds helm specific options properties: fileParameters: - description: FileParameters are file parameters to the helm - template + description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to a helm - template + description: HelmFileParameter is a file parameter to a helm template properties: name: description: Name is the name of the helm parameter @@ -502,8 +468,7 @@ spec: description: HelmParameter is a parameter to a helm template properties: forceString: - description: ForceString determines whether to tell Helm - to interpret booleans and numbers as strings + description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: description: Name is the name of the helm parameter @@ -514,29 +479,28 @@ spec: type: object type: array releaseName: - description: The Helm release name. If omitted it will use the - application name + description: The Helm release name. If omitted it will use the application name type: string valueFiles: - description: ValuesFiles is a list of Helm value files to use - when generating a template + description: ValuesFiles is a list of Helm value files to use when generating a template items: type: string type: array values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options properties: environment: - description: Environment is a ksonnet application environment - name + description: Environment is a ksonnet application environment name type: string parameters: - description: Parameters are a list of ksonnet component parameter - override values + description: Parameters are a list of ksonnet component parameter override values items: description: KsonnetParameter is a ksonnet component parameter properties: @@ -555,6 +519,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -566,12 +535,10 @@ spec: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources for - kustomize apps + description: NamePrefix is a prefix appended to resources for kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources for - kustomize apps + description: NameSuffix is a suffix appended to resources for kustomize apps type: string version: description: Version contains optional Kustomize version @@ -581,8 +548,7 @@ spec: description: Path is a directory path within the Git repository type: string plugin: - description: ConfigManagementPlugin holds config management plugin - specific options + description: ConfigManagementPlugin holds config management plugin specific options properties: env: items: @@ -605,8 +571,7 @@ spec: description: RepoURL is the repository URL of the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch in - which to sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD type: string required: - repoURL @@ -615,12 +580,13 @@ spec: description: SyncPolicy controls when a sync will be performed properties: automated: - description: Automated will keep an application synced to the target - revision + description: Automated will keep an application synced to the target revision properties: + allowEmpty: + description: 'AllowEmpty allows apps have zero live resources (default: false)' + type: boolean prune: - description: 'Prune will prune resources automatically as part - of automated sync (default: false)' + description: 'Prune will prune resources automatically as part of automated sync (default: false)' type: boolean selfHeal: description: 'SelfHeal enables auto-syncing if (default: false)' @@ -633,23 +599,18 @@ spec: description: Backoff is a backoff strategy properties: duration: - description: Duration is the amount to back off. Default - unit is seconds, but could also be a duration (e.g. "2m", - "1h") + description: Duration is the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") type: string factor: - description: Factor is a factor to multiply the base duration - after each failed retry + description: Factor is a factor to multiply the base duration after each failed retry format: int64 type: integer maxDuration: - description: MaxDuration is the maximum amount of time allowed - for the backoff strategy + description: MaxDuration is the maximum amount of time allowed for the backoff strategy type: string type: object limit: - description: Limit is the maximum number of attempts when retrying - a container + description: Limit is the maximum number of attempts when retrying a container format: int64 type: integer type: object @@ -665,22 +626,18 @@ spec: - source type: object status: - description: ApplicationStatus contains information about application sync, - health status + description: ApplicationStatus contains information about application sync, health status properties: conditions: items: - description: ApplicationCondition contains details about current application - condition + description: ApplicationCondition contains details about current application condition properties: lastTransitionTime: - description: LastTransitionTime is the time the condition was - first observed. + description: LastTransitionTime is the time the condition was first observed. format: date-time type: string message: - description: Message contains human-readable message indicating - details about condition + description: Message contains human-readable message indicating details about condition type: string type: description: Type is an application condition type @@ -699,11 +656,9 @@ spec: type: string type: object history: - description: RevisionHistories is a array of history, oldest first and - newest last + description: RevisionHistories is a array of history, oldest first and newest last items: - description: RevisionHistory contains information relevant to an application - deployment + description: RevisionHistory contains information relevant to an application deployment properties: deployStartedAt: description: DeployStartedAt holds the time the deployment started @@ -721,8 +676,7 @@ spec: description: Revision holds the revision of the sync type: string source: - description: ApplicationSource contains information about github - repository, path within repository and target application environment. + description: ApplicationSource contains information about github repository, path within repository and target application environment. properties: chart: description: Chart is a Helm chart name @@ -730,13 +684,13 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific - options + description: ApplicationSourceJsonnet holds jsonnet specific options properties: extVars: - description: ExtVars is a list of Jsonnet External - Variables + description: ExtVars is a list of Jsonnet External Variables items: description: JsonnetVar is a jsonnet variable properties: @@ -780,30 +734,25 @@ spec: description: Helm holds helm specific options properties: fileParameters: - description: FileParameters are file parameters to the - helm template + description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter to - a helm template + description: HelmFileParameter is a file parameter to a helm template properties: name: description: Name is the name of the helm parameter type: string path: - description: Path is the path value for the helm - parameter + description: Path is the path value for the helm parameter type: string type: object type: array parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm - template + description: HelmParameter is a parameter to a helm template properties: forceString: - description: ForceString determines whether to tell - Helm to interpret booleans and numbers as strings + description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: description: Name is the name of the helm parameter @@ -814,33 +763,30 @@ spec: type: object type: array releaseName: - description: The Helm release name. If omitted it will - use the application name + description: The Helm release name. If omitted it will use the application name type: string valueFiles: - description: ValuesFiles is a list of Helm value files - to use when generating a template + description: ValuesFiles is a list of Helm value files to use when generating a template items: type: string type: array values: - description: Values is Helm values, typically defined - as a block + description: Values is Helm values, typically defined as a block + type: string + version: + description: Version is the Helm version to use for templating with type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options properties: environment: - description: Environment is a ksonnet application environment - name + description: Environment is a ksonnet application environment name type: string parameters: - description: Parameters are a list of ksonnet component - parameter override values + description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter + description: KsonnetParameter is a ksonnet component parameter properties: component: type: string @@ -857,6 +803,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -868,12 +819,10 @@ spec: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources - for kustomize apps + description: NamePrefix is a prefix appended to resources for kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for kustomize apps + description: NameSuffix is a suffix appended to resources for kustomize apps type: string version: description: Version contains optional Kustomize version @@ -883,8 +832,7 @@ spec: description: Path is a directory path within the Git repository type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: ConfigManagementPlugin holds config management plugin specific options properties: env: items: @@ -904,13 +852,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application - manifests + description: RepoURL is the repository URL of the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or branch - in which to sync the application to. If omitted, will sync - to HEAD + description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD type: string required: - repoURL @@ -922,22 +867,18 @@ spec: type: object type: array observedAt: - description: 'ObservedAt indicates when the application state was updated - without querying latest git state Deprecated: controller no longer - updates ObservedAt field' + description: 'ObservedAt indicates when the application state was updated without querying latest git state Deprecated: controller no longer updates ObservedAt field' format: date-time type: string operationState: - description: OperationState contains information about state of currently - performing operation on application. + description: OperationState contains information about state of currently performing operation on application. properties: finishedAt: description: FinishedAt contains time of operation completion format: date-time type: string message: - description: Message hold any pertinent messages when attempting - to perform operation (typically errors). + description: Message hold any pertinent messages when attempting to perform operation (typically errors). type: string operation: description: Operation is the original requested operation @@ -955,12 +896,10 @@ spec: type: object type: array initiatedBy: - description: OperationInitiator holds information about the - operation initiator + description: OperationInitiator holds information about the operation initiator properties: automated: - description: Automated is set to true if operation was initiated - automatically by the application controller. + description: Automated is set to true if operation was initiated automatically by the application controller. type: boolean username: description: Name of a user who started operation. @@ -973,23 +912,18 @@ spec: description: Backoff is a backoff strategy properties: duration: - description: Duration is the amount to back off. Default - unit is seconds, but could also be a duration (e.g. - "2m", "1h") + description: Duration is the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") type: string factor: - description: Factor is a factor to multiply the base - duration after each failed retry + description: Factor is a factor to multiply the base duration after each failed retry format: int64 type: integer maxDuration: - description: MaxDuration is the maximum amount of time - allowed for the backoff strategy + description: MaxDuration is the maximum amount of time allowed for the backoff strategy type: string type: object limit: - description: Limit is the maximum number of attempts when - retrying a container + description: Limit is the maximum number of attempts when retrying a container format: int64 type: integer type: object @@ -997,24 +931,20 @@ spec: description: SyncOperation contains sync operation details. properties: dryRun: - description: DryRun will perform a `kubectl apply --dry-run` - without actually performing the sync + description: DryRun will perform a `kubectl apply --dry-run` without actually performing the sync type: boolean manifests: - description: Manifests is an optional field that overrides - sync source with a local directory for development + description: Manifests is an optional field that overrides sync source with a local directory for development items: type: string type: array prune: - description: Prune deletes resources that are no longer - tracked in git + description: Prune deletes resources that are no longer tracked in git type: boolean resources: description: Resources describes which resources to sync items: - description: SyncOperationResource contains resources - to sync. + description: SyncOperationResource contains resources to sync. properties: group: type: string @@ -1030,29 +960,24 @@ spec: type: object type: array revision: - description: Revision is the revision in which to sync the - application to. If omitted, will use the revision specified - in app spec. + description: Revision is the revision in which to sync the application to. If omitted, will use the revision specified in app spec. type: string source: - description: Source overrides the source definition set - in the application. This is typically set in a Rollback - operation and nil during a Sync operation + description: Source overrides the source definition set in the application. This is typically set in a Rollback operation and nil during a Sync operation properties: chart: description: Chart is a Helm chart name type: string directory: - description: Directory holds path/directory specific - options + description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet - specific options + description: ApplicationSourceJsonnet holds jsonnet specific options properties: extVars: - description: ExtVars is a list of Jsonnet External - Variables + description: ExtVars is a list of Jsonnet External Variables items: description: JsonnetVar is a jsonnet variable properties: @@ -1073,8 +998,7 @@ spec: type: string type: array tlas: - description: TLAS is a list of Jsonnet Top-level - Arguments + description: TLAS is a list of Jsonnet Top-level Arguments items: description: JsonnetVar is a jsonnet variable properties: @@ -1097,72 +1021,59 @@ spec: description: Helm holds helm specific options properties: fileParameters: - description: FileParameters are file parameters - to the helm template + description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter - to a helm template + description: HelmFileParameter is a file parameter to a helm template properties: name: - description: Name is the name of the helm - parameter + description: Name is the name of the helm parameter type: string path: - description: Path is the path value for the - helm parameter + description: Path is the path value for the helm parameter type: string type: object type: array parameters: - description: Parameters are parameters to the helm - template + description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a - helm template + description: HelmParameter is a parameter to a helm template properties: forceString: - description: ForceString determines whether - to tell Helm to interpret booleans and numbers - as strings + description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: - description: Name is the name of the helm - parameter + description: Name is the name of the helm parameter type: string value: - description: Value is the value for the helm - parameter + description: Value is the value for the helm parameter type: string type: object type: array releaseName: - description: The Helm release name. If omitted it - will use the application name + description: The Helm release name. If omitted it will use the application name type: string valueFiles: - description: ValuesFiles is a list of Helm value - files to use when generating a template + description: ValuesFiles is a list of Helm value files to use when generating a template items: type: string type: array values: - description: Values is Helm values, typically defined - as a block + description: Values is Helm values, typically defined as a block + type: string + version: + description: Version is the Helm version to use for templating with type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options properties: environment: - description: Environment is a ksonnet application - environment name + description: Environment is a ksonnet application environment name type: string parameters: - description: Parameters are a list of ksonnet component - parameter override values + description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter + description: KsonnetParameter is a ksonnet component parameter properties: component: type: string @@ -1179,11 +1090,15 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize - commonLabels + description: CommonLabels adds additional kustomize commonLabels type: object images: description: Images are kustomize image overrides @@ -1191,25 +1106,20 @@ spec: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to - resources for kustomize apps + description: NamePrefix is a prefix appended to resources for kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to - resources for kustomize apps + description: NameSuffix is a suffix appended to resources for kustomize apps type: string version: - description: Version contains optional Kustomize - version + description: Version contains optional Kustomize version type: string type: object path: - description: Path is a directory path within the Git - repository + description: Path is a directory path within the Git repository type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: ConfigManagementPlugin holds config management plugin specific options properties: env: items: @@ -1229,20 +1139,16 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application - manifests + description: RepoURL is the repository URL of the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, - or branch in which to sync the application to. If - omitted, will sync to HEAD + description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD type: string required: - repoURL type: object syncOptions: - description: SyncOptions provide per-sync sync-options, - e.g. Validate=false + description: SyncOptions provide per-sync sync-options, e.g. Validate=false items: type: string type: array @@ -1250,27 +1156,17 @@ spec: description: SyncStrategy describes how to perform the sync properties: apply: - description: Apply wil perform a `kubectl apply` to - perform the sync. + description: Apply will perform a `kubectl apply` to perform the sync. properties: force: - description: Force indicates whether or not to supply - the --force flag to `kubectl apply`. The --force - flag deletes and re-create the resource, when - PATCH encounters conflict and has retried for - 5 times. + description: Force indicates whether or not to supply the --force flag to `kubectl apply`. The --force flag deletes and re-create the resource, when PATCH encounters conflict and has retried for 5 times. type: boolean type: object hook: - description: Hook will submit any referenced resources - to perform the sync. This is the default strategy + description: Hook will submit any referenced resources to perform the sync. This is the default strategy properties: force: - description: Force indicates whether or not to supply - the --force flag to `kubectl apply`. The --force - flag deletes and re-create the resource, when - PATCH encounters conflict and has retried for - 5 times. + description: Force indicates whether or not to supply the --force flag to `kubectl apply`. The --force flag deletes and re-create the resource, when PATCH encounters conflict and has retried for 5 times. type: boolean type: object type: object @@ -1291,22 +1187,17 @@ spec: description: SyncResult is the result of a Sync operation properties: resources: - description: Resources holds the sync result of each individual - resource + description: Resources holds the sync result of each individual resource items: - description: ResourceResult holds the operation result details - of a specific resource + description: ResourceResult holds the operation result details of a specific resource properties: group: type: string hookPhase: - description: 'the state of any operation associated with - this resource OR hook note: can contain values for non-hook - resources' + description: 'the state of any operation associated with this resource OR hook note: can contain values for non-hook resources' type: string hookType: - description: the type of the hook, empty for non-hook - resources + description: the type of the hook, empty for non-hook resources type: string kind: type: string @@ -1318,13 +1209,10 @@ spec: namespace: type: string status: - description: the final result of the sync, this is be - empty if the resources is yet to be applied/pruned and - is always zero-value for hooks + description: the final result of the sync, this is be empty if the resources is yet to be applied/pruned and is always zero-value for hooks type: string syncPhase: - description: indicates the particular phase of the sync - that this is for + description: indicates the particular phase of the sync that this is for type: string version: type: string @@ -1340,8 +1228,7 @@ spec: description: Revision holds the revision of the sync type: string source: - description: Source records the application source information - of the sync, used for comparing auto-sync + description: Source records the application source information of the sync, used for comparing auto-sync properties: chart: description: Chart is a Helm chart name @@ -1349,13 +1236,13 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet - specific options + description: ApplicationSourceJsonnet holds jsonnet specific options properties: extVars: - description: ExtVars is a list of Jsonnet External - Variables + description: ExtVars is a list of Jsonnet External Variables items: description: JsonnetVar is a jsonnet variable properties: @@ -1376,8 +1263,7 @@ spec: type: string type: array tlas: - description: TLAS is a list of Jsonnet Top-level - Arguments + description: TLAS is a list of Jsonnet Top-level Arguments items: description: JsonnetVar is a jsonnet variable properties: @@ -1400,31 +1286,25 @@ spec: description: Helm holds helm specific options properties: fileParameters: - description: FileParameters are file parameters to the - helm template + description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter - to a helm template + description: HelmFileParameter is a file parameter to a helm template properties: name: description: Name is the name of the helm parameter type: string path: - description: Path is the path value for the helm - parameter + description: Path is the path value for the helm parameter type: string type: object type: array parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm - template + description: HelmParameter is a parameter to a helm template properties: forceString: - description: ForceString determines whether to - tell Helm to interpret booleans and numbers - as strings + description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: description: Name is the name of the helm parameter @@ -1435,33 +1315,30 @@ spec: type: object type: array releaseName: - description: The Helm release name. If omitted it will - use the application name + description: The Helm release name. If omitted it will use the application name type: string valueFiles: - description: ValuesFiles is a list of Helm value files - to use when generating a template + description: ValuesFiles is a list of Helm value files to use when generating a template items: type: string type: array values: - description: Values is Helm values, typically defined - as a block + description: Values is Helm values, typically defined as a block + type: string + version: + description: Version is the Helm version to use for templating with type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options properties: environment: - description: Environment is a ksonnet application environment - name + description: Environment is a ksonnet application environment name type: string parameters: - description: Parameters are a list of ksonnet component - parameter override values + description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter + description: KsonnetParameter is a ksonnet component parameter properties: component: type: string @@ -1478,11 +1355,15 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize - commonLabels + description: CommonLabels adds additional kustomize commonLabels type: object images: description: Images are kustomize image overrides @@ -1490,12 +1371,10 @@ spec: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources - for kustomize apps + description: NamePrefix is a prefix appended to resources for kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for kustomize apps + description: NameSuffix is a suffix appended to resources for kustomize apps type: string version: description: Version contains optional Kustomize version @@ -1505,8 +1384,7 @@ spec: description: Path is a directory path within the Git repository type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: ConfigManagementPlugin holds config management plugin specific options properties: env: items: @@ -1526,13 +1404,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application - manifests + description: RepoURL is the repository URL of the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or - branch in which to sync the application to. If omitted, - will sync to HEAD + description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD type: string required: - repoURL @@ -1546,14 +1421,12 @@ spec: - startedAt type: object reconciledAt: - description: ReconciledAt indicates when the application state was reconciled - using the latest git version + description: ReconciledAt indicates when the application state was reconciled using the latest git version format: date-time type: string resources: items: - description: ResourceStatus holds the current sync and health status - of a resource + description: ResourceStatus holds the current sync and health status of a resource properties: group: type: string @@ -1576,8 +1449,7 @@ spec: requiresPruning: type: boolean status: - description: SyncStatusCode is a type which represents possible - comparison results + description: SyncStatusCode is a type which represents possible comparison results type: string version: type: string @@ -1588,8 +1460,7 @@ spec: summary: properties: externalURLs: - description: ExternalURLs holds all external URLs of application - child resources. + description: ExternalURLs holds all external URLs of application child resources. items: type: string type: array @@ -1600,34 +1471,26 @@ spec: type: array type: object sync: - description: SyncStatus is a comparison result of application spec and - deployed application. + description: SyncStatus is a comparison result of application spec and deployed application. properties: comparedTo: - description: ComparedTo contains application source and target which - was used for resources comparison + description: ComparedTo contains application source and target which was used for resources comparison properties: destination: - description: ApplicationDestination contains deployment destination - information + description: ApplicationDestination contains deployment destination information properties: 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 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 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: object source: - description: ApplicationSource contains information about github - repository, path within repository and target application - environment. + description: ApplicationSource contains information about github repository, path within repository and target application environment. properties: chart: description: Chart is a Helm chart name @@ -1635,13 +1498,13 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: - description: ApplicationSourceJsonnet holds jsonnet - specific options + description: ApplicationSourceJsonnet holds jsonnet specific options properties: extVars: - description: ExtVars is a list of Jsonnet External - Variables + description: ExtVars is a list of Jsonnet External Variables items: description: JsonnetVar is a jsonnet variable properties: @@ -1662,8 +1525,7 @@ spec: type: string type: array tlas: - description: TLAS is a list of Jsonnet Top-level - Arguments + description: TLAS is a list of Jsonnet Top-level Arguments items: description: JsonnetVar is a jsonnet variable properties: @@ -1686,31 +1548,25 @@ spec: description: Helm holds helm specific options properties: fileParameters: - description: FileParameters are file parameters to the - helm template + description: FileParameters are file parameters to the helm template items: - description: HelmFileParameter is a file parameter - to a helm template + description: HelmFileParameter is a file parameter to a helm template properties: name: description: Name is the name of the helm parameter type: string path: - description: Path is the path value for the helm - parameter + description: Path is the path value for the helm parameter type: string type: object type: array parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm - template + description: HelmParameter is a parameter to a helm template properties: forceString: - description: ForceString determines whether to - tell Helm to interpret booleans and numbers - as strings + description: ForceString determines whether to tell Helm to interpret booleans and numbers as strings type: boolean name: description: Name is the name of the helm parameter @@ -1721,33 +1577,30 @@ spec: type: object type: array releaseName: - description: The Helm release name. If omitted it will - use the application name + description: The Helm release name. If omitted it will use the application name type: string valueFiles: - description: ValuesFiles is a list of Helm value files - to use when generating a template + description: ValuesFiles is a list of Helm value files to use when generating a template items: type: string type: array values: - description: Values is Helm values, typically defined - as a block + description: Values is Helm values, typically defined as a block + type: string + version: + description: Version is the Helm version to use for templating with type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options properties: environment: - description: Environment is a ksonnet application environment - name + description: Environment is a ksonnet application environment name type: string parameters: - description: Parameters are a list of ksonnet component - parameter override values + description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter + description: KsonnetParameter is a ksonnet component parameter properties: component: type: string @@ -1764,11 +1617,15 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string - description: CommonLabels adds additional kustomize - commonLabels + description: CommonLabels adds additional kustomize commonLabels type: object images: description: Images are kustomize image overrides @@ -1776,12 +1633,10 @@ spec: type: string type: array namePrefix: - description: NamePrefix is a prefix appended to resources - for kustomize apps + description: NamePrefix is a prefix appended to resources for kustomize apps type: string nameSuffix: - description: NameSuffix is a suffix appended to resources - for kustomize apps + description: NameSuffix is a suffix appended to resources for kustomize apps type: string version: description: Version contains optional Kustomize version @@ -1791,8 +1646,7 @@ spec: description: Path is a directory path within the Git repository type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: ConfigManagementPlugin holds config management plugin specific options properties: env: items: @@ -1812,13 +1666,10 @@ spec: type: string type: object repoURL: - description: RepoURL is the repository URL of the application - manifests + description: RepoURL is the repository URL of the application manifests type: string targetRevision: - description: TargetRevision defines the commit, tag, or - branch in which to sync the application to. If omitted, - will sync to HEAD + description: TargetRevision defines the commit, tag, or branch in which to sync the application to. If omitted, will sync to HEAD type: string required: - repoURL @@ -1830,8 +1681,7 @@ spec: revision: type: string status: - description: SyncStatusCode is a type which represents possible - comparison results + description: SyncStatusCode is a type which represents possible comparison results type: string required: - status @@ -1867,21 +1717,13 @@ spec: scope: Namespaced validation: 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: 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 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 metadata: type: object @@ -1889,12 +1731,9 @@ spec: description: AppProjectSpec is the specification of an AppProject properties: clusterResourceBlacklist: - description: ClusterResourceBlacklist contains list of blacklisted cluster - level resources + description: ClusterResourceBlacklist contains list of blacklisted 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 + 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: group: type: string @@ -1906,12 +1745,9 @@ spec: type: object type: array clusterResourceWhitelist: - description: ClusterResourceWhitelist contains list of whitelisted cluster - level resources + 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 + 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: group: type: string @@ -1926,33 +1762,25 @@ spec: description: Description contains optional project description type: string destinations: - description: Destinations contains list of destinations available for - deployment + description: Destinations contains list of destinations available for deployment items: - description: ApplicationDestination contains deployment destination - information + description: ApplicationDestination contains deployment destination information properties: 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 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 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: object type: array namespaceResourceBlacklist: - description: NamespaceResourceBlacklist contains list of blacklisted - namespace level resources + description: NamespaceResourceBlacklist contains list of blacklisted namespace 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 + 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: group: type: string @@ -1964,12 +1792,9 @@ spec: type: object type: array namespaceResourceWhitelist: - description: NamespaceResourceWhitelist contains list of whitelisted - namespace level resources + description: NamespaceResourceWhitelist contains list of whitelisted namespace 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 + 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: group: type: string @@ -1981,8 +1806,7 @@ spec: type: object type: array 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: ignore: items: @@ -1996,13 +1820,11 @@ spec: type: object type: array 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: object roles: - description: Roles are user defined RBAC roles associated with this - project + description: Roles are user defined RBAC roles associated with this project items: description: ProjectRole represents a role that has access to a project properties: @@ -2010,17 +1832,14 @@ spec: description: Description is a description of the role type: string 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: type: string type: array 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: - description: JWTToken holds the issuedAt and expiresAt values - of a token + description: JWTToken holds the issuedAt and expiresAt values of a token properties: exp: format: int64 @@ -2038,8 +1857,7 @@ spec: description: Name is a name for this role type: string 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: type: string type: array @@ -2048,11 +1866,9 @@ spec: type: object type: array 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: - 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: keyID: description: The ID of the key in hexadecimal notation @@ -2062,50 +1878,41 @@ spec: type: object type: array 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: type: string type: array 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: - 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: 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: type: string type: array 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: type: string type: array 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 kind: description: Kind defines if the window allows or blocks syncs type: string 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 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: type: string type: array 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: object type: array @@ -2140,6 +1947,15 @@ metadata: --- apiVersion: v1 kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: redis + app.kubernetes.io/name: argocd-redis + app.kubernetes.io/part-of: argocd + name: argocd-redis +--- +apiVersion: v1 +kind: ServiceAccount metadata: labels: app.kubernetes.io/component: server @@ -2207,6 +2023,24 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role +metadata: + labels: + app.kubernetes.io/component: redis + app.kubernetes.io/name: argocd-redis + app.kubernetes.io/part-of: argocd + name: argocd-redis +rules: +- apiGroups: + - security.openshift.io + resourceNames: + - nonroot + resources: + - securitycontextconstraints + verbs: + - use +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role metadata: labels: app.kubernetes.io/component: server @@ -2333,6 +2167,22 @@ subjects: --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding +metadata: + labels: + app.kubernetes.io/component: redis + app.kubernetes.io/name: argocd-redis + app.kubernetes.io/part-of: argocd + name: argocd-redis +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: argocd-redis +subjects: +- kind: ServiceAccount + name: argocd-redis +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding metadata: labels: app.kubernetes.io/component: server @@ -2521,23 +2371,6 @@ spec: --- apiVersion: v1 kind: Service -metadata: - labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: argocd-server-metrics - app.kubernetes.io/part-of: argocd - name: argocd-server-metrics -spec: - ports: - - name: metrics - port: 8083 - protocol: TCP - targetPort: 8083 - selector: - app.kubernetes.io/name: argocd-server ---- -apiVersion: v1 -kind: Service metadata: labels: app.kubernetes.io/component: server @@ -2557,50 +2390,22 @@ spec: selector: app.kubernetes.io/name: argocd-server --- -apiVersion: apps/v1 -kind: Deployment +apiVersion: v1 +kind: Service metadata: labels: - app.kubernetes.io/component: application-controller - app.kubernetes.io/name: argocd-application-controller + app.kubernetes.io/component: server + app.kubernetes.io/name: argocd-server-metrics app.kubernetes.io/part-of: argocd - name: argocd-application-controller + name: argocd-server-metrics spec: + ports: + - name: metrics + port: 8083 + protocol: TCP + targetPort: 8083 selector: - matchLabels: - app.kubernetes.io/name: argocd-application-controller - strategy: - type: Recreate - template: - metadata: - labels: - app.kubernetes.io/name: argocd-application-controller - spec: - containers: - - command: - - argocd-application-controller - - --status-processors - - "20" - - --operation-processors - - "10" - image: argoproj/argocd:v1.8.1 - imagePullPolicy: Always - livenessProbe: - httpGet: - path: /healthz - port: 8082 - initialDelaySeconds: 5 - periodSeconds: 10 - name: argocd-application-controller - ports: - - containerPort: 8082 - readinessProbe: - httpGet: - path: /healthz - port: 8082 - initialDelaySeconds: 5 - periodSeconds: 10 - serviceAccountName: argocd-application-controller + app.kubernetes.io/name: argocd-server --- apiVersion: apps/v1 kind: Deployment @@ -2619,11 +2424,20 @@ spec: labels: app.kubernetes.io/name: argocd-dex-server spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/part-of: argocd + topologyKey: kubernetes.io/hostname + weight: 5 containers: - command: - /shared/argocd-util - rundex - image: quay.io/dexidp/dex:v2.22.0 + image: quay.io/dexidp/dex:v2.25.0 imagePullPolicy: Always name: dex ports: @@ -2667,13 +2481,28 @@ spec: labels: app.kubernetes.io/name: argocd-redis spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/name: argocd-redis + topologyKey: kubernetes.io/hostname + weight: 100 + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/part-of: argocd + topologyKey: kubernetes.io/hostname + weight: 5 containers: - args: - --save - "" - --appendonly - "no" - image: redis:5.0.8 + image: redis:5.0.10-alpine imagePullPolicy: Always name: redis ports: @@ -2683,6 +2512,7 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + serviceAccountName: argocd-redis --- apiVersion: apps/v1 kind: Deployment @@ -2701,6 +2531,21 @@ spec: labels: app.kubernetes.io/name: argocd-repo-server spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/name: argocd-repo-server + topologyKey: kubernetes.io/hostname + weight: 100 + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/part-of: argocd + topologyKey: kubernetes.io/hostname + weight: 5 automountServiceAccountToken: false containers: - command: @@ -2758,6 +2603,21 @@ spec: labels: app.kubernetes.io/name: argocd-server spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/name: argocd-server + topologyKey: kubernetes.io/hostname + weight: 100 + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/part-of: argocd + topologyKey: kubernetes.io/hostname + weight: 5 containers: - command: - argocd-server @@ -2790,3 +2650,63 @@ spec: - configMap: name: argocd-tls-certs-cm name: tls-certs +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + labels: + app.kubernetes.io/component: application-controller + app.kubernetes.io/name: argocd-application-controller + app.kubernetes.io/part-of: argocd + name: argocd-application-controller +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: argocd-application-controller + serviceName: argocd-application-controller + template: + metadata: + labels: + app.kubernetes.io/name: argocd-application-controller + spec: + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/name: argocd-application-controller + topologyKey: kubernetes.io/hostname + weight: 100 + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/part-of: argocd + topologyKey: kubernetes.io/hostname + weight: 5 + containers: + - command: + - argocd-application-controller + - --status-processors + - "20" + - --operation-processors + - "10" + image: argoproj/argocd:v1.8.1 + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 8082 + initialDelaySeconds: 5 + periodSeconds: 10 + name: argocd-application-controller + ports: + - containerPort: 8082 + readinessProbe: + httpGet: + path: /healthz + port: 8082 + initialDelaySeconds: 5 + periodSeconds: 10 + serviceAccountName: argocd-application-controller