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

Implement agreed-on devfile 2.0 issues #35

Merged
merged 16 commits into from
Apr 22, 2020
Merged

Implement agreed-on devfile 2.0 issues #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2a3a2c5
Implement agreement on issue #18
davidfestal Apr 3, 2020
515a430
Implement agreement on issue #17
davidfestal Apr 3, 2020
8bceda9
Implement agreement on issue #21
davidfestal Apr 3, 2020
680c4cb
Implement agreement on issue #22
davidfestal Apr 3, 2020
8145b87
Implement agreement on issue #27
davidfestal Apr 3, 2020
6c99166
Implement agreement on issue #9
davidfestal Apr 3, 2020
c766457
Implement agreement on issue #10
davidfestal Apr 7, 2020
636fff6
Fix PR comments about issue #9
davidfestal Apr 10, 2020
04e50e3
Fix PR comments about issue #17
davidfestal Apr 10, 2020
2b3097f
Implement agreement on issue #14 and #19
davidfestal Apr 10, 2020
2fa17a9
Add the spring boot example
davidfestal Apr 10, 2020
bbb2bbf
Implement agreement on issue #32
davidfestal Apr 10, 2020
e0b9a38
Fix last PR comments
davidfestal Apr 22, 2020
5b45b98
Update devfile-support/samples/simple-devfile.yaml
davidfestal Apr 22, 2020
4a7d642
Fix PR comments
davidfestal Apr 22, 2020
6b5f1ff
Fix an error in the Go source
davidfestal Apr 22, 2020
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
32 changes: 22 additions & 10 deletions deploy/crds/workspaces.ecd.eclipse.org_devworkspaces_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,6 @@ spec:
cheEditor:
description: CheEditor component
properties:
alias:
type: string
locationType:
description: Type of plugin location
enum:
Expand All @@ -318,6 +316,11 @@ spec:
type: string
memoryLimit:
type: string
name:
description: Optional name that allows referencing the
component in commands, or inside a parent If omitted
it will be infered from the location (uri or registryEntry)
type: string
registryEntry:
description: Location of an entry inside a plugin registry
properties:
Expand All @@ -335,8 +338,6 @@ spec:
chePlugin:
description: ChePlugin component
properties:
alias:
type: string
locationType:
description: Type of plugin location
enum:
Expand All @@ -345,6 +346,11 @@ spec:
type: string
memoryLimit:
type: string
name:
description: Optional name that allows referencing the
component in commands, or inside a parent If omitted
it will be infered from the location (uri or registryEntry)
type: string
registryEntry:
description: Location of an entry inside a plugin registry
properties:
Expand All @@ -362,8 +368,6 @@ spec:
container:
description: Container component
properties:
alias:
type: string
endpoints:
items:
properties:
Expand Down Expand Up @@ -474,32 +478,40 @@ spec:
kubernetes:
description: Kubernetes component
properties:
alias:
type: string
inlined:
description: Reference to the plugin definition
type: string
locationType:
description: Type of Kubernetes-like location
type: string
name:
description: Optional name that allows referencing the
component in commands, or inside a parent
type: string
davidfestal marked this conversation as resolved.
Show resolved Hide resolved
url:
description: Location in a plugin registry
type: string
required:
- name
type: object
openshift:
description: Openshift component
properties:
alias:
type: string
inlined:
description: Reference to the plugin definition
type: string
locationType:
description: Type of Kubernetes-like location
type: string
name:
description: Optional name that allows referencing the
component in commands, or inside a parent
type: string
url:
amisevsk marked this conversation as resolved.
Show resolved Hide resolved
description: Location in a plugin registry
type: string
required:
- name
type: object
type:
description: Type of project source
Expand Down
32 changes: 22 additions & 10 deletions deploy/crds/workspaces.ecd.eclipse.org_devworkspacetemplates_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,6 @@ spec:
cheEditor:
description: CheEditor component
properties:
alias:
type: string
locationType:
description: Type of plugin location
enum:
Expand All @@ -308,6 +306,11 @@ spec:
type: string
memoryLimit:
type: string
name:
description: Optional name that allows referencing the component
in commands, or inside a parent If omitted it will be infered
from the location (uri or registryEntry)
type: string
registryEntry:
description: Location of an entry inside a plugin registry
properties:
Expand All @@ -325,8 +328,6 @@ spec:
chePlugin:
description: ChePlugin component
properties:
alias:
type: string
locationType:
description: Type of plugin location
enum:
Expand All @@ -335,6 +336,11 @@ spec:
type: string
memoryLimit:
type: string
name:
description: Optional name that allows referencing the component
in commands, or inside a parent If omitted it will be infered
from the location (uri or registryEntry)
type: string
registryEntry:
description: Location of an entry inside a plugin registry
properties:
Expand All @@ -352,8 +358,6 @@ spec:
container:
description: Container component
properties:
alias:
type: string
endpoints:
items:
properties:
Expand Down Expand Up @@ -463,32 +467,40 @@ spec:
kubernetes:
description: Kubernetes component
properties:
alias:
type: string
inlined:
description: Reference to the plugin definition
type: string
locationType:
description: Type of Kubernetes-like location
type: string
name:
description: Optional name that allows referencing the component
in commands, or inside a parent
type: string
url:
description: Location in a plugin registry
type: string
required:
- name
type: object
openshift:
description: Openshift component
properties:
alias:
type: string
inlined:
description: Reference to the plugin definition
type: string
locationType:
description: Type of Kubernetes-like location
type: string
name:
description: Optional name that allows referencing the component
in commands, or inside a parent
type: string
url:
description: Location in a plugin registry
type: string
required:
- name
type: object
type:
description: Type of project source
Expand Down
1 change: 1 addition & 0 deletions devfile-support/samples/custom-devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ projects:
custom-info: "connexion-information"
components:
- kubernetes:
name: "production"
url: "https://somewhere/production-environment.yaml"
- custom:
componentClass: "NewComponentType"
Expand Down
1 change: 1 addition & 0 deletions devfile-support/samples/sample-devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ components:
field2: ""
name: "myNewComponent"
- kubernetes:
name: "production"
url: "https://somewhere/production-environment.yaml"
1 change: 0 additions & 1 deletion pkg/apis/workspaces/v1alpha1/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const (
// Workspace component: Anything that will bring additional features / tooling / behaviour / context
// to the workspace, in order to make working in it easier.
type BaseComponent struct {
Alias string `json:"alias,omitempty"`
}

type Component struct {
Expand Down
6 changes: 5 additions & 1 deletion pkg/apis/workspaces/v1alpha1/kubernetesLikeComponent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ package v1alpha1
// +k8s:openapi-gen=true
// +union
type K8sLikeComponentLocation struct {
// Optional name that allows referencing the component
// in commands, or inside a parent
Name string `json:"name"`

// Type of Kubernetes-like location
// +
// +unionDiscriminator
Expand All @@ -20,7 +24,7 @@ type K8sLikeComponentLocation struct {

type K8sLikeComponent struct {
BaseComponent `json:",inline"`
Location K8sLikeComponentLocation `json:",inline"`
Location K8sLikeComponentLocation `json:",inline"`
amisevsk marked this conversation as resolved.
Show resolved Hide resolved
}

// Component that allows partly importing Kubernetes resources into the workspace POD
Expand Down
15 changes: 11 additions & 4 deletions pkg/apis/workspaces/v1alpha1/pluginLikeComponents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

type RegistryEntryPluginLocation struct {
Id string `json:"id"`
Id string `json:"id"`

// +optional
BaseUrl string `json:"baseUrl,omitempty"`
Expand All @@ -13,8 +13,8 @@ type RegistryEntryPluginLocation struct {
type PluginLocationType string

const (
RegistryEntryPluginLocationType PluginLocationType = "RegistryEntry"
UriPluginLocationType PluginLocationType = "Uri"
RegistryEntryPluginLocationType PluginLocationType = "RegistryEntry"
UriPluginLocationType PluginLocationType = "Uri"
)

// +k8s:openapi-gen=true
Expand All @@ -37,7 +37,14 @@ type ChePluginLocation struct {

type PluginLikeComponent struct {
BaseComponent `json:",inline"`
MemoryLimit string `json:"memoryLimit,omitempty"`

// +optional
// Optional name that allows referencing the component
// in commands, or inside a parent
// If omitted it will be infered from the location (uri or registryEntry)
Name string `json:"name,omitempty"`

MemoryLimit string `json:"memoryLimit,omitempty"`
ChePluginLocation `json:",inline"`
}

Expand Down
9 changes: 9 additions & 0 deletions pkg/apis/workspaces/v1alpha1/zz_generated.openapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,13 @@ func schema_pkg_apis_workspaces_v1alpha1_K8sLikeComponentLocation(ref common.Ref
SchemaProps: spec.SchemaProps{
Type: []string{"object"},
Properties: map[string]spec.Schema{
"name": {
SchemaProps: spec.SchemaProps{
Description: "Optional name that allows referencing the component in commands, or inside a parent",
Type: []string{"string"},
Format: "",
},
},
"locationType": {
SchemaProps: spec.SchemaProps{
Description: "Type of Kubernetes-like location",
Expand All @@ -320,6 +327,7 @@ func schema_pkg_apis_workspaces_v1alpha1_K8sLikeComponentLocation(ref common.Ref
},
},
},
Required: []string{"name"},
},
VendorExtensible: spec.VendorExtensible{
Extensions: spec.Extensions{
Expand All @@ -328,6 +336,7 @@ func schema_pkg_apis_workspaces_v1alpha1_K8sLikeComponentLocation(ref common.Ref
"discriminator": "locationType",
"fields-to-discriminateBy": map[string]interface{}{
"inlined": "Inlined",
"name": "Name",
"url": "Url",
},
},
Expand Down
1 change: 1 addition & 0 deletions samples/example.devworkspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ spec:
field1: ""
field2: ""
- kubernetes:
name: "production"
url: "https://somewhere/production-environment.yaml"
Loading