admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into s2ibin-upload

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

# Conflicts:
#	vendor/modules.txt
This commit is contained in:
runzexia
2019-09-02 15:21:38 +08:00
parent 1a513a9aa3 6ba27c5e4d
commit 3156362f6c
23 changed files with 1195 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/modules.txt vendored
View File

@@ -367,7 +367,7 @@ github.com/kubernetes-sigs/application/pkg/resource
github.com/kubernetes-sigs/application/pkg/genericreconciler
github.com/kubernetes-sigs/application/pkg/kbcontroller
github.com/kubernetes-sigs/application/pkg/client/clientset/versioned/scheme
# github.com/kubesphere/s2ioperator v0.0.12
# github.com/kubesphere/s2ioperator v0.0.13
github.com/kubesphere/s2ioperator/pkg/client/clientset/versioned
github.com/kubesphere/s2ioperator/pkg/client/informers/externalversions
github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1