add cluster api group (#1992)

Makefile

@@ -83,6 +83,7 @@ openapi:
 	go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/servicemesh/v1alpha2 -p kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
 	go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/api/networking/v1,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/util/intstr,./pkg/apis/network/v1alpha1 -p kubesphere.io/kubesphere/pkg/apis/network/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
 	go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
+	go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/cluster/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
 	go run ./tools/cmd/crd-doc-gen/main.go
 # Build the docker image
 docker-build: all

api/api-rules/violation_exceptions.list

@@ -141,27 +141,10 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,UpdateOptions,DryRun
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,ContainerConfig,Env
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,ContainerInfo,BuildVolumes
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,ContainerInfo,RuntimeArtifacts
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,Parameter,OptValues
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iAutoScale,Containers
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBinaryList,Items
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBuildResult,ImageRepoTags
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBuilderList,Items
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBuilderTemplateList,Items
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBuilderTemplateSpec,ContainerInfo
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBuilderTemplateSpec,Parameters
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,AddHost
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,BuildVolumes
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,DropCapabilities
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,Environment
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,Injections
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,NodeAffinityValues
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,RuntimeArtifacts
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,SecurityOpt
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iRunList,Items
-API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,UserDefineTemplate,Parameters
+API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,AgentList,Items
+API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,AgentStatus,Conditions
+API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,AgentStatus,KubeConfig
+API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,ClusterList,Items
 API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI
 API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState
 API rule violation: names_match,k8s.io/api/core/v1,DaemonEndpoint,Port
@@ -198,13 +181,6 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
 API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
 API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
 API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,ContainerConfig,Env
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,ContainerConfig,Labels
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,DockerConfig,Endpoint
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBinarySpec,MD5
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBuilderTemplateSpec,Parameters
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,CGroupLimits
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,CallbackURL
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,ImageScriptsURL
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,ScriptsURL
-API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iConfig,SourceURL
+API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,AgentSpec,KubeSphereAPIServerPort
+API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,AgentSpec,Paused
+API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1,AgentStatus,KubeConfig

config/crd/bases/cluster.kubesphere.io_agents.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: agents.cluster.kubesphere.io
+spec:
+  group: cluster.kubesphere.io
+  names:
+    kind: Agent
+    listKind: AgentList
+    plural: agents
+    singular: agent
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: Agent is the Schema for the agents API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: AgentSpec defines the desired state of Agent
+          properties:
+            kubernetesAPIServerPort:
+              description: KubeAPIServerPort is the port which listens for forwarding
+                kube-apiserver traffic
+              type: integer
+            kubesphereAPIServerPort:
+              description: KubeSphereAPIServerPort is the port which listens for forwarding
+                kubesphere apigateway traffic
+              type: integer
+            paused:
+              description: Indicates that the agent is paused.
+              type: boolean
+            proxy:
+              description: Proxy address
+              type: string
+            token:
+              description: Token used by agents to connect to proxy.
+              type: string
+          type: object
+        status:
+          description: AgentStatus defines the observed state of Agent
+          properties:
+            conditions:
+              description: Represents the latest available observations of a agent's
+                current state.
+              items:
+                properties:
+                  lastTransitionTime:
+                    description: Last time the condition transitioned from one status
+                      to another.
+                    format: date-time
+                    type: string
+                  lastUpdateTime:
+                    description: The last time this condition was updated.
+                    format: date-time
+                    type: string
+                  message:
+                    description: A human readable message indicating details about
+                      the transition.
+                    type: string
+                  reason:
+                    description: The reason for the condition's last transition.
+                    type: string
+                  status:
+                    description: Status of the condition, one of True, False, Unknown.
+                    type: string
+                  type:
+                    description: Type of AgentCondition
+                    type: string
+                required:
+                - status
+                type: object
+              type: array
+            kubeconfig:
+              description: Issued new kubeconfig by proxy server
+              format: byte
+              type: string
+            ping:
+              description: Represents the connection quality, in ms
+              format: int64
+              type: integer
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/cluster.kubesphere.io_clusters.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: clusters.cluster.kubesphere.io
+spec:
+  group: cluster.kubesphere.io
+  names:
+    kind: Cluster
+    listKind: ClusterList
+    plural: clusters
+    singular: cluster
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: Cluster is the schema for the clusters API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            active:
+              description: Desired state of the cluster
+              type: boolean
+            federated:
+              description: Join cluster as kubefed cluster
+              type: boolean
+          type: object
+        status:
+          properties:
+            lastTransitionTime:
+              description: Last time the condition transitioned from one status to
+                another.
+              format: date-time
+              type: string
+            lastUpdateTime:
+              description: The last time this condition was updated.
+              format: date-time
+              type: string
+            message:
+              description: A human readable message indicating details about the transition.
+              type: string
+            reason:
+              description: The reason for the condition's last transition.
+              type: string
+            status:
+              description: Status of the condition, one of True, False, Unknown.
+              type: string
+            type:
+              description: Type of the condition
+              type: string
+          required:
+          - status
+          - type
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/devops.kubesphere.io_s2ibinaries.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: s2ibinaries.devops.kubesphere.io
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.fileName
+    name: FileName
+    type: string
+  - JSONPath: .spec.md5
+    name: MD5
+    type: string
+  - JSONPath: .spec.size
+    name: Size
+    type: string
+  - JSONPath: .status.phase
+    name: Phase
+    type: string
+  group: devops.kubesphere.io
+  names:
+    kind: S2iBinary
+    listKind: S2iBinaryList
+    plural: s2ibinaries
+    singular: s2ibinary
+  scope: Namespaced
+  subresources: {}
+  validation:
+    openAPIV3Schema:
+      description: S2iBinary is the Schema for the s2ibinaries API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: S2iBinarySpec defines the desired state of S2iBinary
+          properties:
+            downloadURL:
+              description: DownloadURL in KubeSphere
+              type: string
+            fileName:
+              description: FileName is filename of binary
+              type: string
+            md5:
+              description: MD5 is Binary's MD5 Hash
+              type: string
+            size:
+              description: Size is the file size of file
+              type: string
+            uploadTimeStamp:
+              description: UploadTime is last upload time
+              format: date-time
+              type: string
+          type: object
+        status:
+          description: S2iBinaryStatus defines the observed state of S2iBinary
+          properties:
+            phase:
+              description: Phase is status of S2iBinary . Possible value is "Ready","UnableToDownload"
+              type: string
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/devops.kubesphere.io_s2ibuildertemplates.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: s2ibuildertemplates.devops.kubesphere.io
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.codeFramework
+    name: Framework
+    type: string
+  - JSONPath: .spec.defaultBaseImage
+    name: DefaultBaseImage
+    type: string
+  - JSONPath: .spec.version
+    name: Version
+    type: string
+  group: devops.kubesphere.io
+  names:
+    categories:
+    - devops
+    kind: S2iBuilderTemplate
+    listKind: S2iBuilderTemplateList
+    plural: s2ibuildertemplates
+    shortNames:
+    - s2ibt
+    singular: s2ibuildertemplate
+  scope: Cluster
+  subresources: {}
+  validation:
+    openAPIV3Schema:
+      description: S2iBuilderTemplate is the Schema for the s2ibuildertemplates API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: S2iBuilderTemplateSpec defines the desired state of S2iBuilderTemplate
+          properties:
+            codeFramework:
+              description: CodeFramework means which language this template is designed
+                for and which framework is using if has framework. Like Java, NodeJS
+                etc
+              type: string
+            containerInfo:
+              description: Images are the images this template will use.
+              items:
+                properties:
+                  buildVolumes:
+                    description: BuildVolumes specifies a list of volumes to mount
+                      to container running the build.
+                    items:
+                      type: string
+                    type: array
+                  builderImage:
+                    description: BaseImage are the images this template will use.
+                    type: string
+                  runtimeArtifacts:
+                    items:
+                      description: VolumeSpec represents a single volume mount point.
+                      properties:
+                        destination:
+                          description: Destination is the path to mount the volume
+                            to - absolute or relative.
+                          type: string
+                        keep:
+                          description: Keep indicates if the mounted data should be
+                            kept in the final image.
+                          type: boolean
+                        source:
+                          description: Source is a reference to the volume source.
+                          type: string
+                      type: object
+                    type: array
+                  runtimeImage:
+                    type: string
+                type: object
+              type: array
+            defaultBaseImage:
+              description: DefaultBaseImage is the image that will be used by default
+              type: string
+            description:
+              description: Description illustrate the purpose of this template
+              type: string
+            environment:
+              description: Parameters is a set of environment variables to be passed
+                to the image.
+              items:
+                properties:
+                  defaultValue:
+                    type: string
+                  description:
+                    type: string
+                  key:
+                    type: string
+                  optValues:
+                    items:
+                      type: string
+                    type: array
+                  required:
+                    type: boolean
+                  type:
+                    type: string
+                  value:
+                    type: string
+                type: object
+              type: array
+            iconPath:
+              description: IconPath is used for frontend display
+              type: string
+            version:
+              description: Version of template
+              type: string
+          type: object
+        status:
+          description: S2iBuilderTemplateStatus defines the observed state of S2iBuilderTemplate
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/devops.kubesphere.io_s2iruns.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: s2iruns.devops.kubesphere.io
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.runState
+    name: State
+    type: string
+  - JSONPath: .status.kubernetesJobName
+    name: K8sJobName
+    type: string
+  - JSONPath: .status.startTime
+    name: StartTime
+    type: date
+  - JSONPath: .status.completionTime
+    name: CompletionTime
+    type: date
+  - JSONPath: .status.s2iBuildResult.imageName
+    name: ImageName
+    type: string
+  group: devops.kubesphere.io
+  names:
+    kind: S2iRun
+    listKind: S2iRunList
+    plural: s2iruns
+    shortNames:
+    - s2ir
+    singular: s2irun
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: S2iRun is the Schema for the s2iruns API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: S2iRunSpec defines the desired state of S2iRun
+          properties:
+            backoffLimit:
+              description: BackoffLimit limits the restart count of each s2irun. Default
+                is 0
+              format: int32
+              type: integer
+            builderName:
+              description: BuilderName specify the name of s2ibuilder, required
+              type: string
+            newRevisionId:
+              description: NewRevisionId override the default NewRevisionId in its
+                s2ibuilder.
+              type: string
+            newSourceURL:
+              description: NewSourceURL is used to download new binary artifacts
+              type: string
+            newTag:
+              description: NewTag override the default tag in its s2ibuilder, image
+                name cannot be changed.
+              type: string
+            secondsAfterFinished:
+              description: SecondsAfterFinished if is set and greater than zero, and
+                the job created by s2irun become successful or failed , the job will
+                be auto deleted after SecondsAfterFinished
+              format: int32
+              type: integer
+          required:
+          - builderName
+          type: object
+        status:
+          description: S2iRunStatus defines the observed state of S2iRun
+          properties:
+            completionTime:
+              description: Represents time when the job was completed. It is not guaranteed
+                to be set in happens-before order across separate operations. It is
+                represented in RFC3339 form and is in UTC.
+              format: date-time
+              type: string
+            kubernetesJobName:
+              description: KubernetesJobName is the job name in k8s
+              type: string
+            logURL:
+              description: LogURL is uesd for external log handler to let user know
+                where is log located in
+              type: string
+            runState:
+              description: RunState  indicates whether this job is done or failed
+              type: string
+            s2iBuildResult:
+              description: S2i build result info.
+              properties:
+                commandPull:
+                  description: Command for pull image.
+                  type: string
+                imageCreated:
+                  description: Image created time.
+                  type: string
+                imageID:
+                  description: Image ID.
+                  type: string
+                imageName:
+                  description: ImageName is the name of artifact
+                  type: string
+                imageRepoTags:
+                  description: image tags.
+                  items:
+                    type: string
+                  type: array
+                imageSize:
+                  description: The size in bytes of the image
+                  format: int64
+                  type: integer
+              type: object
+            s2iBuildSource:
+              description: S2i build source info.
+              properties:
+                binaryName:
+                  description: Binary file Name
+                  type: string
+                binarySize:
+                  description: Binary file Size
+                  format: int64
+                  type: integer
+                builderImage:
+                  description: // BuilderImage describes which image is used for building
+                    the result images.
+                  type: string
+                commitID:
+                  description: CommitID represents an arbitrary extended object reference
+                    in Git as SHA-1
+                  type: string
+                committerEmail:
+                  description: CommitterEmail contains the e-mail of the committer
+                  type: string
+                committerName:
+                  description: CommitterName contains the name of the committer
+                  type: string
+                description:
+                  description: Description is a result image description label. The
+                    default is no description.
+                  type: string
+                revisionId:
+                  description: The RevisionId is a branch name or a SHA-1 hash of
+                    every important thing about the commit
+                  type: string
+                sourceUrl:
+                  description: SourceURL is  url of the codes such as https://github.com/a/b.git
+                  type: string
+              type: object
+            startTime:
+              description: StartTime represent when this run began
+              format: date-time
+              type: string
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/iam.kubesphere.io_users.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: users.iam.kubesphere.io
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.email
+    name: Email
+    type: string
+  - JSONPath: .status.state
+    name: Status
+    type: string
+  group: iam.kubesphere.io
+  names:
+    categories:
+    - iam
+    kind: User
+    listKind: UserList
+    plural: users
+    singular: user
+  scope: Cluster
+  subresources: {}
+  validation:
+    openAPIV3Schema:
+      description: User is the Schema for the users API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: UserSpec defines the desired state of User
+          properties:
+            description:
+              description: Description of the user.
+              type: string
+            displayName:
+              type: string
+            email:
+              description: Unique email address.
+              type: string
+            finalizers:
+              description: Finalizers is an opaque list of values that must be empty
+                to permanently remove object from storage.
+              items:
+                type: string
+              type: array
+            groups:
+              items:
+                type: string
+              type: array
+            lang:
+              description: The preferred written or spoken language for the user.
+              type: string
+            password:
+              type: string
+          required:
+          - email
+          - password
+          type: object
+        status:
+          description: UserStatus defines the observed state of User
+          properties:
+            conditions:
+              description: Represents the latest available observations of a namespace's
+                current state.
+              items:
+                properties:
+                  lastTransitionTime:
+                    format: date-time
+                    type: string
+                  message:
+                    type: string
+                  reason:
+                    type: string
+                  status:
+                    description: Status of the condition, one of True, False, Unknown.
+                    type: string
+                  type:
+                    description: Type of namespace controller condition.
+                    type: string
+                required:
+                - status
+                - type
+                type: object
+              type: array
+            state:
+              description: The user status
+              type: string
+          type: object
+      required:
+      - spec
+      type: object
+  version: v1alpha2
+  versions:
+  - name: v1alpha2
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/tenant.kubesphere.io_workspaces.yaml

+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: (devel)
+  creationTimestamp: null
+  name: workspaces.tenant.kubesphere.io
+spec:
+  group: tenant.kubesphere.io
+  names:
+    kind: Workspace
+    listKind: WorkspaceList
+    plural: workspaces
+    singular: workspace
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: Workspace is the Schema for the workspaces API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: WorkspaceSpec defines the desired state of Workspace
+          properties:
+            manager:
+              type: string
+          type: object
+        status:
+          description: WorkspaceStatus defines the observed state of Workspace
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

hack/generate_client.sh

 #!/bin/bash
 set -e
 
-GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 devops:v1alpha1 iam:v1alpha2 tower:v1alpha1"
+GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 devops:v1alpha1 iam:v1alpha2 cluster:v1alpha1"
 
 rm -rf ./pkg/client
 ./hack/generate_group.sh "client,lister,informer" kubesphere.io/kubesphere/pkg/client kubesphere.io/kubesphere/pkg/apis "$GV" --output-base=./  -h "$PWD/hack/boilerplate.go.txt"

pkg/apis/addtoscheme_tower_v1alpha1.go → pkg/apis/addtoscheme_cluster_v1alpha1.go

 package apis
 
 import (
-	"kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	"kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 )
 
 func init() {

pkg/apis/cluster/group.go

+package cluster

pkg/apis/tower/v1alpha1/agent_types.go → pkg/apis/cluster/v1alpha1/agent_types.go

@@ -20,6 +20,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	ResourceKindAgent      = "Agent"
+	ResourcesSingularAgent = "agent"
+	ResourcesPluralAgent   = "agents"
+)
+
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
@@ -46,7 +52,7 @@ type AgentSpec struct {
 
 	// Indicates that the agent is paused.
 	// +optional
-	Paused bool
+	Paused bool `json:"paused,omitempty"`
 }
 
 type AgentConditionType string
@@ -86,12 +92,13 @@ type AgentStatus struct {
 	Ping uint64 `json:"ping,omitempty"`
 
 	// Issued new kubeconfig by proxy server
-	KubeConfig []byte
+	KubeConfig []byte `json:"kubeconfig,omitempty"`
 }
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:openapi-gen=true
+// +genclient:nonNamespaced
 
 // Agent is the Schema for the agents API
 type Agent struct {

pkg/apis/tower/v1alpha1/doc.go → pkg/apis/cluster/v1alpha1/doc.go

-// Package v1alpha2 contains API Schema definitions for the tower v1alpha1 API group
+// Package v1alpha1 contains API Schema definitions for the tower v1alpha1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=kubesphere.io/tower/pkg/apis/tower
+// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=tower.kubesphere.io
+// +groupName=cluster.kubesphere.io
 
 package v1alpha1

pkg/apis/tower/group.go

-package tower

pkg/apiserver/apiserver.go

@@ -182,7 +182,7 @@ func (s *APIServer) buildHandlerChain() {
 
 	handler := s.Server.Handler
 	handler = filters.WithKubeAPIServer(handler, s.KubernetesClient.Config(), &errorResponder{})
-	handler = filters.WithMultipleClusterDispatcher(handler, dispatch.NewClusterDispatch(s.InformerFactory.KubeSphereSharedInformerFactory().Tower().V1alpha1().Agents().Lister()))
+	handler = filters.WithMultipleClusterDispatcher(handler, dispatch.NewClusterDispatch(s.InformerFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Agents().Lister()))
 
 	excludedPaths := []string{"/oauth/*", "/kapis/config.kubesphere.io/*"}
 	pathAuthorizer, _ := path.NewAuthorizer(excludedPaths)

pkg/controller/cluster/cluster_controller_test.go

+package cluster