Merge branch 'tkestack:master' into master

tkestack · Sep 1, 2021 · b6c78b4 · b6c78b4
2 parents 568ee81 + b7f400c
commit b6c78b4
Show file tree

Hide file tree

Showing 19 changed files with 587 additions and 336 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations under the License.
 
 .PHONY: all
-all: asset lint test build
+all: lint test build
 
 # ==============================================================================
 # Build options
@@ -123,6 +123,7 @@ deploy:
 .PHONY: clean
 clean:
  @$(MAKE) go.clean
+ git restore pkg/platform/registry/clusteraddontype/assets/assets.go
 
 ## lint: Check syntax and styling of go sources.
 .PHONY: lint
@@ -139,7 +140,7 @@ release.build:
 ifeq ($(NEED_BUILD_PROVIDER),true)
  cd build/docker/tools/provider-res && make all
 endif
- make push.multiarch
+ make asset && make push.multiarch
 
 ## release: Release tke
 .PHONY: release

diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go
diff --git a/api/platform/register.go b/api/platform/register.go
@@ -121,6 +121,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 
  &ClusterGroupAPIResourceItems{},
  &ClusterGroupAPIResourceItemsList{},
+ &ClusterGroupAPIResourceOptions{},
  )
  return nil
 }
diff --git a/api/platform/types.go b/api/platform/types.go
@@ -235,7 +235,7 @@ type ContainerRuntimeType = string
 
 const (
  Containerd ContainerRuntimeType = "containerd"
- Docker ContainerRuntimeType = "docker"
+ Docker  ContainerRuntimeType = "docker"
 )
 
 // ClusterPhase defines the phase of cluster constructor.
@@ -1752,3 +1752,10 @@ type ClusterGroupAPIResourceItem struct {
  // categories is a list of the grouped resources this resource belongs to (e.g. 'all')
  Categories []string
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ClusterGroupAPIResourceOptions is the query options.
+type ClusterGroupAPIResourceOptions struct {
+ metav1.TypeMeta
+}