Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 rename ClusterWorkspace to Workspace #2888

Merged
merged 2 commits into from
Mar 14, 2023
Merged

🌱 rename ClusterWorkspace to Workspace #2888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2197e45
rename ClusterWorkspace to Workspace
lionelvillard Mar 13, 2023
3486fcd
run make codegen
lionelvillard Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions config/crds/tenancy.kcp.io_workspacetypes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
additionalProperties:
type: string
description: additionalWorkspaceLabels are a set of labels that will
be added to a ClusterWorkspace on creation.
be added to a Workspace on creation.
type: object
defaultAPIBindings:
description: defaultAPIBindings are the APIs to bind during initialization
Expand Down Expand Up @@ -77,9 +77,9 @@ spec:
name: universal
path: root
description: defaultChildWorkspaceType is the WorkspaceType that will
be used by default if another, nested ClusterWorkspace is created
in a workspace of this type. When this field is unset, the user
must specify a type when creating nested workspaces. Extending another
be used by default if another, nested Workspace is created in a
workspace of this type. When this field is unset, the user must
specify a type when creating nested workspaces. Extending another
WorkspaceType does not inherit its defaultChildWorkspaceType.
properties:
name:
Expand All @@ -101,8 +101,8 @@ spec:
this WorkspaceType will be considered as that other type in evaluation
of limitAllowedChildren and limitAllowedParents constraints. \n
A dependency cycle stop this WorkspaceType from being admitted as
the type of a ClusterWorkspace. \n A non-existing dependency stop
this WorkspaceType from being admitted as the type of a ClusterWorkspace."
the type of a Workspace. \n A non-existing dependency stop this
WorkspaceType from being admitted as the type of a Workspace."
properties:
with:
description: with are WorkspaceTypes whose initializers are added
Expand Down Expand Up @@ -130,13 +130,13 @@ spec:
initializer:
description: "initializer determines if this WorkspaceType has an
associated initializing controller. These controllers are used to
add functionality to a ClusterWorkspace; all controllers must finish
their work before the ClusterWorkspace becomes ready for use. \n
One initializing controller is supported per WorkspaceType; the
identifier for this initializer will be a colon-delimited string
using the workspace in which the WorkspaceType is defined, and the
type's name. For example, if a WorkspaceType `example` is created
in the `root:org` workspace, the implicit initializer name is `root:org:Example`."
add functionality to a Workspace; all controllers must finish their
work before the Workspace becomes ready for use. \n One initializing
controller is supported per WorkspaceType; the identifier for this
initializer will be a colon-delimited string using the workspace
in which the WorkspaceType is defined, and the type's name. For
example, if a WorkspaceType `example` is created in the `root:org`
workspace, the implicit initializer name is `root:org:Example`."
type: boolean
limitAllowedChildren:
description: limitAllowedChildren specifies constraints for sub-workspaces
Expand Down
2 changes: 1 addition & 1 deletion config/root-phase0/apiexport-tenancy.kcp.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
spec:
latestResourceSchemas:
- v221219-c92ed8152.clusterworkspaces.tenancy.kcp.io
- v230110-89146c99.workspacetypes.tenancy.kcp.io
- v230116-832a4a55d.workspaces.tenancy.kcp.io
- v230313-2197e455a.workspacetypes.tenancy.kcp.io
maximalPermissionPolicy:
local: {}
status: {}
30 changes: 15 additions & 15 deletions config/root-phase0/apiresourceschema-workspacetypes.tenancy.kcp.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apis.kcp.io/v1alpha1
kind: APIResourceSchema
metadata:
creationTimestamp: null
name: v230110-89146c99.workspacetypes.tenancy.kcp.io
name: v230313-2197e455a.workspacetypes.tenancy.kcp.io
spec:
group: tenancy.kcp.io
names:
Expand Down Expand Up @@ -46,7 +46,7 @@ spec:
additionalProperties:
type: string
description: additionalWorkspaceLabels are a set of labels that will
be added to a ClusterWorkspace on creation.
be added to a Workspace on creation.
type: object
defaultAPIBindings:
description: defaultAPIBindings are the APIs to bind during initialization
Expand Down Expand Up @@ -74,10 +74,10 @@ spec:
name: universal
path: root
description: defaultChildWorkspaceType is the WorkspaceType that will
be used by default if another, nested ClusterWorkspace is created
in a workspace of this type. When this field is unset, the user must
specify a type when creating nested workspaces. Extending another
WorkspaceType does not inherit its defaultChildWorkspaceType.
be used by default if another, nested Workspace is created in a workspace
of this type. When this field is unset, the user must specify a type
when creating nested workspaces. Extending another WorkspaceType does
not inherit its defaultChildWorkspaceType.
properties:
name:
description: name is the name of the WorkspaceType
Expand All @@ -98,8 +98,8 @@ spec:
this WorkspaceType will be considered as that other type in evaluation
of limitAllowedChildren and limitAllowedParents constraints. \n A
dependency cycle stop this WorkspaceType from being admitted as the
type of a ClusterWorkspace. \n A non-existing dependency stop this
WorkspaceType from being admitted as the type of a ClusterWorkspace."
type of a Workspace. \n A non-existing dependency stop this WorkspaceType
from being admitted as the type of a Workspace."
properties:
with:
description: with are WorkspaceTypes whose initializers are added
Expand Down Expand Up @@ -127,13 +127,13 @@ spec:
initializer:
description: "initializer determines if this WorkspaceType has an associated
initializing controller. These controllers are used to add functionality
to a ClusterWorkspace; all controllers must finish their work before
the ClusterWorkspace becomes ready for use. \n One initializing controller
is supported per WorkspaceType; the identifier for this initializer
will be a colon-delimited string using the workspace in which the
WorkspaceType is defined, and the type's name. For example, if a WorkspaceType
`example` is created in the `root:org` workspace, the implicit initializer
name is `root:org:Example`."
to a Workspace; all controllers must finish their work before the
Workspace becomes ready for use. \n One initializing controller is
supported per WorkspaceType; the identifier for this initializer will
be a colon-delimited string using the workspace in which the WorkspaceType
is defined, and the type's name. For example, if a WorkspaceType `example`
is created in the `root:org` workspace, the implicit initializer name
is `root:org:Example`."
type: boolean
limitAllowedChildren:
description: limitAllowedChildren specifies constraints for sub-workspaces
Expand Down
12 changes: 6 additions & 6 deletions pkg/apis/tenancy/v1alpha1/types_workspacetype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ type WorkspaceType struct {

type WorkspaceTypeSpec struct {
// initializer determines if this WorkspaceType has an associated initializing
// controller. These controllers are used to add functionality to a ClusterWorkspace;
// all controllers must finish their work before the ClusterWorkspace becomes ready
// controller. These controllers are used to add functionality to a Workspace;
// all controllers must finish their work before the Workspace becomes ready
// for use.
//
// One initializing controller is supported per WorkspaceType; the identifier
Expand All @@ -75,22 +75,22 @@ type WorkspaceTypeSpec struct {
// other type in evaluation of limitAllowedChildren and limitAllowedParents constraints.
//
// A dependency cycle stop this WorkspaceType from being admitted as the type
// of a ClusterWorkspace.
// of a Workspace.
//
// A non-existing dependency stop this WorkspaceType from being admitted as the type
// of a ClusterWorkspace.
// of a Workspace.
//
// +optional
Extend WorkspaceTypeExtension `json:"extend,omitempty"`

// additionalWorkspaceLabels are a set of labels that will be added to a
// ClusterWorkspace on creation.
// Workspace on creation.
//
// +optional
AdditionalWorkspaceLabels map[string]string `json:"additionalWorkspaceLabels,omitempty"`

// defaultChildWorkspaceType is the WorkspaceType that will be used
// by default if another, nested ClusterWorkspace is created in a workspace
// by default if another, nested Workspace is created in a workspace
// of this type. When this field is unset, the user must specify a type when
// creating nested workspaces. Extending another WorkspaceType does
// not inherit its defaultChildWorkspaceType.
Expand Down
8 changes: 4 additions & 4 deletions pkg/openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.