runzexia d8259160b8 Merge branch 'dev' into devops-refactor ...

# Conflicts:
#	Makefile
#	api/api-rules/violation_exceptions.list
#	api/openapi-spec/swagger.json
#	cmd/controller-manager/app/controllers.go
#	hack/generate_client.sh
#	pkg/apis/cluster/v1alpha1/openapi_generated.go
#	pkg/client/informers/externalversions/generic.go
#	pkg/kapis/tenant/v1alpha2/register.go
#	pkg/models/tenant/devops.go
#	pkg/models/tenant/workspaces.go
#	pkg/simple/client/devops/fake/fakedevops.go
#	tools/cmd/crd-doc-gen/main.go

2020-04-15 11:33:05 +08:00

..

controller-manager

Merge branch 'dev' into devops-refactor

2020-04-15 11:33:05 +08:00

hypersphere

update

2020-03-20 02:16:11 +08:00

ks-apiserver

clean old devops code

2020-04-15 11:03:08 +08:00

ks-network

✨suppor k8s node etcd

2019-09-02 16:54:34 +08:00