fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Generate CRDs 

Signed-off-by: Philip Laine <philip.laine@xenit.se>
This commit is contained in:
Philip Laine 2020-10-28 22:53:49 +01:00
parent 01d0053871
commit c0ee546ce8
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml
View File

@ -88,12 +88,8 @@ spec:
type: string type: string
type: object type: object
timeout: timeout:
<<<<<<< HEAD
description: The timeout for download operations, defaults to 20s.
=======
default: 20s default: 20s
description: The timeout for download operations, default ('20s'). description: The timeout for download operations, defaults to 20s.
>>>>>>> 0948720 (Fix duration default values)
type: string type: string
required: required:
- bucketName - bucketName

12
config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml
View File

@ -63,12 +63,8 @@ spec:
defaults to master branch. defaults to master branch.
properties: properties:
branch: branch:
<<<<<<< HEAD
description: The Git branch to checkout, defaults to master.
=======
default: master default: master
description: The git branch to checkout, defaults to master. description: The Git branch to checkout, defaults to master.
>>>>>>> 0948720 (Fix duration default values)
type: string type: string
commit: commit:
description: The Git commit SHA to checkout, if specified Tag description: The Git commit SHA to checkout, if specified Tag
@ -94,12 +90,8 @@ spec:
type: string type: string
type: object type: object
timeout: timeout:
<<<<<<< HEAD
description: The timeout for remote Git operations like cloning, defaults
=======
default: 20s default: 20s
description: The timeout for remote git operations like cloning, default description: The timeout for remote Git operations like cloning, defaults
>>>>>>> 0948720 (Fix duration default values)
to 20s. to 20s.
type: string type: string
url: url: