Merge branch 'master' into crd-gen

Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	go.mod
#	go.sum
This commit is contained in:
runzexia
2019-07-31 11:31:41 +08:00
221 changed files with 16630 additions and 39 deletions

1
.gitignore vendored
View File

@@ -26,3 +26,4 @@ apiserver.local.config
# OSX trash
.DS_Store
api.json
*.coverprofile